diff options
| author | Stefan Kangas | 2022-12-16 07:49:17 +0100 |
|---|---|---|
| committer | Stefan Kangas | 2022-12-16 08:02:17 +0100 |
| commit | 0c4ca9f007c773bb45cc6070bbffb643c830040b (patch) | |
| tree | b14ad99885caf63446377d83d7e51c13603a44be | |
| parent | d9ab1027b18512e65c55d282fb3697f34a2277bb (diff) | |
| download | emacs-0c4ca9f007c773bb45cc6070bbffb643c830040b.tar.gz emacs-0c4ca9f007c773bb45cc6070bbffb643c830040b.zip | |
Fix typo in rcirc variable name
* lisp/net/rcirc.el (rcirc-track-abbreviate-flag): Rename from
misspelled 'rcirc-track-abbrevate-flag'. Make old name into
obsolete variable alias.
* doc/misc/rcirc.texi (Channels): Update above variable name.
| -rw-r--r-- | doc/misc/rcirc.texi | 8 | ||||
| -rw-r--r-- | lisp/net/rcirc.el | 8 |
2 files changed, 9 insertions, 7 deletions
diff --git a/doc/misc/rcirc.texi b/doc/misc/rcirc.texi index 84933a9ca72..37d62c7c41a 100644 --- a/doc/misc/rcirc.texi +++ b/doc/misc/rcirc.texi | |||
| @@ -691,11 +691,11 @@ window is showing them), the mode line will now show you the abbreviated | |||
| 691 | channel or nick name. Use @kbd{C-c C-@key{SPC}} to switch to these | 691 | channel or nick name. Use @kbd{C-c C-@key{SPC}} to switch to these |
| 692 | buffers. | 692 | buffers. |
| 693 | 693 | ||
| 694 | @cindex rcirc-track-abbrevate-flag | 694 | @cindex rcirc-track-abbreviate-flag |
| 695 | By default the channel names are abbreviated, set | 695 | By default the channel names are abbreviated, set |
| 696 | @code{rcirc-track-abbrevate-flag} to a non-@code{nil} value. This might be | 696 | @code{rcirc-track-abbreviate-flag} to a non-@code{nil} value. This |
| 697 | interesting if the IRC activities are not tracked in the mode line, | 697 | might be interesting if the IRC activities are not tracked in the mode |
| 698 | but somewhere else. | 698 | line, but somewhere else. |
| 699 | 699 | ||
| 700 | @vindex rcirc-mode-hook | 700 | @vindex rcirc-mode-hook |
| 701 | If you prefer not to load @code{rcirc} immediately, you can delay the | 701 | If you prefer not to load @code{rcirc} immediately, you can delay the |
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index 29957a62d04..7d4f275dc9b 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el | |||
| @@ -2371,9 +2371,11 @@ This function does not alter the INPUT string." | |||
| 2371 | "C-c C-@" #'rcirc-next-active-buffer | 2371 | "C-c C-@" #'rcirc-next-active-buffer |
| 2372 | "C-c C-SPC" #'rcirc-next-active-buffer) | 2372 | "C-c C-SPC" #'rcirc-next-active-buffer) |
| 2373 | 2373 | ||
| 2374 | (defcustom rcirc-track-abbrevate-flag t | 2374 | (define-obsolete-variable-alias 'rcirc-track-abbrevate-flag |
| 2375 | 'rcirc-track-abbreviate-flag "30.1") | ||
| 2376 | (defcustom rcirc-track-abbreviate-flag t | ||
| 2375 | "Non-nil means `rcirc-track-minor-mode' should abbreviate names." | 2377 | "Non-nil means `rcirc-track-minor-mode' should abbreviate names." |
| 2376 | :version "28.1" | 2378 | :version "30.1" |
| 2377 | :type 'boolean) | 2379 | :type 'boolean) |
| 2378 | 2380 | ||
| 2379 | ;;;###autoload | 2381 | ;;;###autoload |
| @@ -2559,7 +2561,7 @@ activity. Only run if the buffer is not visible and | |||
| 2559 | (funcall rcirc-channel-filter | 2561 | (funcall rcirc-channel-filter |
| 2560 | (replace-regexp-in-string | 2562 | (replace-regexp-in-string |
| 2561 | "@.*?\\'" "" | 2563 | "@.*?\\'" "" |
| 2562 | (or (and rcirc-track-abbrevate-flag | 2564 | (or (and rcirc-track-abbreviate-flag |
| 2563 | rcirc-short-buffer-name) | 2565 | rcirc-short-buffer-name) |
| 2564 | (buffer-name)))))) | 2566 | (buffer-name)))))) |
| 2565 | 2567 | ||