branch: externals/auctex commit c35f0d14c80be28dba4436704ed7092fd47886b8 Author: Ikumi Keita <ik...@ikumi.que.jp> Commit: Ikumi Keita <ik...@ikumi.que.jp>
Use #' instead of ' to quote function where possible * latex.el (LaTeX-babel-insert-hyphen): * multi-prompt.el (multi-prompt-delete) (multi-prompt-next-must-match): * style/biblatex.el ("biblatex"): * style/newfloat.el ("newfloat"): * style/ntheorem.el ("ntheorem"): * style/wrapfig.el ("wrapfig"): * tex.el (TeX-electric-macro, TeX-insert-punctuation) (TeX-run-ispell): Use #' instead of ' to quote function where possible. --- latex.el | 10 +++++----- multi-prompt.el | 4 ++-- style/biblatex.el | 4 ++-- style/newfloat.el | 4 ++-- style/ntheorem.el | 2 +- style/wrapfig.el | 2 +- tex.el | 12 ++++++------ 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/latex.el b/latex.el index 6b46848..643021d 100644 --- a/latex.el +++ b/latex.el @@ -5968,7 +5968,7 @@ If prefix argument FORCE is non-nil, always insert a regular hyphen." font-lock-comment-face))) (texmathp) (TeX-in-comment)) - (call-interactively 'self-insert-command) + (call-interactively #'self-insert-command) (let* ((lang (assoc LaTeX-babel-hyphen-language LaTeX-babel-hyphen-language-alist)) (hyphen (if lang (nth 1 lang) LaTeX-babel-hyphen)) @@ -5983,20 +5983,20 @@ If prefix argument FORCE is non-nil, always insert a regular hyphen." (progn (delete-char (- hyphen-length)) (insert "--")) (delete-char (- hyphen-length)) - (call-interactively 'self-insert-command))) + (call-interactively #'self-insert-command))) ;; -- --> [+]- ((string= (buffer-substring (max (- (point) 2) (point-min)) (point)) "--") - (call-interactively 'self-insert-command)) + (call-interactively #'self-insert-command)) ;; - --> "= / [+]- ((eq (char-before) ?-) (if h-after-h (progn (delete-char -1) (insert hyphen)) - (call-interactively 'self-insert-command))) + (call-interactively #'self-insert-command))) (h-after-h - (call-interactively 'self-insert-command)) + (call-interactively #'self-insert-command)) (t (insert hyphen)))))) ;; Cater for Delete Selection mode (put 'LaTeX-babel-insert-hyphen 'delete-selection t) diff --git a/multi-prompt.el b/multi-prompt.el index 5ca3422..409e1d0 100644 --- a/multi-prompt.el +++ b/multi-prompt.el @@ -99,7 +99,7 @@ are the arguments to `completing-read'. See that." (interactive) (if (bobp) (throw 'multi-prompt-next 'back) - (call-interactively 'backward-delete-char))) + (call-interactively #'backward-delete-char))) (defun multi-prompt-next () (interactive) @@ -114,7 +114,7 @@ are the arguments to `completing-read'. See that." (defun multi-prompt-next-must-match () (interactive) - (when (call-interactively 'minibuffer-complete) + (when (call-interactively #'minibuffer-complete) (let ((content (buffer-substring-no-properties (point-min) (point-max)))) (when (or ;; (not require-match) (assoc content minibuffer-completion-table)) diff --git a/style/biblatex.el b/style/biblatex.el index e92f186..c925c93 100644 --- a/style/biblatex.el +++ b/style/biblatex.el @@ -276,7 +276,7 @@ for citation keys." ;;; Global Customization ;; Setting Package Options '("ExecuteBibliographyOptions" - [TeX-arg-eval mapconcat 'identity + [TeX-arg-eval mapconcat #'identity (TeX-completing-read-multiple "Entry type: " LaTeX-biblatex-entrytype) ","] (TeX-arg-key-val LaTeX-biblatex-executebibliographyoptions-options)) @@ -329,7 +329,7 @@ for citation keys." '("defbibcheck" "Name" t) ;; Dynamic Entry Sets '("defbibentryset" "Set" - (TeX-arg-eval mapconcat 'identity (TeX-completing-read-multiple + (TeX-arg-eval mapconcat #'identity (TeX-completing-read-multiple "Keys: " (LaTeX-bibitem-list)) ",")) ;;; Citation Commands '("cite" (TeX-arg-conditional TeX-arg-cite-note-p diff --git a/style/newfloat.el b/style/newfloat.el index 82adbdb..3eb865c 100644 --- a/style/newfloat.el +++ b/style/newfloat.el @@ -176,7 +176,7 @@ If `caption.el' is loaded, add the new floating environment to '("SetupFloatingEnvironment" (TeX-arg-eval completing-read (TeX-argument-prompt nil nil "Floating environment") - (mapcar 'car (LaTeX-newfloat-DeclareFloatingEnvironment-list))) + (mapcar #'car (LaTeX-newfloat-DeclareFloatingEnvironment-list))) (TeX-arg-key-val LaTeX-newfloat-key-val-options-local)) '("ForEachFloatingEnvironment" t) @@ -185,7 +185,7 @@ If `caption.el' is loaded, add the new floating environment to '("PrepareListOf" (TeX-arg-eval completing-read (TeX-argument-prompt nil nil "Floating environment") - (mapcar 'car (LaTeX-newfloat-DeclareFloatingEnvironment-list))) + (mapcar #'car (LaTeX-newfloat-DeclareFloatingEnvironment-list))) t) '("newfloatsetup" diff --git a/style/ntheorem.el b/style/ntheorem.el index 4c57623..e3ab7ad 100644 --- a/style/ntheorem.el +++ b/style/ntheorem.el @@ -325,7 +325,7 @@ make them available as new environments. Update ;; 2.4 Generating Theoremlists '("listtheorems" - (TeX-arg-eval mapconcat 'identity + (TeX-arg-eval mapconcat #'identity (TeX-completing-read-multiple "Lists: " (LaTeX-ntheorem-newtheorem-list)) ",")) diff --git a/style/wrapfig.el b/style/wrapfig.el index 2de699b..35d8a05 100644 --- a/style/wrapfig.el +++ b/style/wrapfig.el @@ -95,7 +95,7 @@ (LaTeX-newfloat-DeclareFloatingEnvironment-list)) (completing-read "Float type: " - (mapcar 'car (LaTeX-newfloat-DeclareFloatingEnvironment-list))) + (mapcar #'car (LaTeX-newfloat-DeclareFloatingEnvironment-list))) (TeX-read-string "Float type: "))) (narrow (TeX-read-string "(Optional) Number of narrow lines: ")) (placement (completing-read diff --git a/tex.el b/tex.el index d50f974..38fbd63 100644 --- a/tex.el +++ b/tex.el @@ -3367,14 +3367,14 @@ AUCTeX knows of some macros, and may query for extra arguments. Space will complete and exit." (interactive) (cond ((eq (preceding-char) ?\\) - (call-interactively 'self-insert-command)) + (call-interactively #'self-insert-command)) ((eq (preceding-char) ?.) (let ((TeX-default-macro " ") (minibuffer-local-completion-map TeX-electric-macro-map)) - (call-interactively 'TeX-insert-macro))) + (call-interactively #'TeX-insert-macro))) (t (let ((minibuffer-local-completion-map TeX-electric-macro-map)) - (call-interactively 'TeX-insert-macro))))) + (call-interactively #'TeX-insert-macro))))) (defvar TeX-exit-mark nil "Dynamically bound by `TeX-parse-macro' and `LaTeX-env-args'.") @@ -6180,7 +6180,7 @@ With prefix argument FORCE, always inserts \" characters." (expand-abbrev) (if (TeX-looking-at-backward "\\\\/\\(}+\\)" 50) (replace-match "\\1" t)) - (call-interactively 'self-insert-command)) + (call-interactively #'self-insert-command)) (defun TeX-insert-braces (arg) "Make a pair of braces around next ARG sexps and leave point inside. @@ -6476,9 +6476,9 @@ NAME may be a package, a command, or a document." "Run ispell on current TeX buffer." (cond ((and (string-equal file (TeX-region-file)) (fboundp 'ispell-region)) - (call-interactively 'ispell-region)) + (call-interactively #'ispell-region)) ((string-equal file (TeX-region-file)) - (call-interactively 'spell-region)) + (call-interactively #'spell-region)) ((fboundp 'ispell-buffer) (ispell-buffer)) ((fboundp 'ispell)