Actually fix completion in TeX

2 files changed, 34 insertions, 30 deletions

diff --git a/emacs/inits/24-latex.el b/emacs/inits/24-latex.el
index 47681ad..259511a 100644
--- a/emacs/inits/24-latex.el
+++ b/emacs/inits/24-latex.el
@@ -1,4 +1,4 @@
-;; Time-stamp: <2021-07-25 18h11 EDT (academic)>
+;; Time-stamp: <2021-08-13 20h11 EDT (academic)>
 
 (defvar latex-template-dir (expand-file-name "~/typeset/latex-templates"))
 (defun prompt-latex-file-template ()
@@ -30,9 +30,9 @@ populated from the directory *latex-template-dir*"
 							("<" . LaTeX-insert-left-brace)
 							("|" . LaTeX-insert-left-brace)
 							("'" . better-TeX-insert-single-quote)
-							("TAB" . LaTeX-indent-line)
+							;; ("TAB" . LaTeX-indent-line)
+							("M-TAB" . TeX-complete-symbol)
 							("M-q" . unfill-paragraph)
-							("M-SPC" . (lambda () (interactive) (insert ?\\))) ; Never used just-one-space
 							("C-c C-d" . TeX-view))
 
 	:hook (LaTeX-mode . (lambda ()
@@ -64,7 +64,12 @@ populated from the directory *latex-template-dir*"
 	(defun latex-setup-completions ()
 		(interactive)
 		(require 'reftex)
-		(turn-on-reftex))
+		(turn-on-reftex)
+		;; We want completion for cleverf too!
+		(push '("\\\\[Cc]ref{\\([^{}\\%,]*\\)" 1 LaTeX-label-list "}") TeX-complete-list)
+		;; and we want to use reftex
+		(push '("\\\\cite\\[[^]\n
\\%]*\\]{\\([^{}\n
\\%,]*\\)" reftex-citep) TeX-complete-list)
+		(push '("\\\\cite{\\([^{}\n
\\%,]*\\)" reftex-citep) TeX-complete-list))
 
 	(defun better-TeX-insert-single-quote ()
 		(interactive)
@@ -103,9 +108,6 @@ populated from the directory *latex-template-dir*"
 	;; no idea why this is not a default ... ?
 	(push '("<" . ">") TeX-braces-association)
 
-	;; We want completion for cleverf too!
-	(push '("\\\\[Cc]ref{\\([^{}\\%,]*\\)" 1 LaTeX-label-list "}") TeX-complete-list)
-
 	(setq reftex-plug-into-AUCTeX t)
 	;; (setq-default TeX-master nil)
 	(setq TeX-auto-save t
diff --git a/emacs/inits/70-global-keybinds.el b/emacs/inits/70-global-keybinds.el
index 816998f..6b02fe8 100644
--- a/emacs/inits/70-global-keybinds.el
+++ b/emacs/inits/70-global-keybinds.el
@@ -1,34 +1,34 @@
-;; Time-stamp: <2020-10-26 17h12 EDT (hobbies)>
+;; Time-stamp: <2021-08-13 20h11 EDT (academic)>
 
 (setq time-stamp-active t
-      time-stamp-line-limit 3
-      time-stamp-format "%Y-%02m-%02d %02Hh%02M %Z (%s)")
+			time-stamp-line-limit 3
+			time-stamp-format "%Y-%02m-%02d %02Hh%02M %Z (%s)")
 
 (add-hook 'before-save-hook #'time-stamp)
 
 (defun insert-timestamp ()
-  (interactive)
-  (save-excursion
-    (goto-char (point-min))
-    (unless (search-forward "Time-stamp: "
-                            (line-beginning-position (1+ time-stamp-line-limit))
-                            t)
-      (goto-char (point-min))
-      (newline)
-      (beginning-of-line 0)
-      (comment-dwim nil)
-      (insert (concat "Time-stamp: " "<>"))
-      (newline))
-    (time-stamp)))
+	(interactive)
+	(save-excursion
+		(goto-char (point-min))
+		(unless (search-forward "Time-stamp: "
+														(line-beginning-position (1+ time-stamp-line-limit))
+														t)
+			(goto-char (point-min))
+			(newline)
+			(beginning-of-line 0)
+			(comment-dwim nil)
+			(insert (concat "Time-stamp: " "<>"))
+			(newline))
+		(time-stamp)))
 (global-set-key (kbd "C-x t") 'insert-timestamp)
 
 (global-set-key (kbd "C-z") 'nil)
 
 (use-package eterm-256color
-  :ensure t
-  :config
-  (add-hook 'term-mode-hook #'eterm-256color-mode)
-  (global-set-key (kbd "C-c c") 'ansi-term))
+	:ensure t
+	:config
+	(add-hook 'term-mode-hook #'eterm-256color-mode)
+	(global-set-key (kbd "C-c c") 'ansi-term))
 
 (global-set-key (kbd "C-x e") 'eval-expression)
 
@@ -42,8 +42,10 @@
 (global-set-key (kbd "M-z") 'zap-up-to-char)
 
 (defun kill-region-or-backward-kill-word (arg)
-  (interactive "p")
-  (if (region-active-p) (kill-region 0 0 t)
-    (backward-kill-word arg)))
+	(interactive "p")
+	(if (region-active-p) (kill-region 0 0 t)
+		(backward-kill-word arg)))
 
 (global-set-key (kbd "C-w") 'kill-region-or-backward-kill-word)
+
+(global-set-key (kbd "M-SPC") '(lambda () (interactive) (insert ?\\))) ; Never used just-one-space