aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/simple.el
diff options
context:
space:
mode:
authorAlan Mackenzie2017-02-05 16:28:53 +0000
committerAlan Mackenzie2017-02-05 16:28:53 +0000
commitd5514332d4a6092673ce1f78fadcae0c57f7be64 (patch)
tree1780337154904dcfad8ecfa76614b47c082160dd /lisp/simple.el
parentcecc25c68f5a1834c356e18259aa2af402a70ce1 (diff)
parentde3336051ef74e0c3069374ced5b5fc7bb9fba15 (diff)
downloademacs-d5514332d4a6092673ce1f78fadcae0c57f7be64.tar.gz
emacs-d5514332d4a6092673ce1f78fadcae0c57f7be64.zip
Merge branch 'master' into comment-cache
Diffstat (limited to 'lisp/simple.el')
-rw-r--r--lisp/simple.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/simple.el b/lisp/simple.el
index 0ee2f060e5e..f798cd43847 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1,6 +1,6 @@
1;;; simple.el --- basic editing commands for Emacs -*- lexical-binding: t -*- 1;;; simple.el --- basic editing commands for Emacs -*- lexical-binding: t -*-
2 2
3;; Copyright (C) 1985-1987, 1993-2016 Free Software Foundation, Inc. 3;; Copyright (C) 1985-1987, 1993-2017 Free Software Foundation, Inc.
4 4
5;; Maintainer: emacs-devel@gnu.org 5;; Maintainer: emacs-devel@gnu.org
6;; Keywords: internal 6;; Keywords: internal
@@ -1699,6 +1699,7 @@ If the value is non-nil and not a number, we wait 2 seconds."
1699 ;; Don't show the help message if the binding isn't 1699 ;; Don't show the help message if the binding isn't
1700 ;; significantly shorter than the M-x command the user typed. 1700 ;; significantly shorter than the M-x command the user typed.
1701 (< len (- max 5)))) 1701 (< len (- max 5))))
1702 (input-pending-p) ;Dummy call to trigger input-processing, bug#23002.
1702 (let ((candidate (pop candidates))) 1703 (let ((candidate (pop candidates)))
1703 (when (equal name 1704 (when (equal name
1704 (car-safe (completion-try-completion 1705 (car-safe (completion-try-completion