[Emacs-diffs] emacs/lisp ChangeLog textmodes/bibtex.el

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/12/03 05:41:21

Modified files:
        lisp           : ChangeLog 
        lisp/textmodes : bibtex.el 

Log message:
        (bibtex-complete-internal): Use completion-in-region.
        (bibtex-text-in-field-bounds): Remove unused var `opoint'.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16807&r2=1.16808
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/textmodes/bibtex.el?cvsroot=emacs&r1=1.152&r2=1.153

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16807
retrieving revision 1.16808
diff -u -b -r1.16807 -r1.16808
--- ChangeLog   3 Dec 2009 04:08:09 -0000       1.16807
+++ ChangeLog   3 Dec 2009 05:41:17 -0000       1.16808
@@ -1,3 +1,9 @@
+2009-12-03  Stefan Monnier  <address@hidden>
+
+       * textmodes/bibtex.el (bibtex-complete-internal):
+       Use completion-in-region.
+       (bibtex-text-in-field-bounds): Remove unused var `opoint'.
+
 2009-12-03  Dan Nicolaescu  <address@hidden>
 
        Support applying stashes.  Improve UI.

Index: textmodes/bibtex.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/textmodes/bibtex.el,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -b -r1.152 -r1.153
--- textmodes/bibtex.el 31 Oct 2009 02:38:41 -0000      1.152
+++ textmodes/bibtex.el 3 Dec 2009 05:41:20 -0000       1.153
@@ -1513,8 +1513,8 @@
       (save-excursion
         (goto-char (bibtex-start-of-text-in-field bounds))
         (let ((epoint (bibtex-end-of-text-in-field bounds))
-              content opoint)
-          (while (< (setq opoint (point)) epoint)
+              content)
+          (while (< (point) epoint)
             (if (looking-at bibtex-field-const)
                 (let ((mtch (match-string-no-properties 0)))
                   (push (or (if bibtex-expand-strings
@@ -2702,35 +2702,13 @@
 of a word, all strings are listed.  Return completion."
   ;; Return value is used by cleanup functions.
   ;; Code inspired by `lisp-complete-symbol'.
-  (let* ((case-fold-search t)
-         (beg (save-excursion
+  (let ((beg (save-excursion
                 (re-search-backward "[ \t{\"]")
                 (forward-char)
                 (point)))
-         (end (point))
-         (pattern (buffer-substring-no-properties beg end))
-         (completion (try-completion pattern completions)))
-    (cond ((not completion)
-           (error "Can't find completion for `%s'" pattern))
-          ((eq completion t)
-           pattern)
-          ((not (string= pattern completion))
-           (delete-region beg end)
-           (insert completion)
-           ;; Don't leave around a completions buffer that's out of date.
-           (let ((win (get-buffer-window "*Completions*" 0)))
-             (if win (with-selected-window win (bury-buffer))))
-           completion)
-          (t
-           (let ((minibuf-is-in-use
-                  (eq (minibuffer-window) (selected-window))))
-             (unless minibuf-is-in-use (message "Making completion list..."))
-             (with-output-to-temp-buffer "*Completions*"
-               (display-completion-list
-                (sort (all-completions pattern completions) 'string<) pattern))
-             (unless minibuf-is-in-use
-               (message "Making completion list...done")))
-           nil))))
+        (end (point)))
+    (when (completion-in-region beg end completions)
+      (buffer-substring beg (point)))))
 
 (defun bibtex-complete-string-cleanup (str compl)
   "Cleanup after inserting string STR.