[Emacs-diffs] /srv/bzr/emacs/trunk r105670: Conditionally initialize rcirc-input-ring

[Leo Liu]

------------------------------------------------------------
revno: 105670
committer: Leo Liu <address@hidden>
branch nick: trunk
timestamp: Wed 2011-09-07 11:37:22 +0800
message:
  Conditionally initialize rcirc-input-ring
modified:
  lisp/ChangeLog
  lisp/net/rcirc.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-09-07 01:06:09 +0000
+++ b/lisp/ChangeLog    2011-09-07 03:37:22 +0000
@@ -1,3 +1,8 @@
+2011-09-07  Leo Liu  <address@hidden>
+
+       * net/rcirc.el (rcirc-mode): Conditionally initialize
+       rcirc-input-ring.
+
 2011-09-07  Stefan Monnier  <address@hidden>
 
        * emacs-lisp/find-func.el (find-function-C-source): Only set

=== modified file 'lisp/net/rcirc.el'
--- a/lisp/net/rcirc.el 2011-09-03 17:40:08 +0000
+++ b/lisp/net/rcirc.el 2011-09-07 03:37:22 +0000
@@ -964,7 +964,13 @@
   (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)