diff options
Diffstat (limited to 'lisp/erc/erc-track.el')
| -rw-r--r-- | lisp/erc/erc-track.el | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/lisp/erc/erc-track.el b/lisp/erc/erc-track.el index 41d8fc1a98f..3398c8b9d0c 100644 --- a/lisp/erc/erc-track.el +++ b/lisp/erc/erc-track.el | |||
| @@ -36,7 +36,6 @@ | |||
| 36 | 36 | ||
| 37 | (eval-when-compile (require 'cl-lib)) | 37 | (eval-when-compile (require 'cl-lib)) |
| 38 | (require 'erc) | 38 | (require 'erc) |
| 39 | (require 'erc-compat) | ||
| 40 | (require 'erc-match) | 39 | (require 'erc-match) |
| 41 | 40 | ||
| 42 | ;;; Code: | 41 | ;;; Code: |
| @@ -329,9 +328,8 @@ important." | |||
| 329 | 328 | ||
| 330 | (defun erc-track-remove-from-mode-line () | 329 | (defun erc-track-remove-from-mode-line () |
| 331 | "Remove `erc-track-modified-channels' from the mode-line." | 330 | "Remove `erc-track-modified-channels' from the mode-line." |
| 332 | (when (boundp 'mode-line-modes) | 331 | (setq mode-line-modes |
| 333 | (setq mode-line-modes | 332 | (remove '(t erc-modified-channels-object) mode-line-modes)) |
| 334 | (remove '(t erc-modified-channels-object) mode-line-modes))) | ||
| 335 | (when (consp global-mode-string) | 333 | (when (consp global-mode-string) |
| 336 | (setq global-mode-string | 334 | (setq global-mode-string |
| 337 | (delq 'erc-modified-channels-object global-mode-string)))) | 335 | (delq 'erc-modified-channels-object global-mode-string)))) |
| @@ -341,12 +339,10 @@ important." | |||
| 341 | See `erc-track-position-in-mode-line' for possible values." | 339 | See `erc-track-position-in-mode-line' for possible values." |
| 342 | ;; CVS Emacs has a new format string, and global-mode-string | 340 | ;; CVS Emacs has a new format string, and global-mode-string |
| 343 | ;; is very far to the right. | 341 | ;; is very far to the right. |
| 344 | (cond ((and (eq position 'before-modes) | 342 | (cond ((eq position 'before-modes) |
| 345 | (boundp 'mode-line-modes)) | ||
| 346 | (add-to-list 'mode-line-modes | 343 | (add-to-list 'mode-line-modes |
| 347 | '(t erc-modified-channels-object))) | 344 | '(t erc-modified-channels-object))) |
| 348 | ((and (eq position 'after-modes) | 345 | ((eq position 'after-modes) |
| 349 | (boundp 'mode-line-modes)) | ||
| 350 | (add-to-list 'mode-line-modes | 346 | (add-to-list 'mode-line-modes |
| 351 | '(t erc-modified-channels-object) t)) | 347 | '(t erc-modified-channels-object) t)) |
| 352 | ((eq position t) | 348 | ((eq position t) |