changeset 68486:6511ba48ed7a

(thumbs-marked-list): Make buffer-local and permanent-local. (thumbs-insert-thumb): Make help-echo non-sticky. (thumbs-file-alist): Use eolp as check for (non)-image.

--- a/lisp/thumbs.el	Mon Jan 30 09:50:44 2006 +0000
+++ b/lisp/thumbs.el	Mon Jan 30 09:52:49 2006 +0000
@@ -174,6 +174,8 @@
 
 (defvar thumbs-marked-list nil
   "List of marked files.")
+(make-variable-buffer-local 'thumbs-marked-list)
+(put 'thumbs-marked-list 'permanent-local t)
 
 (defalias 'thumbs-gensym
     (if (fboundp 'gensym)
@@ -334,9 +336,9 @@
 	((string-match ".*\\.tiff?\\'" img) 'tiff)))
 
 (defun thumbs-file-size (img)
-  (let ((i (image-size (find-image `((:type ,(thumbs-image-type img) :file ,img))) t)))
-    (concat (number-to-string (round (car i)))
-	    "x"
+  (let ((i (image-size
+	    (find-image `((:type ,(thumbs-image-type img) :file ,img))) t)))
+    (concat (number-to-string (round (car i))) "x"
 	    (number-to-string (round (cdr i))))))
 
 ;;;###autoload
@@ -366,7 +368,8 @@
    (thumbs-make-thumb img) 'jpeg thumbs-relief marked)
   (add-text-properties (1- (point)) (point)
 		     `(thumb-image-file ,img
-		       help-echo ,(file-name-nondirectory img))))
+		       help-echo ,(file-name-nondirectory img)
+		       rear-nonsticky help-echo)))
 
 (defun thumbs-do-thumbs-insertion (list)
   "Insert all thumbnails into thumbs buffer."
@@ -488,7 +491,7 @@
       (let (list)
 	(goto-char (point-min))
 	(while (not (eobp))
-	  (unless (= 0 (mod (point) (1+ thumbs-per-line)))
+	  (unless (eolp)
 	    (if (thumbs-current-image)
 		(push (cons (point-marker)
 			    (thumbs-current-image))
@@ -774,8 +777,7 @@
 (define-derived-mode thumbs-mode
   fundamental-mode "thumbs"
   "Preview images in a thumbnails buffer"
-  (setq buffer-read-only t)
-  (set (make-local-variable 'thumbs-marked-list) nil))
+  (setq buffer-read-only t))
 
 (defvar thumbs-view-image-mode-map
   (let ((map (make-sparse-keymap)))