diff options
| author | l3thal | 2014-11-08 20:51:43 -0500 |
|---|---|---|
| committer | l3thal | 2014-11-08 20:51:43 -0500 |
| commit | d1036d288de1e047f7f6043188a1063f0d6b044d (patch) | |
| tree | 539b06df3227d25928e2a78f8144bf4242be67f9 /lisp/erc/erc-ring.el | |
| parent | 7d8205619a95e44ec5c4d589c538c6616e64483b (diff) | |
| download | emacs-d1036d288de1e047f7f6043188a1063f0d6b044d.tar.gz emacs-d1036d288de1e047f7f6043188a1063f0d6b044d.zip | |
backport: erc bugfixes
Diffstat (limited to 'lisp/erc/erc-ring.el')
| -rw-r--r-- | lisp/erc/erc-ring.el | 3 |
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.") | |||
| 67 | (defun erc-input-ring-setup () | 67 | (defun erc-input-ring-setup () |
| 68 | "Do the setup required so that we can use comint style input rings. | 68 | "Do the setup required so that we can use comint style input rings. |
| 69 | Call this function when setting up the mode." | 69 | Call this function when setting up the mode." |
| 70 | (setq erc-input-ring (make-ring comint-input-ring-size)) | 70 | (unless (ring-p erc-input-ring) |
| 71 | (setq erc-input-ring (make-ring comint-input-ring-size))) | ||
| 71 | (setq erc-input-ring-index nil)) | 72 | (setq erc-input-ring-index nil)) |
| 72 | 73 | ||
| 73 | (defun erc-add-to-input-ring (s) | 74 | (defun erc-add-to-input-ring (s) |