diff options
| author | Ivan Shmakov <ivan@siamics.net> | 2014-10-02 07:31:56 -0400 |
|---|---|---|
| committer | Kelvin White <kwhite@gnu.org> | 2014-10-02 07:31:56 -0400 |
| commit | 3af2917c91e4eb863e1cec92a68ccb3acf940dae (patch) | |
| tree | 05a9ae9edbb2d1a5a8e1a1605b4ea2f3074da7a6 | |
| parent | 5f8947c7007d1d844b3d1de97e2d232a005ca07d (diff) | |
Do not reset input ring if one exists
Fixes: debbugs:18599
| -rw-r--r-- | lisp/erc/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/erc/erc-ring.el | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index 1ea79dbbc1..e4f65895de 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,3 +1,7 @@ +2014-10-02 Kelvin White <kwhite@gnu.org> + + * erc-ring.el (erc-input-ring-setup): Fixes Bug #18599 + 2014-09-30 Stefan Monnier <monnier@iro.umontreal.ca> * erc-track.el (erc-modified-channels-display): Update all mode lines diff --git a/lisp/erc/erc-ring.el b/lisp/erc/erc-ring.el index 1762700ff3..682585c53b 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) |