[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[AUCTeX-diffs] [elpa] externals/auctex 45d9e1b 13/43: Make sure `LaTeX-d
From: |
Tassilo Horn |
Subject: |
[AUCTeX-diffs] [elpa] externals/auctex 45d9e1b 13/43: Make sure `LaTeX-default-options' is honored |
Date: |
Tue, 20 Mar 2018 11:34:07 -0400 (EDT) |
branch: externals/auctex
commit 45d9e1bed337589648d4de261d3d9cd68a1b2552
Author: Ikumi Keita <address@hidden>
Commit: Ikumi Keita <address@hidden>
Make sure `LaTeX-default-options' is honored
* latex.el (TeX-arg-document): Use `LaTeX-default-options' as default
of class options even when the respective `LaTeX-XXXX-class-options'
is not set.
---
latex.el | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/latex.el b/latex.el
index 4dcb4bf..c2d8a4c 100644
--- a/latex.el
+++ b/latex.el
@@ -2232,7 +2232,7 @@ To insert a hook here, you must insert it in the
appropiate style file.")
OPTIONAL and IGNORE are ignored."
(let* ((TeX-file-extensions '("cls"))
(crm-separator ",")
- style var options)
+ style var options defopt optprmpt)
(unless LaTeX-global-class-files
(setq LaTeX-global-class-files
(if (if (eq TeX-arg-input-file-search 'ask)
@@ -2250,6 +2250,12 @@ OPTIONAL and IGNORE are ignored."
(setq TeX-after-document-hook nil)
(TeX-run-style-hooks style)
(setq var (intern (format "LaTeX-%s-class-options" style)))
+ (setq defopt (if (stringp LaTeX-default-options)
+ LaTeX-default-options
+ (mapconcat #'identity LaTeX-default-options ",")))
+ (setq optprmpt
+ (if (and defopt (not (string-equal defopt "")))
+ (format "Options (default %s): " defopt) "Options: "))
(if (or (and (boundp var)
(listp (symbol-value var)))
(fboundp var))
@@ -2259,12 +2265,10 @@ OPTIONAL and IGNORE are ignored."
(setq options
(mapconcat 'identity
(TeX-completing-read-multiple
- "Options: " (mapcar 'list (symbol-value var)) nil
nil
- (if (stringp LaTeX-default-options)
- LaTeX-default-options
- (mapconcat 'identity LaTeX-default-options
",")))
+ optprmpt (mapcar 'list (symbol-value var)) nil nil
+ nil nil defopt)
","))))
- (setq options (TeX-read-string "Options: ")))
+ (setq options (TeX-read-string optprmpt nil nil defopt)))
(unless (zerop (length options))
(insert LaTeX-optop options LaTeX-optcl)
(let ((opts (LaTeX-listify-package-options options)))
- [AUCTeX-diffs] [elpa] externals/auctex 05c09bd 06/43: Remove TeX-how-many function, (continued)
- [AUCTeX-diffs] [elpa] externals/auctex 05c09bd 06/43: Remove TeX-how-many function, Tassilo Horn, 2018/03/20
- [AUCTeX-diffs] [elpa] externals/auctex 52e1426 02/43: Remove XEmacs compatibility code in latex.el, Tassilo Horn, 2018/03/20
- [AUCTeX-diffs] [elpa] externals/auctex 9ba765e 04/43: Remove TeX-deactivate-mark, Tassilo Horn, 2018/03/20
- [AUCTeX-diffs] [elpa] externals/auctex 12618af 09/43: Remove code for compatibility with old Emacsens in tex.el, Tassilo Horn, 2018/03/20
- [AUCTeX-diffs] [elpa] externals/auctex 77c2cda 15/43: Remove XEmacs compatibility code in tex-jp.el, Tassilo Horn, 2018/03/20
- [AUCTeX-diffs] [elpa] externals/auctex f366130 03/43: Remove old compat functions for commenting and uncommenting, Tassilo Horn, 2018/03/20
- [AUCTeX-diffs] [elpa] externals/auctex f8290fc 21/43: Restore loading of prv-emacs, Tassilo Horn, 2018/03/20
- [AUCTeX-diffs] [elpa] externals/auctex d3d321a 05/43: Remove TeX-assoc-string, Tassilo Horn, 2018/03/20
- [AUCTeX-diffs] [elpa] externals/auctex 6861a88 10/43: Change encoding of Elisp source files to UTF-8, Tassilo Horn, 2018/03/20
- [AUCTeX-diffs] [elpa] externals/auctex 06f704f 31/43: Explicitly require Emacs 24, Tassilo Horn, 2018/03/20
- [AUCTeX-diffs] [elpa] externals/auctex 45d9e1b 13/43: Make sure `LaTeX-default-options' is honored,
Tassilo Horn <=
- [AUCTeX-diffs] [elpa] externals/auctex 657c338 40/43: * tex.el (TeX-dwim-master): Prefer `cl-return' over `return'., Tassilo Horn, 2018/03/20
- [AUCTeX-diffs] [elpa] externals/auctex 3d08a92 22/43: Restore some code erroneously removed from font-latex.el, Tassilo Horn, 2018/03/20
- [AUCTeX-diffs] [elpa] externals/auctex 3cdfdc8 19/43: Remove compatibility code for XEmacs in font-latex.el, Tassilo Horn, 2018/03/20
- [AUCTeX-diffs] [elpa] externals/auctex 4dfb98c 01/43: Remove XEmacs compatibility code in tex-buf.el, Tassilo Horn, 2018/03/20
- [AUCTeX-diffs] [elpa] externals/auctex 39d4959 23/43: * texmathp.el (texmathp-tex-commands-default): Add entries for breqn.sty., Tassilo Horn, 2018/03/20
- [AUCTeX-diffs] [elpa] externals/auctex 4106f92 24/43: Add fontification for some core macros, Tassilo Horn, 2018/03/20
- [AUCTeX-diffs] [elpa] externals/auctex ba79584 32/43: Replace cl with cl-lib in other files, Tassilo Horn, 2018/03/20
- [AUCTeX-diffs] [elpa] externals/auctex 8d2e9db 38/43: Add new function `TeX-arg-verb-delim-or-brace', Tassilo Horn, 2018/03/20
- [AUCTeX-diffs] [elpa] externals/auctex 62d3606 18/43: Remove compatibility code for XEmacs in tex-fold.el, Tassilo Horn, 2018/03/20
- [AUCTeX-diffs] [elpa] externals/auctex f7a4622 16/43: Delte prv-xemacs.el, Tassilo Horn, 2018/03/20