* lisp/simple.el (execute-extended-command--shorter): Cut search here.

(execute-extended-command): Instead of here.
This commit is contained in:
Stefan Monnier 2014-11-16 17:24:55 -05:00
parent c2e145b237
commit c94988f4b7
2 changed files with 13 additions and 12 deletions

View file

@ -1,3 +1,8 @@
2014-11-16 Stefan Monnier <monnier@iro.umontreal.ca>
* simple.el (execute-extended-command--shorter): Cut search here.
(execute-extended-command): Instead of here.
2014-11-16 Fabián Ezequiel Gallina <fgallina@gnu.org>
* progmodes/python.el (python-mode): Avoid use of set-local to
@ -15,8 +20,8 @@
2014-11-16 Ulf Jasper <ulf.jasper@web.de>
* calendar/icalendar.el (icalendar--convert-tz-offset): Return
complete cons when offsets of standard time and daylight saving
* calendar/icalendar.el (icalendar--convert-tz-offset):
Return complete cons when offsets of standard time and daylight saving
time are equal.
(icalendar-export-region): Fix unbound variable warning.
@ -27,8 +32,8 @@
2014-11-16 Fabián Ezequiel Gallina <fgallina@gnu.org>
* progmodes/python.el (python-shell-calculate-command): Rename
from python-shell-parse-command. Cleanup.
* progmodes/python.el (python-shell-calculate-command):
Rename from python-shell-parse-command. Cleanup.
(run-python, run-python-internal): Use it.
(python-shell-calculate-pythonpath): Rename from
python-new-pythonpath.

View file

@ -1621,7 +1621,9 @@ If the value is non-nil and not a number, we wait 2 seconds."
(setq len (1+ len))
(setq candidates (execute-extended-command--shorter-1
name len)))
(< len max)))
;; Don't show the help message if the binding isn't
;; significantly shorter than the M-x command the user typed.
(< len (- max 5))))
(let ((candidate (pop candidates)))
(when (equal name
(car-safe (completion-try-completion
@ -1686,13 +1688,7 @@ invoking, give a prefix argument to `execute-extended-command'."
(while-no-input
(setq binding (execute-extended-command--shorter
(symbol-name function) typed))))
(when (and binding
(or (not (stringp binding))
(> (- (length (symbol-name function)) (length binding))
;; Don't show the help message if the
;; binding isn't significantly shorter than
;; the M-x command the user typed.
5)))
(when binding
(with-temp-message
(format "You can run the command `%s' with %s"
function