aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/minibuffer.el1
2 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7cb9fb0793c..4f6e37af6ee 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12012-10-26 Jambunathan K <kjambunathan@gmail.com>
2
3 * minibuffer.el (completion-category-overrides): New completion
4 category `bookmark' (bug#11131).
5
12012-10-26 Stefan Monnier <monnier@iro.umontreal.ca> 62012-10-26 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * emacs-lisp/advice.el (ad-assemble-advised-definition): 8 * emacs-lisp/advice.el (ad-assemble-advised-definition):
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 4421e325b91..52c3a0ba659 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -743,6 +743,7 @@ completing buffer and file names, respectively."
743 (const buffer) 743 (const buffer)
744 (const file) 744 (const file)
745 (const unicode-name) 745 (const unicode-name)
746 (const bookmark)
746 symbol) 747 symbol)
747 :value-type 748 :value-type
748 (set :tag "Properties to override" 749 (set :tag "Properties to override"