* lisp/net/rcirc.el (rcirc-record-activity): Don't abuse add-to-list.

2 files changed, 12 insertions, 8 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 10dbbf92b84..cd8342fdb49 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * net/rcirc.el (rcirc-record-activity): Don't abuse add-to-list.
+
 2013-11-05  Michael Albinus  <michael.albinus@gmx.de>
 
         Fix problems found while writing a test suite.
@@ -15,13 +19,12 @@
 
 2013-11-05  Bozhidar Batsov  <bozhidar@batsov.com>
 
-        * progmodes/python.el (python-mode): Remove incorrect text from docstring.
-        * progmodes/scheme.el (scheme-mode): Remove incorrect text from docstring.
-        * progmodes/prolog.el (prolog-mode): Remove incorrect text from docstring.
-        * emacs-lisp/lisp-mode.el (lisp-mode, lisp-interaction-mode, emacs-lisp-mode):
-        Remove incorrect text from docstring.
-
-        * progmodes/ruby-mode.el (ruby-mode): Remove incorrect text from docstring.
+        * progmodes/python.el (python-mode):
+        * progmodes/scheme.el (scheme-mode):
+        * progmodes/prolog.el (prolog-mode):
+        * progmodes/ruby-mode.el (ruby-mode):
+        * emacs-lisp/lisp-mode.el (lisp-mode, lisp-interaction-mode)
+        (emacs-lisp-mode): Remove incorrect and redundant text from docstring.
 
 2013-11-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 2d8da415295..f7d43989868 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -1950,7 +1950,8 @@ activity.  Only run if the buffer is not visible and
           (old-types rcirc-activity-types))
       (when (not (get-buffer-window (current-buffer) t))
         (setq rcirc-activity
-              (sort (add-to-list 'rcirc-activity (current-buffer))
+              (sort (if (memq (current-buffer) rcirc-activity) rcirc-activity
+                      (cons (current-buffer) rcirc-activity))
                     (lambda (b1 b2)
                       (let ((t1 (with-current-buffer b1 rcirc-last-post-time))
                             (t2 (with-current-buffer b2 rcirc-last-post-time)))