aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDrew Adams2012-09-08 22:30:09 +0800
committerChong Yidong2012-09-08 22:30:09 +0800
commit1715f2dbca4b516432569892b708e9c1c0e9a2dd (patch)
tree4dc4be6cbdc7bd051c815ece3acb218c0d39b27e
parent6dcef6eca79b118976211b05552880be2ddf014a (diff)
downloademacs-1715f2dbca4b516432569892b708e9c1c0e9a2dd.tar.gz
emacs-1715f2dbca4b516432569892b708e9c1c0e9a2dd.zip
* subr.el (add-to-history): Fix delete usage.
Fixes: debbugs:12314
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/subr.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4d6210a16b9..b45d2fd8235 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12012-09-08 Drew Adams <drew.adams@oracle.com>
2
3 * subr.el (add-to-history): Fix delete usage (Bug#12314).
4
12012-09-08 Chong Yidong <cyd@gnu.org> 52012-09-08 Chong Yidong <cyd@gnu.org>
2 6
3 * subr.el (syntax-after, syntax-class): Doc fix. 7 * subr.el (syntax-after, syntax-class): Doc fix.
diff --git a/lisp/subr.el b/lisp/subr.el
index 4f273a92a62..21dd270caef 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1548,7 +1548,7 @@ if it is empty or a duplicate."
1548 (or keep-all 1548 (or keep-all
1549 (not (equal (car history) newelt)))) 1549 (not (equal (car history) newelt))))
1550 (if history-delete-duplicates 1550 (if history-delete-duplicates
1551 (delete newelt history)) 1551 (setq history (delete newelt history)))
1552 (setq history (cons newelt history)) 1552 (setq history (cons newelt history))
1553 (when (integerp maxelt) 1553 (when (integerp maxelt)
1554 (if (= 0 maxelt) 1554 (if (= 0 maxelt)