diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-06-19 00:53:51 +0200 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-06-19 00:53:51 +0200 |
| commit | d9088290efb49a352c3c23da25a734ed3e269923 (patch) | |
| tree | e9c09623885e31c90756c0c74373b2e7886674e7 /lisp/calendar | |
| parent | 8085d5fcc4240a39458ead26ae2279590bb9f629 (diff) | |
| parent | 2317c61868044dc1fea58d9e81f35d354f24fd69 (diff) | |
| download | emacs-d9088290efb49a352c3c23da25a734ed3e269923.tar.gz | |
Merge from origin/emacs-25
2317c61 Fix last todo-mode change
5d4d8a3 Improve last todo-mode fix
d7084f2 Fix todo-mode use of minibuffer completion keymap (bug#23695).
27dec52 * src/alloc.c (ALIGN): Avoid error on DragonFly BSD. (Bug#23...
f526191 * lisp/emacs-lisp/nadvice.el (advice--make-docstring): Avoid ...
e881070 * lisp/help-fns.el (describe-function-1): Avoid reporting adv...
d308aa1 Minor grammar fix (bug#23746)
20de667 Doc fixes for grammar and typos (bug#23746)
a67a4e5 * doc/lispref/processes.texi (Process Buffers): Minor rewordi...
27f440e Add cross-reference to ELisp manual
10802d8 ; make change-history-commit
4b2d77d * lisp/emacs-lisp/macroexp.el (macroexp--expand-all): Fix (bu...
12e009e Restore initial undo boundary with viper
291fe0a Revert "Fix viper undo breakage from undo-boundary changes"
6921f4a Fix dbus crash on 32-bit Cygwin
Diffstat (limited to 'lisp/calendar')
| -rw-r--r-- | lisp/calendar/todo-mode.el | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/calendar/todo-mode.el b/lisp/calendar/todo-mode.el index 8e752586053..aee101f7218 100644 --- a/lisp/calendar/todo-mode.el +++ b/lisp/calendar/todo-mode.el @@ -5750,8 +5750,11 @@ With non-nil argument FILE prompt for a file and complete only against categories in that file; otherwise complete against all categories from `todo-category-completions-files'." ;; Allow SPC to insert spaces, for adding new category names. - (let ((map minibuffer-local-completion-map)) - (define-key map " " nil) + (let ((minibuffer-local-completion-map + (let ((map (make-sparse-keymap))) + (set-keymap-parent map minibuffer-local-completion-map) + (define-key map " " nil) + map))) (let* ((add (eq match-type 'add)) (archive (eq match-type 'archive)) (file0 (when (and file (> (length todo-files) 1)) |