lisp/textmodes/bibtex.el (bibtex-search-entries): Bug fix

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index de1ba013d1c8215b2fc727fa7346381881e14c41..47af4d554338d9580174cb99513b396d12481ced 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-13  Roland Winkler  <winkler@gnu.org>
+
+       * textmodes/bibtex.el (bibtex-search-entries): Bug fix.  Use match
+       data before it gets modified by bibtex-beginning-of-entry.
+
 2013-04-13  Roland Winkler  <winkler@gnu.org>
 
        * textmodes/bibtex.el (bibtex-url): Doc fix.

diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el
index 1daa0186bdbd9673e8ed87495165a8877ed36afd..01a126eb38126edfca1d3d2008c822bd91147047 100644 (file)
--- a/lisp/textmodes/bibtex.el
+++ b/lisp/textmodes/bibtex.el
@@ -5241,19 +5241,22 @@ where FILE is the BibTeX file of ENTRY."
           (if (string= "" field)
               ;; Unrestricted search.
               (while (re-search-forward regexp nil t)
-                (let ((beg (bibtex-beginning-of-entry))
-                      (end (bibtex-end-of-entry))
-                      key)
-                  (if (and (<= beg (match-beginning 0))
-                           (<= (match-end 0) end)
-                           (save-excursion
-                             (goto-char beg)
-                             (and (looking-at bibtex-entry-head)
-                                  (setq key (bibtex-key-in-head))))
-                           (not (assoc key entries)))
-                      (push (list key file
-                                  (buffer-substring-no-properties beg end))
-                            entries))))
+                (save-excursion
+                  (let ((mbeg (match-beginning 0))
+                        (mend (match-end 0))
+                        (beg (bibtex-beginning-of-entry))
+                        (end (bibtex-end-of-entry))
+                        key)
+                    (if (and (<= beg mbeg)
+                             (<= mend end)
+                             (progn
+                               (goto-char beg)
+                               (looking-at bibtex-entry-head))
+                             (setq key (bibtex-key-in-head))
+                             (not (assoc key entries)))
+                        (push (list key file
+                                    (buffer-substring-no-properties beg end))
+                              entries)))))
             ;; The following is slow.  But it works reliably even in more
             ;; complicated cases with BibTeX string constants and crossrefed
             ;; entries.  If you prefer speed over reliability, perform an