diff options
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/thumbs.el | 14 |
2 files changed, 8 insertions, 12 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bfec23fb22a..c3ab8ad0f4b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2004-04-29 John Paul Wallington <jpw@gnu.org> + + * thumbs.el (toplevel): Require cl at compile time. + Remove conditional definitions of `ignore-errors' and `caddar' + because they occur at run time. + 2004-04-28 Nick Roberts <nickrob@gnu.org> * progmodes/gdb-ui.el (gdb-frame-breakpoints-buffer) diff --git a/lisp/thumbs.el b/lisp/thumbs.el index 9458f0351ab..206492dee08 100644 --- a/lisp/thumbs.el +++ b/lisp/thumbs.el @@ -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 @@ see some of your images." (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) |