tidy emacs

1 files changed, 134 insertions, 95 deletions

diff --git a/.emacs b/.emacs
index 418850b..de883a3 100644
--- a/.emacs
+++ b/.emacs
@@ -19,8 +19,8 @@
   (fset 'yes-or-no-p 'y-or-n-p)
   (put 'narrow-to-region 'disabled nil)
   :hook   ; add functions onto hook; only basename needed
-  ((before-save . whitespace-cleanup)
-   (text-mode   . turn-on-auto-fill))
+  ((text-mode   . turn-on-auto-fill)
+   (before-save . whitespace-cleanup))
   :bind   ; key bindings
   (("C-x a r" . align-regexp))
   :custom ; options set by customize-variable
@@ -34,6 +34,111 @@
   :custom-face
   (default ((t (:family "Input Mono" :foundry "FBI " :slant normal :weight normal :height 89 :width normal)))))
 
+;; (use-package auctex
+;;   :config
+;;   ;; From
+;;   ;; https://github.com/jwiegley/dot-emacs/commit/6dffc2511c60e1e15c79080bf37a36f380d9567b
+;;   (defun latex-help-get-cmd-alist ()    ;corrected version:
+;;     "Scoop up the commands in the index of the latex info manual.
+;;    The values are saved in `latex-help-cmd-alist' for speed."
+;;     ;; mm, does it contain any cached entries
+;;     (if (not (assoc "\\begin" latex-help-cmd-alist))
+;; 	(save-window-excursion
+;; 	  (setq latex-help-cmd-alist nil)
+;; 	  (Info-goto-node (concat latex-help-file "Command Index"))
+;; 	  (goto-char (point-max))
+;; 	  (while (re-search-backward "^\\* \\(.+\\): *\\(.+\\)\\." nil t)
+;; 	    (let ((key (buffer-substring (match-beginning 1) (match-end 1)))
+;; 		  (value (buffer-substring (match-beginning 2)
+;; 					   (match-end 2))))
+;; 	      (add-to-list 'latex-help-cmd-alist (cons key value))))))
+;;     latex-help-cmd-alist))
+
+(use-package info-look
+  :ensure t)
+
+(use-package tex
+  :ensure auctex
+  :custom
+  (reftex-plug-into-AUCTeX t)
+  (TeX-parse-self t) ; Parse documents to provide completion for packages, etc.
+  (TeX-auto-save t) ; Automatically save style information
+  (TeX-clean-confirm nil) ; Don't ask for confirmation when cleaning
+  (TeX-source-correlate-mode t) ; Provide forward and inverse search with SyncTeX
+  (TeX-source-correlate-method 'synctex)
+  (TeX-PDF-mode t) ; use pdftex by default
+  :config
+  (add-to-list 'TeX-view-program-selection '(output-pdf "Zathura")))
+
+(use-package latex
+  :ensure auctex
+  :after info-look
+  :mode ("\\.tex\\'" . TeX-latex-mode)
+  :init
+  ;; http://www.cs.au.dk/~abizjak/emacs/2016/03/06/latex-fill-paragraph.html
+  (defun ales/fill-paragraph (&optional P)
+    "When called with prefix argument call `fill-paragraph'.
+Otherwise split the current paragraph into one sentence per line."
+    (interactive "P")
+    (if (not P)
+	(save-excursion
+	  (let ((fill-column 12345678)) ;; relies on dynamic binding
+	    (fill-paragraph) ;; this will not work correctly if the paragraph is
+	    ;; longer than 12345678 characters (in which case the
+	    ;; file must be at least 12MB long. This is unlikely.)
+	    (let ((end (save-excursion
+			 (forward-paragraph 1)
+			 (backward-sentence)
+			 (point-marker))))  ;; remember where to stop
+	      (beginning-of-line)
+	      (while (progn (forward-sentence)
+			    (<= (point) (marker-position end)))
+		(just-one-space) ;; leaves only one space, point is after it
+		(delete-char -1) ;; delete the space
+		(newline)        ;; and insert a newline
+		(LaTeX-indent-line) ;; I only use this in combination with late, so this makes sense
+		))))
+      ;; otherwise do ordinary fill paragraph
+      (fill-paragraph P)))
+
+  :hook
+  ((LaTeX-mode . turn-on-reftex)
+   (LaTeX-mode . turn-off-auto-fill)
+   (LaTeX-mode . turn-on-flyspell)
+   (LaTeX-mode . LaTeX-math-mode)
+   (LaTeX-mode . (lambda ()
+		   (LaTeX-add-environments
+		    '("axiom" LaTeX-env-label)
+		    '("theorem" LaTeX-env-label)
+		    '("proposition" LaTeX-env-label)
+		    '("definition" LaTeX-env-label)
+		    '("corollary" LaTeX-env-label)
+		    '("lemma" LaTeX-env-label)
+		    '("conjecture" LaTeX-env-label))))
+   (LaTeX-mode . (lambda ()
+		   ;; This must be a hook. Trying to set it in :config
+		   ;; causes the variable to become buffer-local, so
+		   ;; it never actually takes effect in all
+		   ;; latex-moded buffers. So much time wasted debugging.
+		   (add-to-list 'LaTeX-label-alist '("axiom" . "ax:"))
+		   (add-to-list 'LaTeX-label-alist '("conjecture" . "conj:"))
+		   (add-to-list 'LaTeX-label-alist '("corollary" . "cor:"))
+		   (add-to-list 'LaTeX-label-alist '("definition" . "def:"))
+		   (add-to-list 'LaTeX-label-alist '("proposition" . "prop:"))
+		   (add-to-list 'LaTeX-label-alist '("theorem" . "theorem:"))
+		   (add-to-list 'LaTeX-label-alist '("lemma" . "lemma:")))))
+
+  :config
+  (info-lookup-add-help :mode 'LaTeX-mode
+			:regexp ".*"
+			:parse-rule "\\\\?[a-zA-Z]+\\|\\\\[^a-zA-Z]"
+			:doc-spec '(("(latex2e)Concept Index")
+				    ("(latex2e)Command Index")))
+
+  :bind
+  (:map LaTeX-mode-map
+	("M-q" . ales/fill-paragraph)))
+
 (use-package auto-complete
   :ensure t
   :config
@@ -41,7 +146,7 @@
   (ac-set-trigger-key "TAB")
   (add-to-list 'ac-dictionary-directories "~/.emacs.d/auto-complete/ac-dict")
   :hook
-  ((Coq-mode latex-mode sml-mode) . auto-complete-mode))
+  ((Coq-mode LaTeX-mode sml-mode) . auto-complete-mode))
 
 (use-package auto-indent-mode
   :ensure t
@@ -77,10 +182,6 @@
   :custom
   (elpy-rpc-python-command "python3"))
 
-(use-package epa-file ; EasyPG, bunled with emacs for encrypted files
-  :config
-  (epa-file-enable))
-
 (use-package ess
   :ensure t)
 
@@ -90,7 +191,7 @@
 (use-package haskell-mode
   :ensure t
   :hook ((haskell-mode . turn-on-haskell-doc-mode)
-         (haskell-mode . turn-on-haskell-indentation)))
+	 (haskell-mode . turn-on-haskell-indentation)))
 
 (use-package ispell
   :ensure t
@@ -109,7 +210,7 @@
   (autoload 'markdown-mode "markdown-mode"
     "Major mode for editing Markdown files" t)
   :mode (("\\.markdown\\'" . markdown-mode)
-         ("\\.mdown\'" . markdown-mode)))
+	 ("\\.mdown\'" . markdown-mode)))
 
 (use-package menu-bar
   :config
@@ -142,7 +243,8 @@
   :mode ("\\.m$" . octave-mode))
 
 (use-package outline
-  :ensure t)
+  :ensure t
+  :hook (LaTeX-mode . outline-minor-mode))
 
 (use-package outline-magic
   :ensure t
@@ -151,12 +253,16 @@
 	      ([f10] . outline-cycle)))
 
 (use-package paren
+  :ensure t
   :config
   (show-paren-mode t)
   :custom
   ;; highlight entire expression when on delimiters
   (show-paren-style 'expression))
 
+(use-package powerline
+  :ensure t)
+
 (use-package proof-general
   :ensure t
   :custom
@@ -185,29 +291,30 @@
 
 (use-package rainbow-delimiters
   :ensure t
-  :hook ((prog-mode . rainbow-delimiters-mode)
-	 (latex-mode . rainbow-delimiters-mode)))
+  :hook ((LaTeX-mode prog-mode) . rainbow-delimiters-mode))
 
 (use-package rainbow-mode
   :ensure t)
 
 (use-package reftex
   :ensure t
+  :after latex
+  :hook (LaTeX-mode . reftex-mode)
   :custom
   (reftex-label-alist '(("axiom" ?a "ax:" "~\\ref{%s}" nil ("axiom" "ax.") -3)
-                        ("theorem" ?h "theorem:" "~\\ref{%s}" t ("theorem" "th.") -3)
-                        ("proposition" ?p "prop:" "~\\ref{%s}" t ("proposition" "prop.") -3)
-                        ("definition" ?d "def:" "~\\ref{%s}" t ("definition" "def.") -3)
-                        ("corollary" ?c "cor:" "~\\ref{%s}" t ("corollary" "cor.") -3)
-                        ("lemma" ?l "lemma:" "~\\ref{%s}" t ("lemma" "lem.") -3)
-                        ("conjecture" ?j "conj:" "~\\ref{%s}" t ("conjecture" "conj.") -3)
-                        ("ax" ?a "ax:" "~\\ref{%s}" nil ("axiom" "ax.") -3)
-                        ("thm" ?h "theorem:" "~\\ref{%s}" t ("theorem" "th.") -3)
-                        ("prop" ?p "prop:" "~\\ref{%s}" t ("proposition" "prop.") -3)
-                        ("defi" ?d "def:" "~\\ref{%s}" t ("definition" "def.") -3)
-                        ("cor" ?c "cor:" "~\\ref{%s}" t ("corollary" "cor.") -3)
-                        ("lem" ?l "lemma:" "~\\ref{%s}" t ("lemma" "lem.") -3)
-                        ("conj" ?j "conj:" "~\\ref{%s}" t ("conjecture" "conj.") -3))))
+			("theorem" ?h "theorem:" "~\\ref{%s}" t ("theorem" "th.") -3)
+			("proposition" ?p "prop:" "~\\ref{%s}" t ("proposition" "prop.") -3)
+			("definition" ?d "def:" "~\\ref{%s}" t ("definition" "def.") -3)
+			("corollary" ?c "cor:" "~\\ref{%s}" t ("corollary" "cor.") -3)
+			("lemma" ?l "lemma:" "~\\ref{%s}" t ("lemma" "lem.") -3)
+			("conjecture" ?j "conj:" "~\\ref{%s}" t ("conjecture" "conj.") -3)
+			("ax" ?a "ax:" "~\\ref{%s}" nil ("axiom" "ax.") -3)
+			("thm" ?h "theorem:" "~\\ref{%s}" t ("theorem" "th.") -3)
+			("prop" ?p "prop:" "~\\ref{%s}" t ("proposition" "prop.") -3)
+			("defi" ?d "def:" "~\\ref{%s}" t ("definition" "def.") -3)
+			("cor" ?c "cor:" "~\\ref{%s}" t ("corollary" "cor.") -3)
+			("lem" ?l "lemma:" "~\\ref{%s}" t ("lemma" "lem.") -3)
+			("conj" ?j "conj:" "~\\ref{%s}" t ("conjecture" "conj.") -3))))
 
 (use-package sass-mode
   :ensure t)
