Conditionally initialize rcirc-input-ring

2 files changed, 12 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 979708e2c91..310fb42a155 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-07  Leo Liu  <sdl.web@gmail.com>
+
+        * net/rcirc.el (rcirc-mode): Conditionally initialize
+        rcirc-input-ring.
+
 2011-09-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * emacs-lisp/find-func.el (find-function-C-source): Only set
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 06bbfb0b78c..51a087bc084 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -964,7 +964,13 @@ This number is independent of the number of lines in the buffer.")
   (setq mode-line-process nil)
 
   (set (make-local-variable 'rcirc-input-ring)
-       (make-ring rcirc-input-ring-size))
+       ;; If rcirc-input-ring is already a ring with desired size do
+       ;; not re-initialize.
+       (if (and (ring-p rcirc-input-ring)
+                (= (ring-size rcirc-input-ring)
+                   rcirc-input-ring-size))
+           rcirc-input-ring
+         (make-ring rcirc-input-ring-size)))
   (set (make-local-variable 'rcirc-server-buffer) (process-buffer process))
   (set (make-local-variable 'rcirc-target) target)
   (set (make-local-variable 'rcirc-topic) nil)