aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2009-11-13 14:50:17 +0000
committerStefan Monnier2009-11-13 14:50:17 +0000
commite96d62cd3ae0f96d084d15d3581d7bf0b69e3799 (patch)
tree65c96e9bd7824dd2745571114ece94e743e27bb3
parent8a605fe839a119820e7e346bf860a9245872fa67 (diff)
downloademacs-e96d62cd3ae0f96d084d15d3581d7bf0b69e3799.tar.gz
emacs-e96d62cd3ae0f96d084d15d3581d7bf0b69e3799.zip
(minibuffer-default-add-completions): Drop deprecated 4th arg.
-rw-r--r--lisp/ChangeLog12
-rw-r--r--lisp/simple.el3
2 files changed, 10 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fa3beffc34c..10cb54857a0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,12 @@
12009-11-13 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * simple.el (minibuffer-default-add-completions): Drop deprecated
4 4th arg.
5
12009-11-13 Tomas Abrahamsson <tab@lysator.liu.se> 62009-11-13 Tomas Abrahamsson <tab@lysator.liu.se>
2 7
3 * textmodes/artist.el (artist-mouse-choose-operation): Call 8 * textmodes/artist.el (artist-mouse-choose-operation):
4 `tmm-prompt' instead of `x-popup-menu' if we cannot popup 9 Call `tmm-prompt' instead of `x-popup-menu' if we cannot popup
5 menus. Bug noticed by Eli Zaretskii <eliz@gnu.org>. 10 menus. Bug noticed by Eli Zaretskii <eliz@gnu.org>.
6 (artist-compute-up-event-key): New function. 11 (artist-compute-up-event-key): New function.
7 (artist-mouse-choose-operation, artist-down-mouse-1): Call it. 12 (artist-mouse-choose-operation, artist-down-mouse-1): Call it.
@@ -468,7 +473,8 @@
468 473
4692009-11-03 Stefan Monnier <monnier@iro.umontreal.ca> 4742009-11-03 Stefan Monnier <monnier@iro.umontreal.ca>
470 475
471 * calendar/todo-mode.el (todo-add-category): Don't hardcode point-min==1. 476 * calendar/todo-mode.el (todo-add-category): Don't hardcode
477 point-min==1.
472 (todo-top-priorities): Only display-buffer when called interactively. 478 (todo-top-priorities): Only display-buffer when called interactively.
473 (todo-item-start): Don't save excursion point. 479 (todo-item-start): Don't save excursion point.
474 (todo-item-end): Be slightly more careful. Add `include-sep' arg. 480 (todo-item-end): Be slightly more careful. Add `include-sep' arg.
diff --git a/lisp/simple.el b/lisp/simple.el
index 73c7ac7579f..e1d0f052ea0 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1374,8 +1374,7 @@ the end of the list of defaults just after the default value."
1374 (let ((def minibuffer-default) 1374 (let ((def minibuffer-default)
1375 (all (all-completions "" 1375 (all (all-completions ""
1376 minibuffer-completion-table 1376 minibuffer-completion-table
1377 minibuffer-completion-predicate 1377 minibuffer-completion-predicate)))
1378 t)))
1379 (if (listp def) 1378 (if (listp def)
1380 (append def all) 1379 (append def all)
1381 (cons def (delete def all))))) 1380 (cons def (delete def all)))))