diff options
| author | Richard M. Stallman | 1995-11-18 15:57:50 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1995-11-18 15:57:50 +0000 |
| commit | c5c4b51cc68d84b6cf3db933ac595c95e54de104 (patch) | |
| tree | e27dfb802558c24ab7a13abb9579f888c0e5d512 /lisp | |
| parent | 4d98816f32d006a64bf6a789d0e2be3493201ad9 (diff) | |
| download | emacs-c5c4b51cc68d84b6cf3db933ac595c95e54de104.tar.gz emacs-c5c4b51cc68d84b6cf3db933ac595c95e54de104.zip | |
(tmm-prompt): Delete tmm-add-prompt if we fail.
Don't switch to *Completions* if it wasn't created.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/tmm.el | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/tmm.el b/lisp/tmm.el index 281b6a3d845..1d23ffb5ca9 100644 --- a/lisp/tmm.el +++ b/lisp/tmm.el | |||
| @@ -115,9 +115,12 @@ If the optional argument IN-POPUP is set, is argument-compatible with | |||
| 115 | tmm-km-list nil t nil | 115 | tmm-km-list nil t nil |
| 116 | (cons 'history (* 2 history-len)))) | 116 | (cons 'history (* 2 history-len)))) |
| 117 | (save-excursion | 117 | (save-excursion |
| 118 | (set-buffer "*Completions*") | 118 | (remove-hook 'minibuffer-setup-hook 'tmm-add-prompt) |
| 119 | (use-local-map tmm-old-comp-map) | 119 | (if (get-buffer "*Completions*") |
| 120 | (bury-buffer (current-buffer))) | 120 | (progn |
| 121 | (set-buffer "*Completions*") | ||
| 122 | (use-local-map tmm-old-comp-map) | ||
| 123 | (bury-buffer (current-buffer))))) | ||
| 121 | ))) | 124 | ))) |
| 122 | (setq bind (cdr (assoc out tmm-km-list))) | 125 | (setq bind (cdr (assoc out tmm-km-list))) |
| 123 | (and (null bind) | 126 | (and (null bind) |