(thumbs-delete-images): Fix formatting of prompt.

(thumbs-show-image-num): Move assignment of
`thumbs-current-image-filename' within dynamic scope of `i'.
(thumbs-emboss-image): Don't use `evenp'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c77f956b23e3a507cc30eefbce90717e4d9fb105..62696509dfeb95fd7eaa9b10e7189f5c96fa15eb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2004-04-28  John Paul Wallington  <jpw@gnu.org>
+
+       * thumbs.el (thumbs-delete-images): Fix formatting of prompt.
+       (thumbs-show-image-num): Move assignment of
+       `thumbs-current-image-filename' within dynamic scope of `i'.
+       (thumbs-emboss-image): Don't use `evenp'.
+
 2004-04-28  Richard M. Stallman  <rms@gnu.org>
 
        * progmodes/compile.el (compilation-context-lines): Default now 0.

diff --git a/lisp/thumbs.el b/lisp/thumbs.el
index 8bba647a2ad3845090a2bcab08232dfddff1f943..9458f0351ab88ad3f6421c1b62da08e6ff08550a 100644 (file)
--- a/lisp/thumbs.el
+++ b/lisp/thumbs.el
@@ -504,7 +504,7 @@ Open another window."
   "Delete the image at point (and it's thumbnail) (or marked files if any)."
   (interactive)
   (let ((f (or thumbs-markedL (list (cdr (assoc (point) thumbs-fileL))))))
-    (if (yes-or-no-p "Really delete %d files?" (length f))
+    (if (yes-or-no-p (format "Really delete %d files? " (length f)))
        (progn
          (mapcar (lambda (x)
                    (setq thumbs-fileL (delete (rassoc x thumbs-fileL) thumbs-fileL))
@@ -529,9 +529,9 @@ Open another window."
       (rename-buffer (concat "*Image: "
                             (file-name-nondirectory i)
                             " - "
-                            (number-to-string num) "*")))
-    (setq thumbs-image-num num
-         thumbs-current-image-filename i)))
+                            (number-to-string num) "*"))
+      (setq thumbs-image-num num
+           thumbs-current-image-filename i))))
 
 (defun thumbs-next-image ()
   "Show next image."
@@ -597,7 +597,7 @@ ACTION and ARG should be legal convert command."
 (defun thumbs-emboss-image (emboss)
   "Emboss the image with value EMBOSS."
   (interactive "nEmboss value: ")
-  (if (or (< emboss 3)(> emboss 31)(evenp emboss))
+  (if (or (< emboss 3) (> emboss 31) (zerop (logand emboss 1)))
       (error "Arg must be a odd number between 3 and 31"))
   (thumbs-modify-image "emboss" (number-to-string emboss)))