HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lisp/*.el: Fix typos.
[bpt/emacs.git]
/
lisp
/
ibuf-macs.el
diff --git
a/lisp/ibuf-macs.el
b/lisp/ibuf-macs.el
index
684cfe8
..
a475e1e
100644
(file)
--- a/
lisp/ibuf-macs.el
+++ b/
lisp/ibuf-macs.el
@@
-1,7
+1,6
@@
;;; ibuf-macs.el --- macros for ibuffer
;;; ibuf-macs.el --- macros for ibuffer
-;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2014 Free Software Foundation, Inc.
;; Author: Colin Walters <walters@verbum.org>
;; Maintainer: John Paul Wallington <jpw@gnu.org>
;; Author: Colin Walters <walters@verbum.org>
;; Maintainer: John Paul Wallington <jpw@gnu.org>
@@
-28,8
+27,7
@@
;;; Code:
;;; Code:
-(eval-when-compile
- (require 'cl))
+(eval-when-compile (require 'cl-lib))
;; From Paul Graham's "ANSI Common Lisp", adapted for Emacs Lisp here.
(defmacro ibuffer-aif (test true-body &rest false-body)
;; From Paul Graham's "ANSI Common Lisp", adapted for Emacs Lisp here.
(defmacro ibuffer-aif (test true-body &rest false-body)
@@
-74,7
+72,7
@@
During evaluation of body, bind `it' to the value returned by TEST."
(ibuffer-redisplay t))))))
;;;###autoload
(ibuffer-redisplay t))))))
;;;###autoload
-(
defmacro*
define-ibuffer-column (symbol (&key name inline props summarizer
+(
cl-defmacro
define-ibuffer-column (symbol (&key name inline props summarizer
header-mouse-map) &rest body)
"Define a column SYMBOL for use with `ibuffer-formats'.
header-mouse-map) &rest body)
"Define a column SYMBOL for use with `ibuffer-formats'.
@@
-130,7
+128,7
@@
change its definition, you should explicitly call
:autoload-end)))
;;;###autoload
:autoload-end)))
;;;###autoload
-(
defmacro*
define-ibuffer-sorter (name documentation
+(
cl-defmacro
define-ibuffer-sorter (name documentation
(&key
description)
&rest body)
(&key
description)
&rest body)
@@
-144,7
+142,7
@@
buffer object, and `b' bound to another. BODY should return a non-nil
value if and only if `a' is \"less than\" `b'.
\(fn NAME DOCUMENTATION (&key DESCRIPTION) &rest BODY)"
value if and only if `a' is \"less than\" `b'.
\(fn NAME DOCUMENTATION (&key DESCRIPTION) &rest BODY)"
- (declare (indent 1))
+ (declare (indent 1)
(doc-string 2)
)
`(progn
(defun ,(intern (concat "ibuffer-do-sort-by-" (symbol-name name))) ()
,(or documentation "No :documentation specified for this sorting method.")
`(progn
(defun ,(intern (concat "ibuffer-do-sort-by-" (symbol-name name))) ()
,(or documentation "No :documentation specified for this sorting method.")
@@
-161,7
+159,7
@@
value if and only if `a' is \"less than\" `b'.
:autoload-end))
;;;###autoload
:autoload-end))
;;;###autoload
-(
defmacro*
define-ibuffer-op (op args
+(
cl-defmacro
define-ibuffer-op (op args
documentation
(&key
interactive
documentation
(&key
interactive
@@
-203,7
+201,7
@@
COMPLEX means this function is special; see the source code of this
macro for exactly what it does.
\(fn OP ARGS DOCUMENTATION (&key INTERACTIVE MARK MODIFIER-P DANGEROUS OPSTRING ACTIVE-OPSTRING COMPLEX) &rest BODY)"
macro for exactly what it does.
\(fn OP ARGS DOCUMENTATION (&key INTERACTIVE MARK MODIFIER-P DANGEROUS OPSTRING ACTIVE-OPSTRING COMPLEX) &rest BODY)"
- (declare (indent 2))
+ (declare (indent 2)
(doc-string 3)
)
`(progn
(defun ,(intern (concat (if (string-match "^ibuffer-do" (symbol-name op))
"" "ibuffer-do-") (symbol-name op)))
`(progn
(defun ,(intern (concat (if (string-match "^ibuffer-do" (symbol-name op))
"" "ibuffer-do-") (symbol-name op)))
@@
-214,19
+212,19
@@
macro for exactly what it does.
,(if (not (null interactive))
`(interactive ,interactive)
'(interactive))
,(if (not (null interactive))
`(interactive ,interactive)
'(interactive))
- (assert (derived-mode-p 'ibuffer-mode))
+ (
cl-
assert (derived-mode-p 'ibuffer-mode))
(setq ibuffer-did-modification nil)
(setq ibuffer-did-modification nil)
- (let ((marked-names (,(case mark
+ (let ((marked-names (,(
p
case mark
(:deletion
'ibuffer-deletion-marked-buffer-names)
(:deletion
'ibuffer-deletion-marked-buffer-names)
- (
t
+ (
_
'ibuffer-marked-buffer-names)))))
(when (null marked-names)
(setq marked-names (list (buffer-name (ibuffer-current-buffer))))
'ibuffer-marked-buffer-names)))))
(when (null marked-names)
(setq marked-names (list (buffer-name (ibuffer-current-buffer))))
- (ibuffer-set-mark ,(case mark
+ (ibuffer-set-mark ,(
p
case mark
(:deletion
'ibuffer-deletion-char)
(:deletion
'ibuffer-deletion-char)
- (
t
+ (
_
'ibuffer-marked-char))))
,(let* ((finish (append
'(progn)
'ibuffer-marked-char))))
,(let* ((finish (append
'(progn)
@@
-243,10
+241,10
@@
macro for exactly what it does.
,@body))
t)))
(body `(let ((count
,@body))
t)))
(body `(let ((count
- (,(case mark
+ (,(
p
case mark
(:deletion
'ibuffer-map-deletion-lines)
(:deletion
'ibuffer-map-deletion-lines)
- (
t
+ (
_
'ibuffer-map-marked-lines))
#'(lambda (buf mark)
,(if (eq modifier-p :maybe)
'ibuffer-map-marked-lines))
#'(lambda (buf mark)
,(if (eq modifier-p :maybe)
@@
-265,7
+263,7
@@
macro for exactly what it does.
:autoload-end))
;;;###autoload
:autoload-end))
;;;###autoload
-(
defmacro*
define-ibuffer-filter (name documentation
+(
cl-defmacro
define-ibuffer-filter (name documentation
(&key
reader
description)
(&key
reader
description)
@@
-281,7
+279,7
@@
will be evaluated with BUF bound to the buffer object, and QUALIFIER
bound to the current value of the filter.
\(fn NAME DOCUMENTATION (&key READER DESCRIPTION) &rest BODY)"
bound to the current value of the filter.
\(fn NAME DOCUMENTATION (&key READER DESCRIPTION) &rest BODY)"
- (declare (indent 2))
+ (declare (indent 2)
(doc-string 2)
)
(let ((fn-name (intern (concat "ibuffer-filter-by-" (symbol-name name)))))
`(progn
(defun ,fn-name (qualifier)
(let ((fn-name (intern (concat "ibuffer-filter-by-" (symbol-name name)))))
`(progn
(defun ,fn-name (qualifier)
@@
-301,5
+299,4
@@
bound to the current value of the filter.
(provide 'ibuf-macs)
(provide 'ibuf-macs)
-;; arch-tag: 2748edce-82c9-4cd9-9d9d-bd73e43c20c5
;;; ibuf-macs.el ends here
;;; ibuf-macs.el ends here