lisp/textmodes/bibtex.el: small bug fixes

2 files changed, 8 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d503171245d..b4334e18a38 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-12  Roland Winkler  <winkler@gnu.org>
+
+        * textmodes/bibtex.el (bibtex-initialize): Use
+        pop-to-buffer-same-window.
+        (bibtex-search-entries): Fix interactive call.
+
 2011-07-12  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * progmodes/compile.el (compilation-error-regexp-alist-alist):
diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el
index 930d3200234..a660bdb6488 100644
--- a/lisp/textmodes/bibtex.el
+++ b/lisp/textmodes/bibtex.el
@@ -3060,7 +3060,7 @@ When called interactively, FORCE is t, CURRENT is t if current buffer uses
     ;; select BibTeX buffer
     (if select
         (if buffer-list
-            (switch-to-buffer
+            (pop-to-buffer-same-window
              (completing-read "Switch to BibTeX buffer: "
                               (mapcar 'buffer-name buffer-list)
                               nil t
@@ -5179,7 +5179,7 @@ where FILE is the BibTeX file of ENTRY."
           (delete-dups
            (apply 'append
                   bibtex-user-optional-fields
-                  (mapcar (lambda (x) (mapcar 'car (apply 'append (cdr x))))
+                  (mapcar (lambda (x) (mapcar 'car (apply 'append (nthcdr 2 x))))
                           bibtex-entry-alist))) nil t)
          (read-string "Regexp: ")
          (if bibtex-search-entry-globally