# HG changeset patch
# User John Paul Wallington <jpw@pobox.com>
# Date 1083194383 0
# Node ID c5dd3d0f1c5dffc0f6d0f621c853772bc0c9c8b5
# Parent  d6780b4bbfa5975be031d93e7e4c386b0ac9ae0d
(toplevel): Require cl at compile time.
Remove conditional definitions of `ignore-errors' and `caddar'
because they occur at run time.

diff -r d6780b4bbfa5 -r c5dd3d0f1c5d lisp/thumbs.el
--- 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)