[AUCTeX-diffs] GNU AUCTeX branch, master, updated. 004e745d378bb7f3811db088f2230c16cfde6363

[Tassilo Horn]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU AUCTeX".

The branch, master has been updated
       via  004e745d378bb7f3811db088f2230c16cfde6363 (commit)
       via  4ba9c9df91f446bd79486657d155358b0a0ac027 (commit)
      from  1d6f544235966a45a89ad7b6a59c6263771485a6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 004e745d378bb7f3811db088f2230c16cfde6363
Merge: 4ba9c9d 1d6f544
Author: Tassilo Horn <address@hidden>
Date:   Sun Apr 6 09:27:03 2014 +0200

    Resolve conflicts

diff --cc ChangeLog
index b2573c7,8d08c4e..6be70ac
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,38 +1,43 @@@
 +2014-04-06  Tassilo Horn  <address@hidden>
 +
 +      * tex-info.el (TeX-texinfo-mode): Use `texinfo-current-defun-name'
 +      in `C-x 4 a'.
 +
+ 2014-04-04  Mosè Giordano  <address@hidden>
+ 
+       * 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  <address@hidden>
+ 
+       * 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  <address@hidden>
  
        * style/exercise.el: New file.

commit 4ba9c9df91f446bd79486657d155358b0a0ac027
Author: Tassilo Horn <address@hidden>
Date:   Sun Apr 6 09:24:49 2014 +0200

    Fix ChangeLog node for texinfo.
    
    * tex-info.el (TeX-texinfo-mode): Use `texinfo-current-defun-name'
    in `C-x 4 a'.

diff --git a/ChangeLog b/ChangeLog
index 31b5104..b2573c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-06  Tassilo Horn  <address@hidden>
+
+       * tex-info.el (TeX-texinfo-mode): Use `texinfo-current-defun-name'
+       in `C-x 4 a'.
+
 2014-03-17  Nicolas Richard  <address@hidden>
 
        * style/exercise.el: New file.
diff --git a/tex-info.el b/tex-info.el
index a42884d..f973937 100644
--- a/tex-info.el
+++ b/tex-info.el
@@ -627,6 +627,11 @@ value of `Texinfo-mode-hook'."
                               (unless (file-exists-p (buffer-file-name))
                                 (TeX-master-file nil nil t))) nil t)
 
+  (when (and (boundp 'add-log-current-defun-function)
+            (fboundp 'texinfo-current-defun-name))
+    (setq add-log-current-defun-function
+         #'texinfo-current-defun-name))
+
   (TeX-add-symbols
    '("appendix" (TeX-arg-literal " ") (TeX-arg-free "Title"))
    '("appendixsec" (TeX-arg-literal " ") (TeX-arg-free "Title"))

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog   |    5 +++++
 tex-info.el |    5 +++++
 2 files changed, 10 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
GNU AUCTeX