monnier pushed a commit to branch externals/auctex
in repository elpa.
commit 004e745d378bb7f3811db088f2230c16cfde6363
Merge: 4ba9c9d 1d6f544
Author: Tassilo Horn <[email protected]>
Date: Sun Apr 6 09:27:03 2014 +0200
Resolve conflicts
ChangeLog | 36 +++++++++++++++++++++++++++++++
doc/auctex.texi | 19 +++++++++++-----
doc/changes.texi | 3 +-
latex.el | 22 +++++++++++++------
style/biblatex.el | 61 ++++++++++++++++++++++++++++------------------------
tex-bar.el | 9 ++++---
tex-style.el | 13 ++++++++++-
7 files changed, 116 insertions(+), 47 deletions(-)
diff --cc ChangeLog
index b2573c7,8d08c4e..6be70ac
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,38 +1,43 @@@
+2014-04-06 Tassilo Horn <[email protected]>
+
+ * tex-info.el (TeX-texinfo-mode): Use `texinfo-current-defun-name'
+ in `C-x 4 a'.
+
+ 2014-04-04 Mos� Giordano <[email protected]>
+
+ * latex.el (LaTeX-add-environments): Move advising of
+ `LaTeX-add-environments' after definition of
+ `LaTeX-environment-menu' and `LaTeX-environment-modify-menu'
+ variables to fix assignment to free variable warnings.
+
+ * tex-style.el: Update coyright years.
+ (LaTeX-biblatex-use-Biber): New variable. Mark as
+ safe-local-variable.
+
+ * latex.el (TeX-latex-mode): Add setting of `LaTeX-using-Biber' to
+ `TeX-update-style-hook'.
+
+ * style/biblatex.el ("biblatex"): Use `LaTeX-biblatex-use-Biber'
+ value to set `LaTeX-using-Biber' when it is set locally.
+
+ * tex-bar.el: Update copyright years.
+ (LaTeX-install-toolbar): Append toolbar refresh to
+ `TeX-update-style-hook' instead of prepending it.
+
+ * doc/auctex.texi: Update copyright years.
+ (Selecting a Command): Document `LaTeX-biblatex-use-Biber'.
+
+ * doc/changes.texi: Mention `LaTeX-biblatex-use-Biber' change.
+
+ 2014-04-02 Mos� Giordano <[email protected]>
+
+ * style/biblatex.el: Update copyright years and specify last
+ `biblatex' version supported.
+ (LaTeX-biblatex-executebibliographyoptions-options): Update.
+ (LaTeX-biblatex-language-list): Ditto.
+ (LaTeX-arg-biblatex-cites): Fix condition on `items' variable to
+ adapt to the `TeX-completing-read-multiple' return value change.
+
2014-03-17 Nicolas Richard <[email protected]>
* style/exercise.el: New file.
