diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-12-03 13:42:20 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-12-03 13:42:20 -0500 |
| commit | 41bb375cc71c70fbe9b405272abf0d5f345eee2a (patch) | |
| tree | 9e0cf058823558c2b170b161de6b9e9d398441ad /lisp/progmodes/octave.el | |
| parent | e148a1eacaaa6d6e67db09188f66dab06937ae0d (diff) | |
| download | emacs-41bb375cc71c70fbe9b405272abf0d5f345eee2a.tar.gz emacs-41bb375cc71c70fbe9b405272abf0d5f345eee2a.tar.bz2 emacs-41bb375cc71c70fbe9b405272abf0d5f345eee2a.zip | |
Fixes: debbugs:19250
* lisp/minibuffer.el (completion-table-dynamic): Add arg `switch-buffer'
and change default to stay in the minibuffer when called from
the minibuffer.
(lazy-completion-table): Use this new argument to preserve the
old behavior.
* lisp/progmodes/elisp-mode.el (elisp--local-variables): Don't burp on
incorrect lexical elements (bug#19250).
Diffstat (limited to 'lisp/progmodes/octave.el')
| -rw-r--r-- | lisp/progmodes/octave.el | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el index 25b081545a3..7d963635bc0 100644 --- a/lisp/progmodes/octave.el +++ b/lisp/progmodes/octave.el @@ -45,13 +45,13 @@ (defun completion-table-with-cache (fun &optional ignore-case) ;; See eg bug#11906. (let* (last-arg last-result - (new-fun - (lambda (arg) - (if (and last-arg (string-prefix-p last-arg arg ignore-case)) - last-result - (prog1 - (setq last-result (funcall fun arg)) - (setq last-arg arg)))))) + (new-fun + (lambda (arg) + (if (and last-arg (string-prefix-p last-arg arg ignore-case)) + last-result + (prog1 + (setq last-result (funcall fun arg)) + (setq last-arg arg)))))) (completion-table-dynamic new-fun))))) (eval-when-compile (unless (fboundp 'setq-local) |