summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/minibuffer.el6
2 files changed, 9 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2319aa87f29..5864f61403b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,11 @@
2012-09-11 Bastien Guerry <bzg@gnu.org>
- * help-fns.el (describe-variable): Fix typo.
+ * minibuffer.el (completion-table-subvert): Fix docstring.
+ (bug#12347)
+
+2012-09-11 Bastien Guerry <bzg@gnu.org>
+
+ * help-fns.el (describe-variable): Fix typo. (bug#12346)
2012-09-10 Michael R. Mauger <mmaug@yahoo.com>
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index a696fff7dc7..669ea58656d 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -211,10 +211,10 @@ case sensitive instead."
(complete-with-action action table string pred))))
(defun completion-table-subvert (table s1 s2)
- "Completion table that replaces the prefix S1 with S2 in STRING.
+ "Return a completion table from TABLE with S1 replaced by S2.
The result is a completion table which completes strings of the
-form (concat S1 S) in the same way as TABLE completes strings of
-the form (concat S2 S)."
+form (concat S2 S) in the same way as TABLE completes strings of
+the form (concat S1 S)."
(lambda (string pred action)
(let* ((str (if (eq t (compare-strings string 0 (length s1) s1 nil nil
completion-ignore-case))