Mercurial > emacs
changeset 55221:c5dd3d0f1c5d
(toplevel): Require cl at compile time.
Remove conditional definitions of `ignore-errors' and `caddar'
because they occur at run time.
| author | John Paul Wallington <jpw@pobox.com> |
|---|---|
| date | Wed, 28 Apr 2004 23:19:43 +0000 |
| parents | d6780b4bbfa5 |
| children | 968aecf8299b |
| files | lisp/thumbs.el |
| diffstat | 1 files changed, 2 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/thumbs.el Wed Apr 28 21:00:40 2004 +0000 +++ b/lisp/thumbs.el Wed Apr 28 23:19:43 2004 +0000 @@ -56,6 +56,8 @@ ;;; Code: +(eval-when-compile + (require 'cl)) (require 'dired) ;; Abort if in-line imaging isn't supported (i.e. Emacs-20.7) @@ -182,18 +184,6 @@ (make-directory thumbs-thumbsdir) (message "Creating thumbnails directory"))) -(when (not (fboundp 'ignore-errors)) - (defmacro ignore-errors (&rest body) - "Execute FORMS; if anz error occurs, return nil. -Otherwise, return result of last FORM." - (let ((err (thumbs-gensym))) - (list 'condition-case err (cons 'progn body) '(error nil))))) - -(when (not (fboundp 'caddar)) - (defun caddar (x) - "Return the `car' of the `cdr' of the `cdr' of the `car' of X." - (car (cdr (cdr (car x)))))) - (defvar thumbs-gensym-counter 0) (defun thumbs-gensym (&optional arg)