scratch/image-dired aade9be8ae 4/4: Do interactive mode tagging in image-dired-dired.el

[Stefan Kangas]

branch: scratch/image-dired
commit aade9be8ae46ca6f7e709f3d43fb0e7abd8aab47
Author: Stefan Kangas <stefankangas@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>

    Do interactive mode tagging in image-dired-dired.el
    
    * lisp/image-dired/image-dired-dired.el
    (image-dired-dired-toggle-marked-thumbs)
    (image-dired-next-line-and-display)
    (image-dired-previous-line-and-display)
    (image-dired-toggle-append-browsing)
    (image-dired-mark-and-display-next)
    (image-dired-toggle-dired-display-properties)
    (image-dired-dired-next-line, image-dired-dired-previous-line)
    (image-dired-create-thumbs, image-dired-dired-display-external)
    (image-dired-dired-display-image, image-dired-mark-tagged-files)
    (image-dired-dired-display-properties): Add interactive tag for
    dired-mode.
---
 lisp/image-dired/image-dired-dired.el | 63 +++++++++++++++++------------------
 1 file changed, 31 insertions(+), 32 deletions(-)

diff --git a/lisp/image-dired/image-dired-dired.el 
b/lisp/image-dired/image-dired-dired.el
index d2c13e334a..4e768876c8 100644
--- a/lisp/image-dired/image-dired-dired.el
+++ b/lisp/image-dired/image-dired-dired.el
@@ -33,7 +33,7 @@ If no marked file could be found, insert or hide thumbnails 
on the
 current line.  ARG, if non-nil, specifies the files to use instead
 of the marked files.  If ARG is an integer, use the next ARG (or
 previous -ARG, if ARG<0) files."
