Merge from origin/emacs-25

[gnu-emacs] / lisp / textmodes / refer.el

diff --git a/lisp/textmodes/refer.el b/lisp/textmodes/refer.el
index a811c8f6580f75f20a2ce5d93f98c5e68c629f99..f2abf06ebdca8d0c1ad70e229ef8185d22b6b601 100644 (file)
--- a/lisp/textmodes/refer.el
+++ b/lisp/textmodes/refer.el
@@ -1,7 +1,6 @@
 ;;; refer.el --- look up references in bibliography files
 
 ;;; refer.el --- look up references in bibliography files
 

-;; Copyright (C) 1992, 1996, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1992, 1996, 2001-2016 Free Software Foundation, Inc.

 
 ;; Author: Ashwin Ram <ashwin@cc.gatech.edu>
 ;; Maintainer: Gernot Heiser <gernot@acm.org>
 
 ;; Author: Ashwin Ram <ashwin@cc.gatech.edu>
 ;; Maintainer: Gernot Heiser <gernot@acm.org>


@@ -78,13 +77,13 @@
 
 (defcustom refer-bib-directory nil
   "Directory, or list of directories, to search for \\.bib files.
 
 (defcustom refer-bib-directory nil
   "Directory, or list of directories, to search for \\.bib files.

-Can be set to 'bibinputs or 'texinputs, in which case the environment
+Can be set to `bibinputs' or `texinputs', in which case the environment

 variable BIBINPUTS or TEXINPUTS, respectively, is used to obtain a
 variable BIBINPUTS or TEXINPUTS, respectively, is used to obtain a

-list of directories.  Useful only if `refer-bib-files' is set to 'dir or
+list of directories.  Useful only if `refer-bib-files' is set to `dir' or

 a list of file names (without directory).  A value of nil indicates the
 current working directory.
 
 a list of file names (without directory).  A value of nil indicates the
 current working directory.
 

-If `refer-bib-directory' is 'bibinputs or 'texinputs, it is setq'd to
+If `refer-bib-directory' is `bibinputs' or `texinputs', it is setq'd to

 the appropriate list of directories when it is first used.
 
 Note that an empty directory is interpreted by BibTeX as indicating
 the appropriate list of directories when it is first used.
 
 Note that an empty directory is interpreted by BibTeX as indicating


@@ -230,7 +229,7 @@ found on the last `refer-find-entry' or `refer-find-next-entry'."
                     (sit-for 1)
                     (setq files (cdr files))))))
        (ding)
                     (sit-for 1)
                     (setq files (cdr files))))))
        (ding)

-       (message "Keywords \"%s\" not found in any \.bib file" keywords))
+       (message "Keywords \"%s\" not found in any .bib file" keywords))

      (select-window old-window)))
 
 (defun refer-find-entry-in-file (keywords-list file &optional old-pos)
      (select-window old-window)))
 
 (defun refer-find-entry-in-file (keywords-list file &optional old-pos)


@@ -352,21 +351,21 @@ found on the last `refer-find-entry' or `refer-find-next-entry'."
                         (if (progn
                               (goto-char (point-min))
                               (re-search-forward (concat refer-bib-files-regexp
                         (if (progn
                               (goto-char (point-min))
                               (re-search-forward (concat refer-bib-files-regexp

-                                                         "\\s-*\{") nil t))
+                                                         "\\s-*{") nil t))

                             (let ((files (list (buffer-substring
                                                 (point)
                                                 (progn
                             (let ((files (list (buffer-substring
                                                 (point)
                                                 (progn

-                                                  (re-search-forward "[,\}]"
+                                                  (re-search-forward "[,}]"

                                                                      nil t)
                                                   (backward-char 1)
                                                   (point))))))
                                                                      nil t)
                                                   (backward-char 1)
                                                   (point))))))

-                              (while (not (looking-at "\}"))
+                              (while (not (looking-at "}"))

                                 (setq files (append files
                                                     (list (buffer-substring
                                                            (progn (forward-char 1)
                                                                   (point))
                                                            (progn (re-search-forward
                                 (setq files (append files
                                                     (list (buffer-substring
                                                            (progn (forward-char 1)
                                                                   (point))
                                                            (progn (re-search-forward

-                                                                   "[,\}]" nil t)
+                                                                   "[,}]" nil t)

                                                                   (backward-char 1)
                                                                   (point)))))))
                               files)
                                                                   (backward-char 1)
                                                                   (point)))))))
                               files)


@@ -396,5 +395,4 @@ found on the last `refer-find-entry' or `refer-find-next-entry'."
         (setq refer-bib-files files))
     files))
 
         (setq refer-bib-files files))
     files))
 

-;; arch-tag: 151f641b-e79b-462b-9a29-a95c3793f300

 ;;; refer.el ends here
 ;;; refer.el ends here