From: Tassilo Horn <tsdh@gnu.org>
Date: Thu, 23 May 2013 15:21:54 +0000 (+0200)
Subject: * lisp/textmodes/reftex-parse.el (reftex-locate-bibliography-files):
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~225
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c43d45f9de721df8f92db16e82ad44c10c148652;p=emacs.git

* lisp/textmodes/reftex-parse.el (reftex-locate-bibliography-files):
  Accept options for bibliography commands.
* lisp/textmodes/reftex-vars.el (reftex-bibliography-commands): Add
  addbibresource.  Basic Biblatex support.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a5a3bac231a..25b87958aa5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2013-05-23  Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
+
+	* lisp/textmodes/reftex-parse.el
+	(reftex-locate-bibliography-files): Accept options for
+	bibliography commands.
+	* lisp/textmodes/reftex-vars.el (reftex-bibliography-commands):
+	Add addbibresource.  Basic Biblatex support.
+
 2013-05-23  Michael Albinus  <michael.albinus@gmx.de>
 
 	* net/tramp-gvfs.el (top):
diff --git a/lisp/textmodes/reftex-parse.el b/lisp/textmodes/reftex-parse.el
index 945e82e365d..3a64aad6a06 100644
--- a/lisp/textmodes/reftex-parse.el
+++ b/lisp/textmodes/reftex-parse.el
@@ -360,9 +360,9 @@ of master file."
 ;           "\\(\\`\\|[\n\r]\\)[^%]*\\\\\\("
             "\\(^\\)[^%\n\r]*\\\\\\("
             (mapconcat 'identity reftex-bibliography-commands "\\|")
-            "\\){[ \t]*\\([^}]+\\)") nil t)
+            "\\)\\(\\[.+?\\]\\)?{[ \t]*\\([^}]+\\)") nil t)
           (setq files
-                (split-string (reftex-match-string 3)
+                (split-string (reftex-match-string 4)
                               "[ \t\n\r]*,[ \t\n\r]*")))))
   (when files
     (setq files
diff --git a/lisp/textmodes/reftex-vars.el b/lisp/textmodes/reftex-vars.el
index 47bec5e7218..3792ab4cbde 100644
--- a/lisp/textmodes/reftex-vars.el
+++ b/lisp/textmodes/reftex-vars.el
@@ -1112,7 +1112,7 @@ buffer."
   :group 'reftex)
 
 (defcustom reftex-bibliography-commands
-  '("bibliography" "nobibliography" "setupbibtex\\[.*?database=")
+  '("bibliography" "nobibliography" "setupbibtex\\[.*?database=" "addbibresource")
   "LaTeX commands which specify the BibTeX databases to use with the document."
   :group 'reftex-citation-support
   :type '(repeat string))