aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBastien Guerry2013-04-09 11:36:25 +0200
committerBastien Guerry2013-04-09 11:36:25 +0200
commitb39792eb9ed314c91c68ff55f78a5557d5e56534 (patch)
tree55fd690773b15c55315a51b358e655450652bfdc
parentba3b2d88d847cf1669f3f0c340f8864c77fe59de (diff)
downloademacs-b39792eb9ed314c91c68ff55f78a5557d5e56534.tar.gz
emacs-b39792eb9ed314c91c68ff55f78a5557d5e56534.zip
* simple.el (choose-completion-string): Fix docstring (bug#14163).
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/simple.el4
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 95aadd40fd6..8eafcfacd98 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12013-04-09 Bastien Guerry <bzg@gnu.org>
2
3 * simple.el (choose-completion-string): Fix docstring (bug#14163).
4
12013-04-08 Stefan Monnier <monnier@iro.umontreal.ca> 52013-04-08 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * emacs-lisp/edebug.el (edebug-mode): Fix typo (bug#14144). 7 * emacs-lisp/edebug.el (edebug-mode): Fix typo (bug#14144).
diff --git a/lisp/simple.el b/lisp/simple.el
index 9baa1b7c884..5adb634e195 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -6628,7 +6628,9 @@ the default method of inserting the completion in BUFFER.")
6628(defun choose-completion-string (choice &optional 6628(defun choose-completion-string (choice &optional
6629 buffer base-position insert-function) 6629 buffer base-position insert-function)
6630 "Switch to BUFFER and insert the completion choice CHOICE. 6630 "Switch to BUFFER and insert the completion choice CHOICE.
6631BASE-POSITION, says where to insert the completion." 6631BASE-POSITION says where to insert the completion.
6632INSERT-FUNCTION says how to insert the completion and falls
6633back on `completion-list-insert-choice-function' when nil."
6632 6634
6633 ;; If BUFFER is the minibuffer, exit the minibuffer 6635 ;; If BUFFER is the minibuffer, exit the minibuffer
6634 ;; unless it is reading a file name and CHOICE is a directory, 6636 ;; unless it is reading a file name and CHOICE is a directory,