HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert consecutive FSF copyright years to ranges.
[bpt/emacs.git]
/
lisp
/
erc
/
erc-ibuffer.el
diff --git
a/lisp/erc/erc-ibuffer.el
b/lisp/erc/erc-ibuffer.el
index
76c2d2b
..
76c4011
100644
(file)
--- a/
lisp/erc/erc-ibuffer.el
+++ b/
lisp/erc/erc-ibuffer.el
@@
-1,6
+1,7
@@
;;; erc-ibuffer.el --- ibuffer integration with ERC
;;; erc-ibuffer.el --- ibuffer integration with ERC
-;; Copyright (C) 2002, 2004, 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2004, 2006-2011
+;; Free Software Foundation, Inc.
;; Author: Mario Lang <mlang@delysid.org>
;; Keywords: comm
;; Author: Mario Lang <mlang@delysid.org>
;; Keywords: comm
@@
-8,10
+9,10
@@
;; This file is part of GNU Emacs.
;; This file is part of GNU Emacs.
-;; GNU Emacs is free software
;
you can redistribute it and/or modify
+;; GNU Emacs is free software
:
you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation
; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation
, either version 3 of the License, or
+;;
(at your option)
any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-19,9
+20,7
@@
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;;; Commentary:
@@
-72,8
+71,7
@@
erc-session-server)))))
;; Silence the byte-compiler
erc-session-server)))))
;; Silence the byte-compiler
-(eval-when-compile
- (defvar erc-modified-channels-alist))
+(defvar erc-modified-channels-alist)
(define-ibuffer-column erc-modified (:name "M")
(if (and (boundp 'erc-track-mode)
(define-ibuffer-column erc-modified (:name "M")
(if (and (boundp 'erc-track-mode)
@@
-158,8
+156,8
@@
(format "l %d" erc-channel-user-limit)
"")
")")
(format "l %d" erc-channel-user-limit)
"")
")")
- (if (not (
eq major-mode
'erc-mode))
- mode-name
+ (if (not (
derived-mode-p
'erc-mode))
+ (format-mode-line mode-name nil nil (current-buffer))
"")))
(define-ibuffer-column erc-nick (:name "Nick")
"")))
(define-ibuffer-column erc-nick (:name "Nick")
@@
-192,4
+190,3
@@
;; tab-width: 8
;; End:
;; tab-width: 8
;; End:
-;; arch-tag: fbad56a5-8595-45e0-a8c8-d8bb91e26944