aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorBastien Guerry2012-09-11 16:06:33 +0200
committerBastien Guerry2012-09-11 16:06:33 +0200
commit96d0357142bf277e6eb4d957a59b2c655034e2b7 (patch)
tree37c9a9bfc157ee13a8d2fb88eb3a2029641e8d59 /lisp
parent04e8abfa697ebab5303e0426ba3d1c5abe133a16 (diff)
downloademacs-96d0357142bf277e6eb4d957a59b2c655034e2b7.tar.gz
emacs-96d0357142bf277e6eb4d957a59b2c655034e2b7.zip
* minibuffer.el (completion-table-subvert): Fix docstring. (bug#12347)
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 @@
12012-09-11 Bastien Guerry <bzg@gnu.org> 12012-09-11 Bastien Guerry <bzg@gnu.org>
2 2
3 * help-fns.el (describe-variable): Fix typo. 3 * minibuffer.el (completion-table-subvert): Fix docstring.
4 (bug#12347)
5
62012-09-11 Bastien Guerry <bzg@gnu.org>
7
8 * help-fns.el (describe-variable): Fix typo. (bug#12346)
4 9
52012-09-10 Michael R. Mauger <mmaug@yahoo.com> 102012-09-10 Michael R. Mauger <mmaug@yahoo.com>
6 11
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."
211 (complete-with-action action table string pred)))) 211 (complete-with-action action table string pred))))
212 212
213(defun completion-table-subvert (table s1 s2) 213(defun completion-table-subvert (table s1 s2)
214 "Completion table that replaces the prefix S1 with S2 in STRING. 214 "Return a completion table from TABLE with S1 replaced by S2.
215The result is a completion table which completes strings of the 215The result is a completion table which completes strings of the
216form (concat S1 S) in the same way as TABLE completes strings of 216form (concat S2 S) in the same way as TABLE completes strings of
217the form (concat S2 S)." 217the form (concat S1 S)."
218 (lambda (string pred action) 218 (lambda (string pred action)
219 (let* ((str (if (eq t (compare-strings string 0 (length s1) s1 nil nil 219 (let* ((str (if (eq t (compare-strings string 0 (length s1) s1 nil nil
220 completion-ignore-case)) 220 completion-ignore-case))