-  (interactive "P")
+  (interactive "P" dired-mode)
   (dired-map-over-marks
    (let ((image-pos  (dired-move-to-filename))
          (image-file (dired-get-filename nil t))
@@ -47,12 +47,12 @@ previous -ARG, if ARG<0) files."
                                 if (overlay-get ov 'thumb-file) return ov)))
          (if thumb-ov
              (delete-overlay thumb-ov)
-          (put-image thumb-file image-pos)
-          (setq overlay
+           (put-image thumb-file image-pos)
+           (setq overlay
                  (cl-loop for ov in (overlays-in (point) (1+ (point)))
                           if (overlay-get ov 'put-image) return ov))
-          (overlay-put overlay 'image-file image-file)
-          (overlay-put overlay 'thumb-file thumb-file)))))
+           (overlay-put overlay 'image-file image-file)
+           (overlay-put overlay 'thumb-file thumb-file)))))
    arg             ; Show or hide image on ARG next files.
    'show-progress) ; Update dired display after each image is updated.
   (add-hook 'dired-after-readin-hook
@@ -74,7 +74,7 @@ Used by `image-dired-dired-toggle-marked-thumbs'."
 
 (defun image-dired-next-line-and-display ()
   "Move to next Dired line and display thumbnail image."
-  (interactive)
+  (interactive nil dired-mode)
   (dired-next-line 1)
   (image-dired-display-thumbs
    t (or image-dired-append-when-browsing nil) t)
@@ -83,7 +83,7 @@ Used by `image-dired-dired-toggle-marked-thumbs'."
 
 (defun image-dired-previous-line-and-display ()
   "Move to previous Dired line and display thumbnail image."
-  (interactive)
+  (interactive nil dired-mode)
   (dired-previous-line 1)
   (image-dired-display-thumbs
    t (or image-dired-append-when-browsing nil) t)
@@ -92,7 +92,7 @@ Used by `image-dired-dired-toggle-marked-thumbs'."
 
 (defun image-dired-toggle-append-browsing ()
   "Toggle `image-dired-append-when-browsing'."
-  (interactive)
+  (interactive nil dired-mode)
   (setq image-dired-append-when-browsing
         (not image-dired-append-when-browsing))
   (message "Append browsing %s"
@@ -102,7 +102,7 @@ Used by `image-dired-dired-toggle-marked-thumbs'."
 
 (defun image-dired-mark-and-display-next ()
   "Mark current file in Dired and display next thumbnail image."
-  (interactive)
+  (interactive nil dired-mode)
   (dired-mark 1)
   (image-dired-display-thumbs
    t (or image-dired-append-when-browsing nil) t)
@@ -111,7 +111,7 @@ Used by `image-dired-dired-toggle-marked-thumbs'."
 
 (defun image-dired-toggle-dired-display-properties ()
   "Toggle `image-dired-dired-disp-props'."
-  (interactive)
+  (interactive nil dired-mode)
   (setq image-dired-dired-disp-props
         (not image-dired-dired-disp-props))
   (message "Dired display properties %s"
@@ -145,7 +145,7 @@ but the other way around."
   "Call `dired-next-line', then track thumbnail.
 This can safely replace `dired-next-line'.
 With prefix argument, move ARG lines."
-  (interactive "P")
+  (interactive "P" dired-mode)
   (dired-next-line (or arg 1))
   (if image-dired-track-movement
       (image-dired-track-thumbnail)))
@@ -154,16 +154,15 @@ With prefix argument, move ARG lines."
   "Call `dired-previous-line', then track thumbnail.
 This can safely replace `dired-previous-line'.
 With prefix argument, move ARG lines."
-  (interactive "P")
+  (interactive "P" dired-mode)
   (dired-previous-line (or arg 1))
   (if image-dired-track-movement
       (image-dired-track-thumbnail)))
 
-
 ;;;###autoload
 (defun image-dired-jump-thumbnail-buffer ()
   "Jump to thumbnail buffer."
-  (interactive)
+  (interactive nil dired-mode)
   (let ((window (image-dired-thumbnail-window))
         frame)
     (if window
@@ -240,7 +239,7 @@ Note that \\`n', \\`p' and \\`<down>' and \\`<up>' will be 
hijacked and bound to
   "Create thumbnail images for all marked files in Dired.
 With prefix argument ARG, create thumbnails even if they already exist
 \(i.e. use this to refresh your thumbnails)."
-  (interactive "P")
+  (interactive "P" dired-mode)
   (let (thumb-name)
     (dolist (curr-file (dired-get-marked-files))
       (setq thumb-name (image-dired-thumb-name curr-file))
@@ -256,7 +255,7 @@ With prefix argument ARG, create thumbnails even if they 
already exist
 ;;;###autoload
 (defun image-dired-dired-display-external ()
   "Display file at point using an external viewer."
-  (interactive)
+  (interactive nil dired-mode)
   (let ((file (dired-get-filename)))
     (start-process "image-dired-external" nil
                    image-dired-external-viewer file)))
@@ -265,7 +264,7 @@ With prefix argument ARG, create thumbnails even if they 
already exist
 (defun image-dired-dired-display-image ()
   "Display current image file.
 See documentation for `image-dired-display-image' for more information."
-  (interactive "P")
+  (interactive "P" dired-mode)
   (image-dired-display-image (dired-get-filename)))
 
 ;;;###autoload
@@ -276,7 +275,7 @@ image file and stored in image-dired's database file.  This 
command
 lets you input a regexp and this will be matched against all tags
 on all image files in the database file.  The files that have a
 matching tag will be marked in the Dired buffer."
-  (interactive "sMark tagged files (regexp): ")
+  (interactive "sMark tagged files (regexp): " dired-mode)
   (image-dired-sane-db-file)
   (let ((hits 0)
         files)
@@ -295,19 +294,19 @@ matching tag will be marked in the Dired buffer."
       ;; slow.  Don't bother about hits found in other directories
       ;; than the current one.
       (when (string= (file-name-as-directory
-                     (expand-file-name default-directory))
-                    (file-name-as-directory
-                     (file-name-directory curr-file)))
-       (setq curr-file (file-name-nondirectory curr-file))
-       (goto-char (point-min))
-       (when (search-forward-regexp (format "\\s %s$" curr-file) nil t)
-         (setq hits (+ hits 1))
-         (dired-mark 1))))
+                      (expand-file-name default-directory))
+                     (file-name-as-directory
+                      (file-name-directory curr-file)))
+        (setq curr-file (file-name-nondirectory curr-file))
+        (goto-char (point-min))
+        (when (search-forward-regexp (format "\\s %s$" curr-file) nil t)
+          (setq hits (+ hits 1))
+          (dired-mark 1))))
     (message "%d files with matching tag marked" hits)))
 
 (defun image-dired-dired-display-properties ()
   "Display properties for Dired file in the echo area."
-  (interactive)
+  (interactive nil dired-mode)
   (let* ((file (dired-get-filename))
          (file-name (file-name-nondirectory file))
          (dired-buf (buffer-name (current-buffer)))
@@ -316,11 +315,11 @@ matching tag will be marked in the Dired buffer."
          (message-log-max nil))
     (if file-name
         (message "%s"
-         (image-dired-format-properties-string
-          dired-buf
-          file-name
-          props
-          comment)))))
+                 (image-dired-format-properties-string
+                  dired-buf
+                  file-name
+                  props
+                  comment)))))
 
 (provide 'image-dired-dired)