[Emacs-diffs] /srv/bzr/emacs/trunk r110680: * lisp/bookmark.el (bookmark-completing-read): Set the completion category

[Stefan Monnier]

------------------------------------------------------------
revno: 110680
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=11131
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Fri 2012-10-26 13:20:54 -0400
message:
  * lisp/bookmark.el (bookmark-completing-read): Set the completion category
  to `bookmark'.
modified:
  lisp/ChangeLog
  lisp/bookmark.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-10-26 17:07:35 +0000
+++ b/lisp/ChangeLog    2012-10-26 17:20:54 +0000
@@ -1,3 +1,8 @@
+2012-10-26  Stefan Monnier  <address@hidden>
+
+       * bookmark.el (bookmark-completing-read): Set the completion category
+       to `bookmark' (bug#11131).
+
 2012-10-26  Bastien  <address@hidden>
             Stefan Monnier  <address@hidden>
 

=== modified file 'lisp/bookmark.el'
--- a/lisp/bookmark.el  2012-10-02 02:47:12 +0000
+++ b/lisp/bookmark.el  2012-10-26 17:20:54 +0000
@@ -433,7 +433,11 @@
                                     ": ")))
           (str
            (completing-read prompt
-                            bookmark-alist
+                            (lambda (string pred action)
+                               (if (eq action 'metadata)
+                                   '(metadata (category . bookmark))
+                                 (complete-with-action
+                                  action bookmark-alist string pred)))
                             nil
                             0
                             nil