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

[Juanma Barranquero]

Index: emacs/lisp/thumbs.el
diff -c emacs/lisp/thumbs.el:1.10 emacs/lisp/thumbs.el:1.11
*** emacs/lisp/thumbs.el:1.10   Fri Mar 25 09:49:00 2005
--- emacs/lisp/thumbs.el        Wed May 25 14:08:33 2005
***************
*** 83,89 ****
  
  (defcustom thumbs-thumbsdir-max-size 50000000
    "Max size for thumbnails directory.
! When it reach that size (in bytes), a warning is send."
    :type 'string
    :group 'thumbs)
  
--- 83,89 ----
  
  (defcustom thumbs-thumbsdir-max-size 50000000
    "Max size for thumbnails directory.
! When it reachs that size (in bytes), a warning is sent."
    :type 'string
    :group 'thumbs)
  
***************
*** 142,148 ****
  ;; Initialize some variable, for later use.
  (defvar thumbs-temp-file
    (concat thumbs-temp-dir thumbs-temp-prefix)
!   "Temporary filesname for images.")
  
  (defvar thumbs-current-tmp-filename
    nil
--- 142,148 ----
  ;; 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
***************
*** 188,195 ****
  
  (defun thumbs-cleanup-thumbsdir ()
    "Clean the thumbnails directory.
! If the total size of all files in 'thumbs-thumbsdir' is bigger than
! 'thumbs-thumbsdir-max-size', files are deleted until the max size is
  reached."
    (let* ((filesL
          (sort
--- 188,195 ----
  
  (defun thumbs-cleanup-thumbsdir ()
    "Clean the thumbnails directory.
! If the total size of all files in `thumbs-thumbsdir' is bigger than
! `thumbs-thumbsdir-max-size', files are deleted until the max size is
  reached."
    (let* ((filesL
          (sort
***************
*** 217,227 ****
  FILEIN is the input file,
  FILEOUT is the output file,
  ACTION is the command to send to convert.
! Optional argument are:
  ARG any arguments to the ACTION command,
! OUTPUT-FORMAT is the file format to output, default is jpeg
  ACTION-PREFIX is the symbol to place before the ACTION command
!               (default to '-' but can sometime be '+')."
    (let ((command (format "%s %s%s %s \"%s\" \"%s:%s\""
                         thumbs-conversion-program
                         (or action-prefix "-")
--- 217,227 ----
  FILEIN is the input file,
  FILEOUT is the output file,
  ACTION is the command to send to convert.
! Optional arguments are:
  ARG any arguments to the ACTION command,
! OUTPUT-FORMAT is the file format to output (default is jpeg),
  ACTION-PREFIX is the symbol to place before the ACTION command
!               (defaults to '-' but can sometimes be '+')."
    (let ((command (format "%s %s%s %s \"%s\" \"%s:%s\""
                         thumbs-conversion-program
                         (or action-prefix "-")
***************
*** 241,247 ****
    (round (- n (/ (* d n) 100))))
  
  (defun thumbs-increment-image-size (s)
!   "Increment S (a cons of width x heigh)."
    (cons
     (thumbs-increment-image-size-element (car s)
                                        thumbs-image-resizing-step)
--- 241,247 ----
    (round (- n (/ (* d n) 100))))
  
  (defun thumbs-increment-image-size (s)
!   "Increment S (a cons of width x height)."
    (cons
     (thumbs-increment-image-size-element (car s)
                                        thumbs-image-resizing-step)
***************
*** 249,255 ****
                                        thumbs-image-resizing-step)))
  
  (defun thumbs-decrement-image-size (s)
!   "Decrement S (a cons of width x heigh)."
    (cons
     (thumbs-decrement-image-size-element (car s)
                                        thumbs-image-resizing-step)
--- 249,255 ----
                                        thumbs-image-resizing-step)))
  
  (defun thumbs-decrement-image-size (s)
!   "Decrement S (a cons of width x height)."
    (cons
     (thumbs-decrement-image-size-element (car s)
                                        thumbs-image-resizing-step)
***************
*** 349,355 ****
    "Insert image IMG at point.
  TYPE and RELIEF will be used in constructing the image; see `image'
  in the emacs-lisp manual for further documentation.
! if MARKED is non-nil, the image is marked."
    (let ((i `(image :type ,type
                   :file ,img
                   :relief ,relief
--- 349,355 ----
    "Insert image IMG at point.
  TYPE and RELIEF will be used in constructing the image; see `image'
  in the emacs-lisp manual for further documentation.
! If MARKED is non-nil, the image is marked."
    (let ((i `(image :type ,type
                   :file ,img
                   :relief ,relief
***************
*** 361,367 ****
  
  (defun thumbs-insert-thumb (img &optional marked)
    "Insert the thumbnail for IMG at point.
! if MARKED is non-nil, the image is marked"
    (thumbs-insert-image
     (thumbs-make-thumb img) 'jpeg thumbs-relief marked)
    (put-text-property (1- (point)) (point)
--- 361,367 ----
  
  (defun thumbs-insert-thumb (img &optional marked)
    "Insert the thumbnail for IMG at point.
! If MARKED is non-nil, the image is marked."
    (thumbs-insert-image
     (thumbs-make-thumb img) 'jpeg thumbs-relief marked)
    (put-text-property (1- (point)) (point)
***************
*** 403,409 ****
  
  ;;;###autoload
  (defun thumbs-dired-show-marked ()
!   "In Dired, make a thumbs buffer with all marked files."
    (interactive)
    (thumbs-show-thumbs-list (dired-get-marked-files) nil t))
  
--- 403,409 ----
  
  ;;;###autoload
  (defun thumbs-dired-show-marked ()
!   "In dired, make a thumbs buffer with all marked files."
    (interactive)
    (thumbs-show-thumbs-list (dired-get-marked-files) nil t))
  
***************
*** 435,441 ****
  
  (defun thumbs-find-image-at-point (&optional img otherwin)
    "Display image IMG for thumbnail at point.
! use another window it OTHERWIN is t."
    (interactive)
    (let* ((i (or img (thumbs-current-image))))
      (thumbs-find-image i (point) otherwin)))
--- 435,441 ----
  
  (defun thumbs-find-image-at-point (&optional img otherwin)
    "Display image IMG for thumbnail at point.
! Use another window if OTHERWIN is t."
    (interactive)
    (let* ((i (or img (thumbs-current-image))))
      (thumbs-find-image i (point) otherwin)))
***************
*** 499,505 ****
        (nreverse list))))
  
  (defun thumbs-delete-images ()
!   "Delete the image at point (and it's thumbnail) (or marked files if any)."
    (interactive)
    (let ((files (or thumbs-markedL (list (thumbs-current-image)))))
      (if (yes-or-no-p (format "Really delete %d files? " (length files)))
--- 499,505 ----
        (nreverse list))))
  
  (defun thumbs-delete-images ()
!   "Delete the image at point (and its thumbnail) (or marked files if any)."
    (interactive)
    (let ((files (or thumbs-markedL (list (thumbs-current-image)))))
      (if (yes-or-no-p (format "Really delete %d files? " (length files)))
***************
*** 520,526 ****
                      (delq x thumbs-markedL)))))))))
  
  (defun thumbs-rename-images (newfile)
!   "Rename the image at point (and it's thumbnail) (or marked files if any)."
    (interactive "FRename to file or directory: ")
    (let ((files (or thumbs-markedL (list (thumbs-current-image))))
        failures)
--- 520,526 ----
                      (delq x thumbs-markedL)))))))))
  
  (defun thumbs-rename-images (newfile)
!   "Rename the image at point (and its thumbnail) (or marked files if any)."
    (interactive "FRename to file or directory: ")
    (let ((files (or thumbs-markedL (list (thumbs-current-image))))
        failures)
***************
*** 574,580 ****
            thumbs-current-image-filename i))))
  
  (defun thumbs-next-image ()
!   "Show next image."
    (interactive)
    (let* ((i (1+ thumbs-image-num))
         (list (thumbs-file-alist))
--- 574,580 ----
            thumbs-current-image-filename i))))
  
  (defun thumbs-next-image ()
!   "Show the next image."
    (interactive)
    (let* ((i (1+ thumbs-image-num))
         (list (thumbs-file-alist))
***************
*** 782,788 ****
  
  ;;;###autoload
  (defun thumbs-dired-setroot ()
!   "In dired, Call the setroot program on the image at point."
    (interactive)
    (thumbs-call-setroot-command (dired-get-filename)))
  
--- 782,788 ----
  
  ;;;###autoload
  (defun thumbs-dired-setroot ()
!   "In dired, call the setroot program on the image at point."
    (interactive)
    (thumbs-call-setroot-command (dired-get-filename)))