diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-10-29 22:15:28 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-10-29 22:15:28 -0700 |
| commit | 52b410c60aebeb769ec9580af25ca50df2a44751 (patch) | |
| tree | ba5de0b896c5ea410ceb2f2f1866c0fac73ea236 /lisp/erc | |
| parent | cc99f920f507d28bb1422f8a3d52723ddc734c8a (diff) | |
| parent | 237bf45a48999d5a8a3617822dddf3ea305bc269 (diff) | |
| download | emacs-52b410c60aebeb769ec9580af25ca50df2a44751.tar.gz | |
Merge from emacs-24; up to 117634
Diffstat (limited to 'lisp/erc')
| -rw-r--r-- | lisp/erc/erc-track.el | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lisp/erc/erc-track.el b/lisp/erc/erc-track.el index 47e76c3ea1e..fae6be433fd 100644 --- a/lisp/erc/erc-track.el +++ b/lisp/erc/erc-track.el @@ -265,9 +265,7 @@ nil - don't add to mode line." (erc-track-add-to-mode-line val)))) (defun erc-modified-channels-object (strings) - "Generate a new `erc-modified-channels-object' based on STRINGS. -If STRINGS is nil, we initialize `erc-modified-channels-object' to -an appropriate initial value for this flavor of Emacs." + "Generate a new `erc-modified-channels-object' based on STRINGS." (if strings (if (featurep 'xemacs) (let ((e-m-c-s '("["))) @@ -743,7 +741,7 @@ only consider active buffers visible.") (defvar erc-modified-channels-update-inside nil "Variable to prevent running `erc-modified-channels-update' multiple times. Without it, you cannot debug `erc-modified-channels-display', -because the debugger also cases changes to the window-configuration.") +because the debugger also causes changes to the window-configuration.") (defun erc-modified-channels-update (&rest _args) "This function updates the information in `erc-modified-channels-alist' |