@@ -231,76 +338,8 @@
   :requires spaceline-config)
 
 (use-package sml-mode
-  :ensure t)
-
-(use-package tex                        ; TeX editing/processing
-  :ensure auctex
-  :defer t
-  :init
-  ;; http://www.cs.au.dk/~abizjak/emacs/2016/03/06/latex-fill-paragraph.html
-  (defun ales/fill-paragraph (&optional P)
-    "When called with prefix argument call `fill-paragraph'.
-Otherwise split the current paragraph into one sentence per line."
-    (interactive "P")
-    (if (not P)
-        (save-excursion
-          (let ((fill-column 12345678)) ;; relies on dynamic binding
-            (fill-paragraph) ;; this will not work correctly if the paragraph is
-            ;; longer than 12345678 characters (in which case the
-            ;; file must be at least 12MB long. This is unlikely.)
-            (let ((end (save-excursion
-                         (forward-paragraph 1)
-                         (backward-sentence)
-                         (point-marker))))  ;; remember where to stop
-              (beginning-of-line)
-              (while (progn (forward-sentence)
-                            (<= (point) (marker-position end)))
-                (just-one-space) ;; leaves only one space, point is after it
-                (delete-char -1) ;; delete the space
-                (newline)        ;; and insert a newline
-                (LaTeX-indent-line) ;; I only use this in combination with late, so this makes sense
-                ))))
-      ;; otherwise do ordinary fill paragraph
-      (fill-paragraph P)))
-  :hook
-  ((LaTeX-mode . turn-on-reftex)
-   (LaTeX-mode . turn-off-auto-fill)
-   (LaTeX-mode . turn-on-flyspell)
-   (LaTeX-mode . outline-minor-mode)
-   (LaTeX-mode . LaTeX-math-mode)
-   (LaTeX-mode . rainbow-delimiters-mode)
-   (LaTeX-mode . (lambda ()
-                   (LaTeX-add-environments
-                    '("axiom" LaTeX-env-label)
-                    '("theorem" LaTeX-env-label)
-                    '("proposition" LaTeX-env-label)
-                    '("definition" LaTeX-env-label)
-                    '("corollary" LaTeX-env-label)
-                    '("lemma" LaTeX-env-label)
-                    '("conjecture" LaTeX-env-label)))))
-  :config
-  (add-to-list 'TeX-view-program-selection '(output-pdf "Zathura"))
-  (add-to-list 'LaTeX-label-alist '("axiom" . "ax:"))
-  (add-to-list 'LaTeX-label-alist '("conjecture" . "conj:"))
-  (add-to-list 'LaTeX-label-alist '("corollary" . "cor:"))
-  (add-to-list 'LaTeX-label-alist '("definition" . "def:"))
-  (add-to-list 'LaTeX-label-alist '("proposition" . "prop:"))
-  (add-to-list 'LaTeX-label-alist '("theorem" . "theorem:"))
-  (add-to-list 'LaTeX-label-alist '("lemma" . "conj:"))
-  :custom
-  (TeX-parse-self t) ; Parse documents to provide completion for packages, etc.
-  (TeX-auto-save t) ; Automatically save style information
-  (TeX-clean-confirm nil) ; Don't ask for confirmation when cleaning
-  (TeX-source-correlate-mode t) ; Provide forward and inverse search with SyncTeX
-  (TeX-source-correlate-method 'synctex)
-  (reftex-plug-into-AUCTeX t) ; use reftex to get ToC: C-c = to explore structure of TeX doc
-  (TeX-PDF-mode t) ; use pdftex by default
-  :bind
-  (:map LaTeX-mode-map
-        ("M-q" . ales/fill-paragraph)))
-
-(use-package tex-site
-  :ensure auctex)
+  :ensure t
+  :mode ("\\.sml\\'" . sml-mode))
 
 (use-package tool-bar
   :config