aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDeepak Goel2007-12-06 16:30:37 +0000
committerDeepak Goel2007-12-06 16:30:37 +0000
commit2e564b0dc50d873996148f653797b46441f0b061 (patch)
tree02ff75f86a6e59660bc928a15ab3a60057815152
parent214abdd48de346bf9b9e331fedbcee607605776a (diff)
downloademacs-2e564b0dc50d873996148f653797b46441f0b061.tar.gz
emacs-2e564b0dc50d873996148f653797b46441f0b061.zip
Fix buggy call to `error'.
-rw-r--r--lisp/erc/ChangeLog4
-rw-r--r--lisp/erc/erc-match.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index bd20dfbed45..f5d7c83985d 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,7 @@
12007-12-06 D. Goel <deego3@gmail.com>
2
3 * erc-match.el (erc-add-entry-to-list): Fix buggy call to `error'.
4
12007-12-01 Glenn Morris <rgm@gnu.org> 52007-12-01 Glenn Morris <rgm@gnu.org>
2 6
3 * erc-backend.el (erc-server-send-ping): Move after definition of 7 * erc-backend.el (erc-server-send-ping): Move after definition of
diff --git a/lisp/erc/erc-match.el b/lisp/erc/erc-match.el
index a4752588ebd..757ef66ea17 100644
--- a/lisp/erc/erc-match.el
+++ b/lisp/erc/erc-match.el
@@ -299,7 +299,7 @@ Completion is performed on the optional alist COMPLETIONS."
299 (lambda (x) 299 (lambda (x)
300 (not (erc-member-ignore-case (car x) (symbol-value list))))))) 300 (not (erc-member-ignore-case (car x) (symbol-value list)))))))
301 (if (erc-member-ignore-case entry (symbol-value list)) 301 (if (erc-member-ignore-case entry (symbol-value list))
302 (error (format "\"%s\" is already on the list" entry)) 302 (error "\"%s\" is already on the list" entry)
303 (set list (cons entry (symbol-value list)))))) 303 (set list (cons entry (symbol-value list))))))
304 304
305(defun erc-remove-entry-from-list (list prompt) 305(defun erc-remove-entry-from-list (list prompt)