lisp/textmodes/bibtex.el (bibtex-search-entry-globally): New variable

3 files changed, 24 insertions, 4 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 1013df219e4..9b1bb99eb1b 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -440,6 +440,8 @@ Just set shell-dir-cookie-re to an appropriate regexp.
 
 *** New `bibtex-entry-format' option `sort-fields', disabled by default.
 
+*** New variable `bibtex-search-entry-globally'.
+
 ** latex-electric-env-pair-mode keeps \begin..\end matched on the fly.
 
 ** FIXME: xdg-open for browse-url and reportbug, 2010/08.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b719807701c..e2974bda4c7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2011-06-05  Roland Winkler  <winkler@gnu.org>
 
+        * textmodes/bibtex.el (bibtex-search-entry-globally): New
+        variable.
+        (bibtex-search-entry): Use it.
+
+2011-06-05  Roland Winkler  <winkler@gnu.org>
+
         * textmodes/bibtex.el (bibtex-entry-format): New option
         sort-fields.
         (bibtex-format-entry, bibtex-reformat): Honor this option.
diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el
index 149145a6bfe..349ab28b4d9 100644
--- a/lisp/textmodes/bibtex.el
+++ b/lisp/textmodes/bibtex.el
@@ -597,7 +597,8 @@ to the directories specified in `bibtex-string-file-path'."
 List elements can be absolute file names or file names relative to the
 directories specified in `bibtex-file-path'.  If an element is a directory,
 check all BibTeX files in this directory.  If an element is the symbol
-`bibtex-file-path', check all BibTeX files in `bibtex-file-path'."
+`bibtex-file-path', check all BibTeX files in `bibtex-file-path'.
+See also `bibtex-search-entry-globally'."
   :group 'bibtex
   :type '(repeat (choice (const :tag "bibtex-file-path" bibtex-file-path)
                          directory file)))
@@ -605,6 +606,12 @@ check all BibTeX files in this directory.  If an element is the symbol
 (defvar bibtex-file-path (getenv "BIBINPUTS")
   "*Colon separated list of paths to search for `bibtex-files'.")
 
+(defcustom bibtex-search-entry-globally nil
+  "If non-nil, interactive calls of `bibtex-search-entry' search globally.
+A global search includes all files in `bibtex-files'."
+  :group 'bibtex
+  :type 'boolean)
+
 (defcustom bibtex-help-message t
   "If non-nil print help messages in the echo area on entering a new field."
   :group 'bibtex
@@ -3585,10 +3592,15 @@ is limited to the current buffer.  Optional arg START is buffer position
 where the search starts.  If it is nil, start search at beginning of buffer.
 If DISPLAY is non-nil, display the buffer containing KEY.
 Otherwise, use `set-buffer'.
-When called interactively, GLOBAL is t if there is a prefix arg or the current
-mode is not `bibtex-mode', START is nil, and DISPLAY is t."
+When called interactively, START is nil, DISPLAY is t.
+Also, GLOBAL is t if the current mode is not `bibtex-mode'
+or `bibtex-search-entry-globally' is non-nil.
+A prefix arg negates the value of `bibtex-search-entry-globally'."
   (interactive
-   (let ((global (or current-prefix-arg (not (eq major-mode 'bibtex-mode)))))
+   (let ((global (or (not (eq major-mode 'bibtex-mode))
+                     (if bibtex-search-entry-globally
+                         (not current-prefix-arg)
+                       current-prefix-arg))))
      (list (bibtex-read-key "Find key: " nil global) global nil t)))
   (if (and global bibtex-files)
       (let ((buffer-list (bibtex-initialize t))