aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorŁukasz Stelmach2010-08-26 17:33:52 +0200
committerJuanma Barranquero2010-08-26 17:33:52 +0200
commitd5720b4c5afa88de93ad4cabd29de70800d40122 (patch)
treee218a6e8aca8f89beda5824d9c5cd7ef41a26d08
parent4f558297553dfb294bac9d642e28a7b9c4207525 (diff)
downloademacs-d5720b4c5afa88de93ad4cabd29de70800d40122.tar.gz
emacs-d5720b4c5afa88de93ad4cabd29de70800d40122.zip
play/cookie1.el (read-cookie): Fix off-by-one error (bug#6921).
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/play/cookie1.el2
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4832f12bace..92178cd53d7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12010-08-26 Łukasz Stelmach <lukasz.stelmach@iem.pw.edu.pl> (tiny change)
2
3 * play/cookie1.el (read-cookie): Fix off-by-one error (bug#6921).
4
12010-08-26 Chong Yidong <cyd@stupidchicken.com> 52010-08-26 Chong Yidong <cyd@stupidchicken.com>
2 6
3 * simple.el (beginning-of-buffer, end-of-buffer): Doc fix 7 * simple.el (beginning-of-buffer, end-of-buffer): Doc fix
@@ -36,7 +40,7 @@
36 40
372010-08-21 Leo <sdl.web@gmail.com> 412010-08-21 Leo <sdl.web@gmail.com>
38 42
39 Fix buffer-list rename&refresh after after killing a buffer in ido. 43 Fix buffer-list rename&refresh after killing a buffer in ido.
40 * lisp/ido.el: Revert Óscar's. 44 * lisp/ido.el: Revert Óscar's.
41 (ido-kill-buffer-at-head): Exit the minibuffer with ido-exit=refresh. 45 (ido-kill-buffer-at-head): Exit the minibuffer with ido-exit=refresh.
42 Remember the buffers at head, rather than their name. 46 Remember the buffers at head, rather than their name.
diff --git a/lisp/play/cookie1.el b/lisp/play/cookie1.el
index 75c0d9b2b06..e786c6cc5c1 100644
--- a/lisp/play/cookie1.el
+++ b/lisp/play/cookie1.el
@@ -138,7 +138,7 @@ Optional fifth arg REQUIRE-MATCH non-nil forces a matching cookie."
138 (vec (cookie-snarf phrase-file 138 (vec (cookie-snarf phrase-file
139 startmsg endmsg)) 139 startmsg endmsg))
140 (i (length vec))) 140 (i (length vec)))
141 (while (> (setq i (1- i)) 0) 141 (while (>= (setq i (1- i)) 0)
142 (setq alist (cons (list (aref vec i)) alist))) 142 (setq alist (cons (list (aref vec i)) alist)))
143 (put sym 'completion-alist alist)))) 143 (put sym 'completion-alist alist))))
144 nil require-match nil nil)) 144 nil require-match nil nil))