remove obsolete/useless stuff

diff --git a/init.el b/init.el
index 0b9cd87af17355cbd9b7f0ae73f6ac13c76f28c6..b7119d027ce22f39a4ff15a8e4fd022e708acb6b 100644 (file)
--- a/init.el
+++ b/init.el
@@ -34,14 +34,16 @@
   (setq gc-cons-threshold 100000000)
 
   ;; 2019-6-26, 1.26s
-  ;; to profile init:
-  ;; emacs -f benchmark-init/show-durations-tabulated
-  ;; emacs -f benchmark-init/show-durations-tree
-  ;; to catch things post-init
-  ;; emacs -f benchmark-init/deactivate
-  (require 'benchmark-init)
-  (add-hook 'after-init-hook 'benchmark-init/deactivate)
-  ;;
+  ;;; to profile init:
+  ;;; uncomment the following block
+  ;; (require 'benchmark-init)
+  ;; (add-hook 'after-init-hook 'benchmark-init/deactivate)
+  ;;; Then run:
+  ;;; emacs -f benchmark-init/show-durations-tabulated
+  ;;; emacs -f benchmark-init/show-durations-tree
+  ;;; to catch things post-init
+  ;;; emacs -f benchmark-init/deactivate
+
 
   ;; these need to be done before the hook in order to satisfy the byte compiler or batch mode
 
@@ -59,24 +61,6 @@
   (add-to-list 'load-path "~/.emacs.d/src/visible-mark")
 
 
-  ;; git version of gnus
-  ;; (add-to-list 'load-path "~/.emacs.d/src/gnus/lisp")
-  ;; (eval-after-load "info"
-  ;; (quote (add-to-list 'Info-default-directory-list "~/.emacs.d/src/gnus/texi")))
-
-
-  ;; needed for git version
-  ;;(add-to-list 'load-path "~/.emacs.d/src/haskell-mode")
-  ;;(require 'haskell-mode-autoloads)
-  ;;(add-to-list 'Info-default-directory-list "~/.emacs.d/src/haskell-mode")
-
-  ;; for using custom/upstream bbdb
-  ;;(require 'bbdb-loaddefs "~/.emacs.d/src/bbdb/lisp/bbdb-loaddefs.el")
-  ;;(setq bbdb-print-tex-path "~/.emacs.d/src/bbdb/tex")
-
-
-  ;; iank: dunno what this was about
-  ;;(add-hook 'server-visit-hook 'raise-frame)
 
   (setq init-dir (file-name-directory load-file-name))
   ;; previously, i was doing byte-recompile-directory, but
@@ -87,50 +71,6 @@
       (byte-recompile-file "/p/c/mymu4e.el" nil 0))
     )
 
-  ;; load init in `after-init-hook' so all packages are loaded. However, disabled because
-  ;; there seems to be no need.
-  ;; todo, learn about the weird evaluation order of this hook that requires the quoting.
-  ;; adapted from starter-kit
-  ;; (add-hook 'after-init-hook
-  ;;           `(lambda ()
-  ;;              (load-file (expand-file-name "myinit.el" init-dir))
-  ;;              ))
-
-
-;;; Weird package bug workaround
-
-
-  ;; without this, when installing a package, this message happens
-  ;;
-  ;; custom-handle-keyword: Unknown keyword :group
-  ;;
-  ;; but when i lookup the function, i get the following, and if
-  ;; I evaluate it, the error goes away. so I think the real
-  ;; definition is happening somewhere else
-
-  (defun custom-handle-keyword (symbol keyword value type)
-    "For customization option SYMBOL, handle KEYWORD with VALUE.
-Fourth argument TYPE is the custom option type."
-    (if purify-flag
-        (setq value (purecopy value)))
-    (cond ((eq keyword :group)
-          (custom-add-to-group value symbol type))
-         ((eq keyword :version)
-          (custom-add-version symbol value))
-         ((eq keyword :package-version)
-          (custom-add-package-version symbol value))
-         ((eq keyword :link)
-          (custom-add-link symbol value))
-         ((eq keyword :load)
-          (custom-add-load symbol value))
-         ((eq keyword :tag)
-          (put symbol 'custom-tag value))
-         ((eq keyword :set-after)
-          (custom-add-dependencies symbol value))
-         (t
-          (error "Unknown keyword %s" keyword))))
-
-
 ;;; misc emacs documentation
 
 ;;;; how to find auto-saved files that need recovering
@@ -251,30 +191,6 @@ Fourth argument TYPE is the custom option type."
 
 ;;; things that should be at the beginning
 
-  ;; packages installed from package manager: i pretty much prioritize repos this way: gnu, then melpa, then marmalade.
-
-  ;; package-activated-list:
-  ;; ac-dabbrev ac-haskell-process ack-and-a-half alect-themes auctex bash-completion bbdb csv-mode cyberpunk-theme dot-mode expand-region f find-file-in-project flycheck foreign-regexp ggtags ghc gnuplot-mode goto-chg haskell-mode heroku-theme highlight-indentation highlight-symbol htmlize inf-ruby info+ inkpot-theme jedi auto-complete jedi-core epc ctable concurrent key-chord leuven-theme logstash-conf magit git-commit magit-popup misc-fns mouse+ naquadah-theme nginx-mode occidental-theme org paredit pcsv php-mode pkg-info epl popup py-autopep8 python-environment deferred python-info python-mode rainbow-mode rust-mode rw-hunspell s smartparens smex smooth-scroll sr-speedbar strings swiper ivy tabulated-list tangotango-theme thingatpt+ undo-tree vimrc-mode volatile-highlights web-mode with-editor dash async ws-butler yasnippet
-
-;;;; alternate keyboards
-  ;; todo, figure out an easy way to disable this when using external keyboard
-  ;; (if (display-graphic-p)
-  ;;     (setq
-  ;;      enter-key (kbd "<return>")
-  ;;      s-enter-key (kbd "<S-return>")
-  ;;      c-m-enter-key (kbd "<C-M-return>")
-  ;;      m-enter (kbd "<M-return>")
-  ;;      c-enter (kbd "<C-return>"))
-  ;;   (setq
-  ;;    enter-key (kbd "C-m")
-  ;;    s-enter-key (kbd "C-8")
-  ;;    c-m-enter-key (kbd "C-M-8")
-  ;;    m-enter (kbd "M-m")
-  ;;    c-enter (kbd "C-8")))
-
-  (setq tp (string= (system-name) "tp"))
-  (setq x200 (string= (system-name) "x2"))
-  (setq laptop-keyboard (or tp x200))
 
   ;; Ubiquitous Packages which should be loaded on startup rather than
   ;;   autoloaded on demand since they are likely to be used in every
@@ -282,8 +198,6 @@ Fourth argument TYPE is the custom option type."
   (require 'saveplace)
   (require 'ffap)
   (require 'uniquify)
-  ;; iank: dunno why this was here
-  ;;(require 'ansi-color)
   (require 'recentf)
 
   ;; Better to have a list of packages in here vs installed manually.

diff --git a/misc-disabled.el b/misc-disabled.el
new file mode 100644 (file)
index 0000000..e13b7f8
--- /dev/null
+++ b/misc-disabled.el
@@ -0,0 +1,39 @@
+;; git version of gnus
+;; (add-to-list 'load-path "~/.emacs.d/src/gnus/lisp")
+;; (eval-after-load "info"
+;; (quote (add-to-list 'Info-default-directory-list "~/.emacs.d/src/gnus/texi")))
+
+;; needed for git version
+;;(add-to-list 'load-path "~/.emacs.d/src/haskell-mode")
+;;(require 'haskell-mode-autoloads)
+;;(add-to-list 'Info-default-directory-list "~/.emacs.d/src/haskell-mode")
+
+;; for using custom/upstream bbdb
+;;(require 'bbdb-loaddefs "~/.emacs.d/src/bbdb/lisp/bbdb-loaddefs.el")
+;;(setq bbdb-print-tex-path "~/.emacs.d/src/bbdb/tex")
+
+
+;; iank: dunno what this was about
+;;(add-hook 'server-visit-hook 'raise-frame)
+
+
+;;;; alternate keyboards
+;; todo, figure out an easy way to disable this when using external keyboard
+;; (if (display-graphic-p)
+;;     (setq
+;;      enter-key (kbd "<return>")
+;;      s-enter-key (kbd "<S-return>")
+;;      c-m-enter-key (kbd "<C-M-return>")
+;;      m-enter (kbd "<M-return>")
+;;      c-enter (kbd "<C-return>"))
+;;   (setq
+;;    enter-key (kbd "C-m")
+;;    s-enter-key (kbd "C-8")
+;;    c-m-enter-key (kbd "C-M-8")
+;;    m-enter (kbd "M-m")
+;;    c-enter (kbd "C-8")))
+
+
+(setq tp (string= (system-name) "tp"))
+(setq x200 (string= (system-name) "x2"))
+(setq laptop-keyboard (or tp x200))