[Emacs-diffs] Changes to emacs/lisp/thumbs.el

[Juanma Barranquero]

Index: emacs/lisp/thumbs.el
diff -c emacs/lisp/thumbs.el:1.14 emacs/lisp/thumbs.el:1.15
*** emacs/lisp/thumbs.el:1.14   Mon Jun  6 15:44:31 2005
--- emacs/lisp/thumbs.el        Thu Jun  9 01:39:40 2005
***************
*** 65,72 ****
    :version "22.1"
    :group 'multimedia)
  
! (defcustom thumbs-thumbsdir
!   (expand-file-name "~/.emacs-thumbs")
    "*Directory to store thumbnails."
    :type 'directory
    :group 'thumbs)
--- 65,71 ----
    :version "22.1"
    :group 'multimedia)
  
! (defcustom thumbs-thumbsdir "~/.emacs-thumbs"
    "*Directory to store thumbnails."
    :type 'directory
    :group 'thumbs)
***************
*** 88,94 ****
    :group 'thumbs)
  
  (defcustom thumbs-conversion-program
!   (if (equal 'windows-nt system-type)
        "convert.exe"
      (or (executable-find "convert")
        "/usr/X11R6/bin/convert"))
--- 87,93 ----
    :group 'thumbs)
  
  (defcustom thumbs-conversion-program
!   (if (eq system-type 'windows-nt)
        "convert.exe"
      (or (executable-find "convert")
        "/usr/X11R6/bin/convert"))
***************
*** 126,136 ****
    :type 'string
    :group 'thumbs)
  
! (defcustom thumbs-temp-dir
!   "/tmp/"
    "Temporary directory to use.
! Leaving it to default '/tmp/' can let another user
! see some of your images."
    :type 'directory
    :group 'thumbs)
  
--- 125,134 ----
    :type 'string
    :group 'thumbs)
  
! (defcustom thumbs-temp-dir temporary-file-directory
    "Temporary directory to use.
! Defaults to `temporary-file-directory'.  Leaving it to
! this value can let another user see some of your images."
    :type 'directory
    :group 'thumbs)
  
***************
*** 140,149 ****
    :group 'thumbs)
  
  ;; Initialize some variable, for later use.
- (defvar thumbs-temp-file
-   (concat thumbs-temp-dir thumbs-temp-prefix)
-   "Temporary filename for images.")
- 
  (defvar thumbs-current-tmp-filename
    nil
    "Temporary filename of current image.")
--- 138,143 ----
***************
*** 163,190 ****
    nil
    "List of marked files.")
  
! ;; Make sure auto-image-file-mode is ON.
! (auto-image-file-mode t)
! 
! ;; Create the thumbs directory if it does not exists.
! (setq thumbs-thumbsdir (expand-file-name thumbs-thumbsdir))
! 
! (when (not (file-directory-p thumbs-thumbsdir))
!   (progn
!     (make-directory thumbs-thumbsdir)
!     (message "Creating thumbnails directory")))
! 
! (defvar thumbs-gensym-counter 0)
! 
! (defun thumbs-gensym (&optional arg)
!   "Generate a new uninterned symbol.
! The name is made by appending a number to PREFIX, default \"Thumbs\"."
!   (let ((prefix (if (stringp arg) arg "Thumbs"))
!       (num (if (integerp arg) arg
!              (prog1
!                  thumbs-gensym-counter
!                (setq thumbs-gensym-counter (1+ thumbs-gensym-counter))))))
!     (make-symbol (format "%s%d" prefix num))))
  
  (defun thumbs-cleanup-thumbsdir ()
    "Clean the thumbnails directory.
--- 157,192 ----
    nil
    "List of marked files.")
  
! (defalias 'thumbs-gensym
!     (if (fboundp 'gensym)
!         'gensym
!       ;; Copied from cl-macs.el
!       (defvar thumbs-gensym-counter 0)
!       (lambda (&optional prefix)
!       "Generate a new uninterned symbol.
! The name is made by appending a number to PREFIX, default \"G\"."
!       (let ((pfix (if (stringp prefix) prefix "G"))
!             (num (if (integerp prefix) prefix
!                    (prog1 thumbs-gensym-counter
!                      (setq thumbs-gensym-counter
!                            (1+ thumbs-gensym-counter))))))
!         (make-symbol (format "%s%d" pfix num))))))
! 
! (defun thumbs-temp-file ()
!   "Return a unique temporary filename for an image."
!   (format "%s%s-%s.jpg"
!           (expand-file-name thumbs-temp-dir)
!           thumbs-temp-prefix
!           (thumbs-gensym "T")))
! 
! (defun thumbs-thumbsdir ()
!   "Return the current thumbnails directory (from `thumbs-thumbsdir').
! Create the thumbnails directory if it does not exist."
!   (let ((thumbs-thumbsdir (expand-file-name thumbs-thumbsdir)))
!     (unless (file-directory-p thumbs-thumbsdir)
!       (make-directory thumbs-thumbsdir)
!       (message "Creating thumbnails directory"))
!     thumbs-thumbsdir))
  
  (defun thumbs-cleanup-thumbsdir ()
    "Clean the thumbnails directory.
***************
*** 197,204 ****
            (lambda (f)
              (let ((fattribsL (file-attributes f)))
                `(,(nth 4 fattribsL) ,(nth 7 fattribsL) ,f)))
!           (directory-files thumbs-thumbsdir t (image-file-name-regexp)))
!          '(lambda (l1 l2) (time-less-p (car l1)(car l2)))))
         (dirsize (apply '+ (mapcar (lambda (x) (cadr x)) filesL))))
      (while (> dirsize thumbs-thumbsdir-max-size)
        (progn
--- 199,206 ----
            (lambda (f)
              (let ((fattribsL (file-attributes f)))
                `(,(nth 4 fattribsL) ,(nth 7 fattribsL) ,f)))
!           (directory-files (thumbs-thumbsdir) t (image-file-name-regexp)))
!          '(lambda (l1 l2) (time-less-p (car l1) (car l2)))))
         (dirsize (apply '+ (mapcar (lambda (x) (cadr x)) filesL))))
      (while (> dirsize thumbs-thumbsdir-max-size)
        (progn
***************
*** 258,264 ****
  
  (defun thumbs-resize-image (&optional increment size)
    "Resize image in current buffer.
! if INCREMENT is set, make the image bigger, else smaller.
  Or, alternatively, a SIZE may be specified."
    (interactive)
    ;; cleaning of old temp file
--- 260,266 ----
  
  (defun thumbs-resize-image (&optional increment size)
    "Resize image in current buffer.
! If INCREMENT is set, make the image bigger, else smaller.
  Or, alternatively, a SIZE may be specified."
    (interactive)
    ;; cleaning of old temp file
***************
*** 276,282 ****
                  thumbs-current-image-size)
               (thumbs-decrement-image-size
                thumbs-current-image-size))))
!       (tmp (format "%s%s.jpg" thumbs-temp-file (thumbs-gensym))))
      (erase-buffer)
      (thumbs-call-convert thumbs-current-image-filename
                         tmp "sample"
--- 278,284 ----
                  thumbs-current-image-size)
               (thumbs-decrement-image-size
                thumbs-current-image-size))))
!       (tmp (thumbs-temp-file)))
      (erase-buffer)
      (thumbs-call-convert thumbs-current-image-filename
                         tmp "sample"
***************
*** 286,292 ****
      (setq thumbs-current-tmp-filename tmp)))
  
  (defun thumbs-resize-interactive (width height)
!   "Resize Image interactively to specified WIDTH and HEIGHT."
    (interactive "nWidth: \nnHeight: ")
    (thumbs-resize-image nil (cons width height)))
  
--- 288,294 ----
      (setq thumbs-current-tmp-filename tmp)))
  
  (defun thumbs-resize-interactive (width height)
!   "Resize image interactively to specified WIDTH and HEIGHT."
    (interactive "nWidth: \nnHeight: ")
    (thumbs-resize-image nil (cons width height)))
  
***************
*** 305,311 ****
    (convert-standard-filename
     (let ((filename (expand-file-name img)))
       (format "%s/%08x-%s.jpg"
!              thumbs-thumbsdir
               (sxhash filename)
               (subst-char-in-string
                ?\s ?\_
--- 307,313 ----
    (convert-standard-filename
     (let ((filename (expand-file-name img)))
       (format "%s/%08x-%s.jpg"
!              (thumbs-thumbsdir)
               (sxhash filename)
               (subst-char-in-string
                ?\s ?\_
***************
*** 562,572 ****
  (defun thumbs-kill-buffer ()
    "Kill the current buffer."
    (interactive)
!   (let ((buffer (current-buffer)))
!     (condition-case nil
!       (delete-window (selected-window))
!       (error nil))
!     (kill-buffer buffer)))
  
  (defun thumbs-show-image-num (num)
    "Show the image with number NUM."
--- 564,570 ----
  (defun thumbs-kill-buffer ()
    "Kill the current buffer."
    (interactive)
!   (quit-window t (selected-window)))
  
  (defun thumbs-show-image-num (num)
    "Show the image with number NUM."
***************
*** 643,649 ****
         t
         thumbs-temp-prefix))
    (let ((buffer-read-only nil)
!       (tmp (format "%s%s.jpg" thumbs-temp-file (thumbs-gensym))))
      (erase-buffer)
      (thumbs-call-convert thumbs-current-image-filename
                         tmp
--- 641,647 ----
         t
         thumbs-temp-prefix))
    (let ((buffer-read-only nil)
!       (tmp (thumbs-temp-file)))
      (erase-buffer)
      (thumbs-call-convert thumbs-current-image-filename
                         tmp