Fix searching for bibitem entries.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 931ee696482140159234e146c61d0cfbff2442d1..109b4d99f957513693114b2cfbb48e495fad4e48 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-16  Ralf Angeli  <angeli@caeruleus.net>
+
+       * textmodes/reftex-cite.el
+       (reftex-extract-bib-entries-from-thebibliography): Do not move
+       point when searching for \bibitem entries.  Match entries with
+       spaces or tabs in front of arguments.
+
 2010-10-16  Chong Yidong  <cyd@stupidchicken.com>
 
        * cus-theme.el (customize-create-theme): Delete overlays after

diff --git a/lisp/textmodes/reftex-cite.el b/lisp/textmodes/reftex-cite.el
index 79797b4791b95da5e8c8c33818400547e9ff2cbe..5edd9f24122b19f6a0bea1a2c568f650a7748840 100644 (file)
--- a/lisp/textmodes/reftex-cite.el
+++ b/lisp/textmodes/reftex-cite.el
@@ -358,27 +358,30 @@
       (message "Scanning thebibliography environment in %s" file)
 
       (with-current-buffer buf
-        (save-restriction
-          (widen)
-          (goto-char (point-min))
-          (while (re-search-forward 
-                  "\\(\\`\\|[\n\r]\\)[ \t]*\\\\begin{thebibliography}" nil t)
-            (beginning-of-line 2)
-            (setq start (point))
-            (if (re-search-forward 
-                 "\\(\\`\\|[\n\r]\\)[ \t]*\\\\end{thebibliography}" nil t)
-                (progn
-                  (beginning-of-line 1)
-                  (setq end (point))))
-            (when (and start end)
-              (setq entries 
-                    (append entries
-                      (mapcar 'reftex-parse-bibitem
-                        (delete ""
-                                (split-string 
-                                 (buffer-substring-no-properties start end)
-                                 "[ \t\n\r]*\\\\bibitem\\(\\[[^]]*]\\)*"))))))
-            (goto-char end)))))
+       (save-excursion
+         (save-restriction
+           (widen)
+           (goto-char (point-min))
+           (while (re-search-forward
+                   "\\(\\`\\|[\n\r]\\)[ \t]*\\\\begin{thebibliography}" nil t)
+             (beginning-of-line 2)
+             (setq start (point))
+             (if (re-search-forward
+                  "\\(\\`\\|[\n\r]\\)[ \t]*\\\\end{thebibliography}" nil t)
+                 (progn
+                   (beginning-of-line 1)
+                   (setq end (point))))
+             (when (and start end)
+               (setq entries
+                     (append entries
+                             (mapcar 'reftex-parse-bibitem
+                                     (delete ""
+                                             (split-string
+                                              (buffer-substring-no-properties
+                                               start end)
+                                              "[ \t\n\r]*\\\\bibitem\
+\\(\\[[^]]*]\\)*\[ \t]*"))))))
+             (goto-char end))))))
     (unless entries
       (error "No bibitems found"))