[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Erc-commit] [commit][master] Sync from Emacs
From: |
mwolson |
Subject: |
[Erc-commit] [commit][master] Sync from Emacs |
Date: |
Sun, 28 Oct 2007 21:10:07 -0400 |
commit affec1d95625e08ae27f3b924c1cd2d2f4ff4927
Author: Michael W. Olson <address@hidden>
Date: Sun Oct 28 20:42:40 2007 -0400
Sync from Emacs
diff --git a/ChangeLog b/ChangeLog
index c8a7c99..d6d6d40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-10-25 Dan Nicolaescu <address@hidden>
+
+ * erc-ibuffer.el (erc-modified-channels-alist): Pacify
+ byte-compiler.
+
+2007-10-13 Glenn Morris <address@hidden>
+
+ * erc-track.el (erc-modified-channels-update): Use mapc rather
+ than mapcar.
+
2007-10-12 Diane Murray <address@hidden>
* erc.el (erc-join-channel): Prompt for channel key if C-u or
diff --git a/erc-ibuffer.el b/erc-ibuffer.el
index ae256b8..e4de3c1 100644
--- a/erc-ibuffer.el
+++ b/erc-ibuffer.el
@@ -71,6 +71,8 @@
(string-match qualifier (or erc-server-announced-name
erc-session-server)))))
+(defvar erc-modified-channels-alist)
+
(define-ibuffer-column erc-modified (:name "M")
(if (and (boundp 'erc-track-mode)
erc-track-mode)
diff --git a/erc-track.el b/erc-track.el
index 1408adc..ad3eaf7 100644
--- a/erc-track.el
+++ b/erc-track.el
@@ -701,17 +701,17 @@ ARGS are ignored."
(unless erc-modified-channels-update-inside
(let ((erc-modified-channels-update-inside t)
(removed-channel nil))
- (mapcar (lambda (elt)
- (let ((buffer (car elt)))
- (when (or (not (bufferp buffer))
- (not (buffer-live-p buffer))
- (erc-buffer-visible buffer)
- (and erc-track-remove-disconnected-buffers
- (not (with-current-buffer buffer
- erc-server-connected))))
- (setq removed-channel t)
- (erc-modified-channels-remove-buffer buffer))))
- erc-modified-channels-alist)
+ (mapc (lambda (elt)
+ (let ((buffer (car elt)))
+ (when (or (not (bufferp buffer))
+ (not (buffer-live-p buffer))
+ (erc-buffer-visible buffer)
+ (and erc-track-remove-disconnected-buffers
+ (not (with-current-buffer buffer
+ erc-server-connected))))
+ (setq removed-channel t)
+ (erc-modified-channels-remove-buffer buffer))))
+ erc-modified-channels-alist)
(when removed-channel
(erc-modified-channels-display)
(force-mode-line-update t)))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Erc-commit] [commit][master] Sync from Emacs,
mwolson <=