diff options
| author | Miles Bader <miles@gnu.org> | 2006-11-20 06:50:29 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-11-20 06:50:29 +0000 |
| commit | 83dc6995148085966eddca749228a6338b7e6b0e (patch) | |
| tree | 0fbf7066385873a51749737e5ac0d9c57b8a3d28 /lisp/erc/erc-ibuffer.el | |
| parent | e15a04955b0c59069aa870d7d5040bc2e795b2eb (diff) | |
| download | emacs-83dc6995148085966eddca749228a6338b7e6b0e.tar.gz | |
Merge from erc--emacs--22
Merge from my ERC Emacs 22 integration branch. The version is now "5.2
stable pre-release". This will probably be the last change to the
version of ERC in Emacs 22 before the release, pending any bugfixes. For
details on the changes, see the lisp/erc/ChangeLog file.
Note that ERC is now invoked with M-x erc, not M-x erc-select. If you
were using the old `erc' function programmatically, use `erc-open'
instead.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-520
Creator: Michael Olson <mwolson@gnu.org>
Diffstat (limited to 'lisp/erc/erc-ibuffer.el')
| -rw-r--r-- | lisp/erc/erc-ibuffer.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/erc/erc-ibuffer.el b/lisp/erc/erc-ibuffer.el index 7ca843d115c..24eb2f09ccb 100644 --- a/lisp/erc/erc-ibuffer.el +++ b/lisp/erc/erc-ibuffer.el @@ -91,14 +91,14 @@ " ")) (define-ibuffer-column erc-server-name (:name "Server") - (if (and (boundp 'erc-server-process) (processp erc-server-process)) + (if (and erc-server-process (processp erc-server-process)) (with-current-buffer (process-buffer erc-server-process) (or erc-server-announced-name erc-session-server)) "")) (define-ibuffer-column erc-target (:name "Target") (if (eq major-mode 'erc-mode) - (cond ((and (boundp 'erc-server-process) (processp erc-server-process) + (cond ((and erc-server-process (processp erc-server-process) (eq (current-buffer) (process-buffer erc-server-process))) (concat "Server " erc-session-server ":" (erc-port-to-string erc-session-port))) @@ -125,7 +125,7 @@ "")) (define-ibuffer-column erc-away (:name "A") - (if (and (boundp 'erc-server-process) + (if (and erc-server-process (processp erc-server-process) (with-current-buffer (process-buffer erc-server-process) erc-away)) |