aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2005-05-25 14:09:14 +0000
committerJuanma Barranquero2005-05-25 14:09:14 +0000
commitf75049fca3b6bc6068f6fbee7ffca03d178f166c (patch)
treec10678160b530e42ec2e401a0878fcee63461442
parent5807219598f5aad113047513e699bbbdfb4d2e1b (diff)
downloademacs-f75049fca3b6bc6068f6fbee7ffca03d178f166c.tar.gz
emacs-f75049fca3b6bc6068f6fbee7ffca03d178f166c.zip
(thumbs-thumbsdir-max-size, thumbs-temp-file, thumbs-cleanup-thumbsdir,
thumbs-call-convert, thumbs-resize-interactive, thumbs-insert-image, thumbs-insert-thumb, thumbs-dired-show-marked, thumbs-find-image-at-point, thumbs-delete-images, thumbs-rename-images, thumbs-next-image, thumbs-dired-setroot, thumbs-increment-image-size, thumbs-decrement-image-size): Fix typos in docstrings.
-rw-r--r--lisp/ChangeLog11
-rw-r--r--lisp/thumbs.el34
2 files changed, 28 insertions, 17 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cad4133c446..3a87822af49 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
12005-05-25 Juanma Barranquero <lekktu@gmail.com>
2
3 * thumbs.el (thumbs-thumbsdir-max-size, thumbs-temp-file)
4 (thumbs-cleanup-thumbsdir, thumbs-call-convert)
5 (thumbs-resize-interactive, thumbs-insert-image)
6 (thumbs-insert-thumb, thumbs-dired-show-marked)
7 (thumbs-find-image-at-point, thumbs-delete-images)
8 (thumbs-rename-images, thumbs-next-image, thumbs-dired-setroot)
9 (thumbs-increment-image-size, thumbs-decrement-image-size):
10 Fix typos in docstrings.
11
12005-05-24 Andre Spiegel <spiegel@gnu.org> 122005-05-24 Andre Spiegel <spiegel@gnu.org>
2 13
3 * progmodes/cperl-mode.el (cperl-vc-header-alist): Obsoleted. 14 * progmodes/cperl-mode.el (cperl-vc-header-alist): Obsoleted.
diff --git a/lisp/thumbs.el b/lisp/thumbs.el
index fd3cb13de98..1657c4b01a9 100644
--- a/lisp/thumbs.el
+++ b/lisp/thumbs.el
@@ -83,7 +83,7 @@
83 83
84(defcustom thumbs-thumbsdir-max-size 50000000 84(defcustom thumbs-thumbsdir-max-size 50000000
85 "Max size for thumbnails directory. 85 "Max size for thumbnails directory.
86When it reach that size (in bytes), a warning is send." 86When it reachs that size (in bytes), a warning is sent."
87 :type 'string 87 :type 'string
88 :group 'thumbs) 88 :group 'thumbs)
89 89
@@ -142,7 +142,7 @@ see some of your images."
142;; Initialize some variable, for later use. 142;; Initialize some variable, for later use.
143(defvar thumbs-temp-file 143(defvar thumbs-temp-file
144 (concat thumbs-temp-dir thumbs-temp-prefix) 144 (concat thumbs-temp-dir thumbs-temp-prefix)
145 "Temporary filesname for images.") 145 "Temporary filename for images.")
146 146
147(defvar thumbs-current-tmp-filename 147(defvar thumbs-current-tmp-filename
148 nil 148 nil
@@ -188,8 +188,8 @@ The name is made by appending a number to PREFIX, default \"Thumbs\"."
188 188
189(defun thumbs-cleanup-thumbsdir () 189(defun thumbs-cleanup-thumbsdir ()
190 "Clean the thumbnails directory. 190 "Clean the thumbnails directory.
191If the total size of all files in 'thumbs-thumbsdir' is bigger than 191If the total size of all files in `thumbs-thumbsdir' is bigger than
192'thumbs-thumbsdir-max-size', files are deleted until the max size is 192`thumbs-thumbsdir-max-size', files are deleted until the max size is
193reached." 193reached."
194 (let* ((filesL 194 (let* ((filesL
195 (sort 195 (sort
@@ -217,11 +217,11 @@ reached."
217FILEIN is the input file, 217FILEIN is the input file,
218FILEOUT is the output file, 218FILEOUT is the output file,
219ACTION is the command to send to convert. 219ACTION is the command to send to convert.
220Optional argument are: 220Optional arguments are:
221ARG any arguments to the ACTION command, 221ARG any arguments to the ACTION command,
222OUTPUT-FORMAT is the file format to output, default is jpeg 222OUTPUT-FORMAT is the file format to output (default is jpeg),
223ACTION-PREFIX is the symbol to place before the ACTION command 223ACTION-PREFIX is the symbol to place before the ACTION command
224 (default to '-' but can sometime be '+')." 224 (defaults to '-' but can sometimes be '+')."
225 (let ((command (format "%s %s%s %s \"%s\" \"%s:%s\"" 225 (let ((command (format "%s %s%s %s \"%s\" \"%s:%s\""
226 thumbs-conversion-program 226 thumbs-conversion-program
227 (or action-prefix "-") 227 (or action-prefix "-")
@@ -241,7 +241,7 @@ ACTION-PREFIX is the symbol to place before the ACTION command
241 (round (- n (/ (* d n) 100)))) 241 (round (- n (/ (* d n) 100))))
242 242
243(defun thumbs-increment-image-size (s) 243(defun thumbs-increment-image-size (s)
244 "Increment S (a cons of width x heigh)." 244 "Increment S (a cons of width x height)."
245 (cons 245 (cons
246 (thumbs-increment-image-size-element (car s) 246 (thumbs-increment-image-size-element (car s)
247 thumbs-image-resizing-step) 247 thumbs-image-resizing-step)
@@ -249,7 +249,7 @@ ACTION-PREFIX is the symbol to place before the ACTION command
249 thumbs-image-resizing-step))) 249 thumbs-image-resizing-step)))
250 250
251(defun thumbs-decrement-image-size (s) 251(defun thumbs-decrement-image-size (s)
252 "Decrement S (a cons of width x heigh)." 252 "Decrement S (a cons of width x height)."
253 (cons 253 (cons
254 (thumbs-decrement-image-size-element (car s) 254 (thumbs-decrement-image-size-element (car s)
255 thumbs-image-resizing-step) 255 thumbs-image-resizing-step)
@@ -349,7 +349,7 @@ Or, alternatively, a SIZE may be specified."
349 "Insert image IMG at point. 349 "Insert image IMG at point.
350TYPE and RELIEF will be used in constructing the image; see `image' 350TYPE and RELIEF will be used in constructing the image; see `image'
351in the emacs-lisp manual for further documentation. 351in the emacs-lisp manual for further documentation.
352if MARKED is non-nil, the image is marked." 352If MARKED is non-nil, the image is marked."
353 (let ((i `(image :type ,type 353 (let ((i `(image :type ,type
354 :file ,img 354 :file ,img
355 :relief ,relief 355 :relief ,relief
@@ -361,7 +361,7 @@ if MARKED is non-nil, the image is marked."
361 361
362(defun thumbs-insert-thumb (img &optional marked) 362(defun thumbs-insert-thumb (img &optional marked)
363 "Insert the thumbnail for IMG at point. 363 "Insert the thumbnail for IMG at point.
364if MARKED is non-nil, the image is marked" 364If MARKED is non-nil, the image is marked."
365 (thumbs-insert-image 365 (thumbs-insert-image
366 (thumbs-make-thumb img) 'jpeg thumbs-relief marked) 366 (thumbs-make-thumb img) 'jpeg thumbs-relief marked)
367 (put-text-property (1- (point)) (point) 367 (put-text-property (1- (point)) (point)
@@ -403,7 +403,7 @@ and SAME-WINDOW to show thumbs in the same window."
403 403
404;;;###autoload 404;;;###autoload
405(defun thumbs-dired-show-marked () 405(defun thumbs-dired-show-marked ()
406 "In Dired, make a thumbs buffer with all marked files." 406 "In dired, make a thumbs buffer with all marked files."
407 (interactive) 407 (interactive)
408 (thumbs-show-thumbs-list (dired-get-marked-files) nil t)) 408 (thumbs-show-thumbs-list (dired-get-marked-files) nil t))
409 409
@@ -435,7 +435,7 @@ and SAME-WINDOW to show thumbs in the same window."
435 435
436(defun thumbs-find-image-at-point (&optional img otherwin) 436(defun thumbs-find-image-at-point (&optional img otherwin)
437 "Display image IMG for thumbnail at point. 437 "Display image IMG for thumbnail at point.
438use another window it OTHERWIN is t." 438Use another window if OTHERWIN is t."
439 (interactive) 439 (interactive)
440 (let* ((i (or img (thumbs-current-image)))) 440 (let* ((i (or img (thumbs-current-image))))
441 (thumbs-find-image i (point) otherwin))) 441 (thumbs-find-image i (point) otherwin)))
@@ -499,7 +499,7 @@ Open another window."
499 (nreverse list)))) 499 (nreverse list))))
500 500
501(defun thumbs-delete-images () 501(defun thumbs-delete-images ()
502 "Delete the image at point (and it's thumbnail) (or marked files if any)." 502 "Delete the image at point (and its thumbnail) (or marked files if any)."
503 (interactive) 503 (interactive)
504 (let ((files (or thumbs-markedL (list (thumbs-current-image))))) 504 (let ((files (or thumbs-markedL (list (thumbs-current-image)))))
505 (if (yes-or-no-p (format "Really delete %d files? " (length files))) 505 (if (yes-or-no-p (format "Really delete %d files? " (length files)))
@@ -520,7 +520,7 @@ Open another window."
520 (delq x thumbs-markedL))))))))) 520 (delq x thumbs-markedL)))))))))
521 521
522(defun thumbs-rename-images (newfile) 522(defun thumbs-rename-images (newfile)
523 "Rename the image at point (and it's thumbnail) (or marked files if any)." 523 "Rename the image at point (and its thumbnail) (or marked files if any)."
524 (interactive "FRename to file or directory: ") 524 (interactive "FRename to file or directory: ")
525 (let ((files (or thumbs-markedL (list (thumbs-current-image)))) 525 (let ((files (or thumbs-markedL (list (thumbs-current-image))))
526 failures) 526 failures)
@@ -574,7 +574,7 @@ Open another window."
574 thumbs-current-image-filename i)))) 574 thumbs-current-image-filename i))))
575 575
576(defun thumbs-next-image () 576(defun thumbs-next-image ()
577 "Show next image." 577 "Show the next image."
578 (interactive) 578 (interactive)
579 (let* ((i (1+ thumbs-image-num)) 579 (let* ((i (1+ thumbs-image-num))
580 (list (thumbs-file-alist)) 580 (list (thumbs-file-alist))
@@ -782,7 +782,7 @@ ACTION and ARG should be a valid convert command."
782 782
783;;;###autoload 783;;;###autoload
784(defun thumbs-dired-setroot () 784(defun thumbs-dired-setroot ()
785 "In dired, Call the setroot program on the image at point." 785 "In dired, call the setroot program on the image at point."
786 (interactive) 786 (interactive)
787 (thumbs-call-setroot-command (dired-get-filename))) 787 (thumbs-call-setroot-command (dired-get-filename)))
788 788