[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[AUCTeX-diffs] [elpa] externals/auctex 00df9a5 37/57: Check new custom o
From: |
Tassilo Horn |
Subject: |
[AUCTeX-diffs] [elpa] externals/auctex 00df9a5 37/57: Check new custom option before activating RefTeX cite format |
Date: |
Wed, 11 Jan 2017 18:01:40 +0000 (UTC) |
branch: externals/auctex
commit 00df9a526165836430c9b0d8ddfb261550f30a88
Author: Arash Esbati <address@hidden>
Commit: Arash Esbati <address@hidden>
Check new custom option before activating RefTeX cite format
* doc/changes.texi: Document new variable.
* style/biblatex.el ("biblatex"):
* style/harvard.el ("harvard"):
* style/jurabib.el ("jurabib"):
* style/natbib.el ("natbib"): Set cite format provided by RefTeX
when `LaTeX-reftex-cite-format-auto-activate' is non-nil.
* tex-style.el (LaTeX-reftex-cite-format-auto-activate): New
customizable variable.
---
doc/changes.texi | 9 +++++++++
style/biblatex.el | 3 ++-
style/harvard.el | 3 ++-
style/jurabib.el | 5 ++---
style/natbib.el | 5 +++--
tex-style.el | 5 +++++
6 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/doc/changes.texi b/doc/changes.texi
index c737a7f..54abc65 100644
--- a/doc/changes.texi
+++ b/doc/changes.texi
@@ -12,6 +12,15 @@
@itemize @bullet
@item
address@hidden has a new custom option
address@hidden which controls the
+automatic activation of citation formats provided by RefTeX when a style
+file is loaded and RefTeX is enabled. Currently, @file{biblatex.el},
address@hidden, @file{jurabib.el} and @file{natbib.el} use this
+feature. If you have customized @code{reftex-cite-format} and want to
+use your settings, you should set this variable to @code{nil}.
+
address@hidden
In addition to the completion performed by @code{TeX-complete-symbol},
@AUCTeX{} now also supports the new Emacs standard completion-at-point
facility (see the Emacs command @code{completion-at-point}). This also
diff --git a/style/biblatex.el b/style/biblatex.el
index 4231509..32d585a 100644
--- a/style/biblatex.el
+++ b/style/biblatex.el
@@ -556,7 +556,8 @@ for citation keys."
;; `reftex-cite-format-builtin' in reftex-vars.el which will be
;; part of Emacs >= 25.3. It does not issue an error for older
;; Emacsen, but does not work either, i.e. it is ignored.
- (when (fboundp 'reftex-set-cite-format)
+ (when (and LaTeX-reftex-cite-format-auto-activate
+ (fboundp 'reftex-set-cite-format))
(if (or (LaTeX-provided-package-options-member "biblatex" "natbib")
(LaTeX-provided-package-options-member "biblatex" "natbib=true"))
(reftex-set-cite-format 'natbib)
diff --git a/style/harvard.el b/style/harvard.el
index 08addb4..9a97e71 100644
--- a/style/harvard.el
+++ b/style/harvard.el
@@ -103,7 +103,8 @@
LaTeX-item-list))
;; Tell RefTeX
- (when (fboundp 'reftex-set-cite-format)
+ (when (and LaTeX-reftex-cite-format-auto-activate
+ (fboundp 'reftex-set-cite-format))
(reftex-set-cite-format 'harvard)))
LaTeX-dialect)
diff --git a/style/jurabib.el b/style/jurabib.el
index 1919c06..b8fc87c 100644
--- a/style/jurabib.el
+++ b/style/jurabib.el
@@ -144,9 +144,8 @@
'variable))
;; Tell RefTeX (Thanks, Carsten)
- (when (and (fboundp 'reftex-set-cite-format)
- ;; Is it `reftex-cite-format' customized?
- (not (get 'reftex-cite-format 'saved-value)))
+ (when (and LaTeX-reftex-cite-format-auto-activate
+ (fboundp 'reftex-set-cite-format))
;; Check if RefTeX supports jurabib.
(if (assoc 'jurabib reftex-cite-format-builtin)
;; Yes, use the provided default.
diff --git a/style/natbib.el b/style/natbib.el
index 2bad500..f0664fd 100644
--- a/style/natbib.el
+++ b/style/natbib.el
@@ -159,8 +159,9 @@
'function))
;; Tell RefTeX
- (if (fboundp 'reftex-set-cite-format)
- (reftex-set-cite-format 'natbib)))
+ (when (and LaTeX-reftex-cite-format-auto-activate
+ (fboundp 'reftex-set-cite-format))
+ (reftex-set-cite-format 'natbib)))
LaTeX-dialect)
(defun LaTeX-arg-natbib-notes (optional)
diff --git a/tex-style.el b/tex-style.el
index 8a11de9..223c364 100644
--- a/tex-style.el
+++ b/tex-style.el
@@ -41,6 +41,11 @@
:type 'boolean
:group 'LaTeX-style)
+(defcustom LaTeX-reftex-cite-format-auto-activate t
+ "Whether to activate automatically RefTeX citation format."
+ :type 'boolean
+ :group 'LaTeX-style)
+
;; style/amsmath.el
(defcustom LaTeX-amsmath-label nil
- [AUCTeX-diffs] [elpa] externals/auctex 0e54895 34/57: Improve completion docs, (continued)
- [AUCTeX-diffs] [elpa] externals/auctex 0e54895 34/57: Improve completion docs, Tassilo Horn, 2017/01/11
- [AUCTeX-diffs] [elpa] externals/auctex 436371c 31/57: Add completion-at-point support, Tassilo Horn, 2017/01/11
- [AUCTeX-diffs] [elpa] externals/auctex e9c4b68 35/57: ; * doc/auctex.texi (Completion): Use @defun and not @deffn., Tassilo Horn, 2017/01/11
- [AUCTeX-diffs] [elpa] externals/auctex 93b1163 50/57: * ChangeLog-preview: Change encoding to UTF-8., Tassilo Horn, 2017/01/11
- [AUCTeX-diffs] [elpa] externals/auctex 4ebbf90 56/57: Make gitlog-to-changelog ignore release-commit, Tassilo Horn, 2017/01/11
- [AUCTeX-diffs] [elpa] externals/auctex 5af3c8e 15/57: Add \switchcolumn to paragraph commands, Tassilo Horn, 2017/01/11
- [AUCTeX-diffs] [elpa] externals/auctex bfc7e90 16/57: Fix fontification for natbib compat macros, Tassilo Horn, 2017/01/11
- [AUCTeX-diffs] [elpa] externals/auctex ccec850 24/57: Remove multi-level/invisible feature of font-latex-fontify-script, Tassilo Horn, 2017/01/11
- [AUCTeX-diffs] [elpa] externals/auctex c3a21f2 04/57: Print only first line of the message in error overview, Tassilo Horn, 2017/01/11
- [AUCTeX-diffs] [elpa] externals/auctex 890163e 26/57: Bring back multi-level script font-locking, Tassilo Horn, 2017/01/11
- [AUCTeX-diffs] [elpa] externals/auctex 00df9a5 37/57: Check new custom option before activating RefTeX cite format,
Tassilo Horn <=
- [AUCTeX-diffs] [elpa] externals/auctex 7ef680c 52/57: Refresh RELEASE file, Tassilo Horn, 2017/01/11
- [AUCTeX-diffs] [elpa] externals/auctex c70b7f9 21/57: Add new style/exam.sty, Tassilo Horn, 2017/01/11
- [AUCTeX-diffs] [elpa] externals/auctex bdc5d0d 11/57: Add new style/mdframed.el, Tassilo Horn, 2017/01/11
- [AUCTeX-diffs] [elpa] externals/auctex 6fe7a2e 43/57: Prepare for upcoming release, Tassilo Horn, 2017/01/11
- [AUCTeX-diffs] [elpa] externals/auctex 33a6ff8 48/57: ; Change email address., Tassilo Horn, 2017/01/11
- [AUCTeX-diffs] [elpa] externals/auctex 1354c70 44/57: Advertise AUCTeX installation from ELPA, Tassilo Horn, 2017/01/11
- [AUCTeX-diffs] [elpa] externals/auctex 3dca7c4 57/57: Merge branch 'master' into externals/auctex, Tassilo Horn, 2017/01/11
- [AUCTeX-diffs] [elpa] externals/auctex ec3996d 08/57: Query for optional float position, Tassilo Horn, 2017/01/11
- [AUCTeX-diffs] [elpa] externals/auctex bb390fe 18/57: Add fontification for varioref's referencing macros, Tassilo Horn, 2017/01/11
- [AUCTeX-diffs] [elpa] externals/auctex a943b6c 10/57: Add new tcolorbox library style/tcolorboxlib-raster.el, Tassilo Horn, 2017/01/11