[elpa] 113/299: Change BibTeX button to Biber when LaTeX-using-biber is non-nil.

[Stefan Monnier]

monnier pushed a commit to branch externals/auctex
in repository elpa.

commit c1021d14f8f7a17a9f4c430202cbc9105649d8f7
Author: Mosè Giordano <address@hidden>
Date:   Sun Apr 28 18:23:27 2013 +0200

    Change BibTeX button to Biber when LaTeX-using-biber is non-nil.
    
    * tex-bar.el: Update copyright range.
    (TeX-bar-LaTeX-button-alist): Change BibTeX button to Biber when
    `LaTeX-using-biber' is non-nil.
    (LaTeX-install-toolbar): Refresh toolbar after styles update.
---
 ChangeLog  |    7 +++++++
 tex-bar.el |   11 ++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c1ce656..ca2086e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-04-28  Mos� Giordano  <address@hidden>
+
+       * tex-bar.el: Update copyright range.
+       (TeX-bar-LaTeX-button-alist): Change BibTeX button to Biber when
+       `LaTeX-using-biber' is non-nil.
+       (LaTeX-install-toolbar): Refresh toolbar after styles update.
+
 2013-04-25  Mos� Giordano  <address@hidden>
 
        * latex.el (LaTeX-default-document-environment): New buffer-local
diff --git a/tex-bar.el b/tex-bar.el
index 32ed5ee..28fafda 100644
--- a/tex-bar.el
+++ b/tex-bar.el
@@ -1,6 +1,6 @@
 ;;; tex-bar.el --- toolbar icons on AUCTeX in GNU emacs and XEmacs
 
-;; Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2008, 2012, 2013 Free Software Foundation, Inc.
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
@@ -338,9 +338,11 @@ the argument BUTTON-ALIST in function 
`toolbarx-install-toolbar'."
          :help (lambda (&rest ignored)
                  (TeX-bar-help-from-command-list "File")))
     (bibtex :image "bibtex"
-           :command (TeX-command "BibTeX" 'TeX-master-file -1)
+           :command (TeX-command (if LaTeX-using-Biber "Biber" "BibTeX")
+                                 'TeX-master-file -1)
            :help (lambda (&rest ignored)
-                   (TeX-bar-help-from-command-list "BibTeX")))
+                   (TeX-bar-help-from-command-list
+                    (if LaTeX-using-Biber "Biber" "BibTeX"))))
     (clean  :image "delete"
            :command (TeX-command "Clean" 'TeX-master-file -1)
            :help (lambda (&rest ignored)
@@ -371,6 +373,9 @@ format of the argument MEANING-ALIST in the mentioned 
function."
   (add-to-list 'toolbarx-image-path
               (expand-file-name "images" TeX-data-directory))
   (add-hook 'TeX-PDF-mode-hook 'toolbarx-refresh nil t)
+  ;; Refresh toolbar after styles update because `LaTeX-using-Biber' value 
could
+  ;; have been changed.
+  (add-hook 'TeX-update-style-hook 'toolbarx-refresh nil t)
   (toolbarx-install-toolbar TeX-bar-LaTeX-buttons
                            (let ((append-list))
                              (dolist (elt TeX-bar-LaTeX-all-button-alists)