[Emacs-diffs] trunk r118008: Do not reset input ring if one exists

[Kelvin White]

------------------------------------------------------------
revno: 118008
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18599
author: Ivan Shmakov <address@hidden>
committer: Kelvin White <address@hidden>
branch nick: trunk
timestamp: Thu 2014-10-02 07:31:56 -0400
message:
  Do not reset input ring if one exists
modified:
  lisp/erc/ChangeLog             changelog-20091113204419-o5vbwnq5f7feedwu-4305
  lisp/erc/erc-ring.el           ercring.el-20091113204419-o5vbwnq5f7feedwu-4337

=== modified file 'lisp/erc/ChangeLog'
--- a/lisp/erc/ChangeLog        2014-09-30 23:19:31 +0000
+++ b/lisp/erc/ChangeLog        2014-10-02 11:31:56 +0000
@@ -1,3 +1,7 @@
+2014-10-02  Kelvin White  <address@hidden>
+
+       * erc-ring.el (erc-input-ring-setup): Fixes Bug #18599
+
 2014-09-30  Stefan Monnier  <address@hidden>
 
        * erc-track.el (erc-modified-channels-display): Update all mode lines

=== modified file 'lisp/erc/erc-ring.el'
--- a/lisp/erc/erc-ring.el      2014-02-10 01:34:22 +0000
+++ b/lisp/erc/erc-ring.el      2014-10-02 11:31:56 +0000
@@ -67,7 +67,8 @@
 (defun erc-input-ring-setup ()
   "Do the setup required so that we can use comint style input rings.
 Call this function when setting up the mode."
-  (setq erc-input-ring (make-ring comint-input-ring-size))
+  (unless (ring-p erc-input-ring)
+    (setq erc-input-ring (make-ring comint-input-ring-size)))
   (setq erc-input-ring-index nil))
 
 (defun erc-add-to-input-ring (s)