summaryrefslogtreecommitdiff
path: root/lisp/erc/erc-ring.el
diff options
context:
space:
mode:
authorl3thal <l3thal@debian>2014-11-08 20:51:43 -0500
committerl3thal <l3thal@debian>2014-11-08 20:51:43 -0500
commitd1036d288de1e047f7f6043188a1063f0d6b044d (patch)
tree539b06df3227d25928e2a78f8144bf4242be67f9 /lisp/erc/erc-ring.el
parent7d8205619a95e44ec5c4d589c538c6616e64483b (diff)
downloademacs-d1036d288de1e047f7f6043188a1063f0d6b044d.tar.gz
emacs-d1036d288de1e047f7f6043188a1063f0d6b044d.tar.bz2
emacs-d1036d288de1e047f7f6043188a1063f0d6b044d.zip
backport: erc bugfixes
Diffstat (limited to 'lisp/erc/erc-ring.el')
-rw-r--r--lisp/erc/erc-ring.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/erc/erc-ring.el b/lisp/erc/erc-ring.el
index 1762700ff36..682585c53bb 100644
--- a/lisp/erc/erc-ring.el
+++ b/lisp/erc/erc-ring.el
@@ -67,7 +67,8 @@ variable.")
(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)