diff options
| -rw-r--r-- | lisp/image/image-dired-dired.el | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/lisp/image/image-dired-dired.el b/lisp/image/image-dired-dired.el index b15d46d1115..ef0323d1665 100644 --- a/lisp/image/image-dired-dired.el +++ b/lisp/image/image-dired-dired.el | |||
| @@ -26,7 +26,15 @@ | |||
| 26 | 26 | ||
| 27 | (require 'image-dired) | 27 | (require 'image-dired) |
| 28 | 28 | ||
| 29 | (defcustom image-dired-append-when-browsing nil | 29 | (defgroup image-dired-dired nil |
| 30 | "Dired specific commands for Image-Dired." | ||
| 31 | :prefix "image-dired-dired-" | ||
| 32 | :link '(info-link "(emacs) Image-Dired") | ||
| 33 | :group 'image-dired) | ||
| 34 | |||
| 35 | (define-obsolete-variable-alias 'image-dired-append-when-browsing | ||
| 36 | 'image-dired-dired-append-when-browsing "29.1") | ||
| 37 | (defcustom image-dired-dired-append-when-browsing nil | ||
| 30 | "Append thumbnails in thumbnail buffer when browsing. | 38 | "Append thumbnails in thumbnail buffer when browsing. |
| 31 | If non-nil, using `image-dired-next-line-and-display' and | 39 | If non-nil, using `image-dired-next-line-and-display' and |
| 32 | `image-dired-previous-line-and-display' will leave a trail of thumbnail | 40 | `image-dired-previous-line-and-display' will leave a trail of thumbnail |
| @@ -34,7 +42,6 @@ images in the thumbnail buffer. If you enable this and want to clean | |||
| 34 | the thumbnail buffer because it is filled with too many thumbnails, | 42 | the thumbnail buffer because it is filled with too many thumbnails, |
| 35 | just call `image-dired-display-thumb' to display only the image at point. | 43 | just call `image-dired-display-thumb' to display only the image at point. |
| 36 | This value can be toggled using `image-dired-toggle-append-browsing'." | 44 | This value can be toggled using `image-dired-toggle-append-browsing'." |
| 37 | :group 'image-dired | ||
| 38 | :type 'boolean) | 45 | :type 'boolean) |
| 39 | 46 | ||
| 40 | (defcustom image-dired-dired-disp-props t | 47 | (defcustom image-dired-dired-disp-props t |
| @@ -43,7 +50,6 @@ Used by `image-dired-next-line-and-display', | |||
| 43 | `image-dired-previous-line-and-display' and `image-dired-mark-and-display-next'. | 50 | `image-dired-previous-line-and-display' and `image-dired-mark-and-display-next'. |
| 44 | If the database file is large, this can slow down image browsing in | 51 | If the database file is large, this can slow down image browsing in |
| 45 | Dired and you might want to turn it off." | 52 | Dired and you might want to turn it off." |
| 46 | :group 'image-dired | ||
| 47 | :type 'boolean) | 53 | :type 'boolean) |
| 48 | 54 | ||
| 49 | ;;;###autoload | 55 | ;;;###autoload |
| @@ -96,8 +102,7 @@ Used by `image-dired-dired-toggle-marked-thumbs'." | |||
| 96 | "Move to next Dired line and display thumbnail image." | 102 | "Move to next Dired line and display thumbnail image." |
| 97 | (interactive nil dired-mode) | 103 | (interactive nil dired-mode) |
| 98 | (dired-next-line 1) | 104 | (dired-next-line 1) |
| 99 | (image-dired-display-thumbs | 105 | (image-dired-display-thumbs t image-dired-dired-append-when-browsing t) |
| 100 | t (or image-dired-append-when-browsing nil) t) | ||
| 101 | (if image-dired-dired-disp-props | 106 | (if image-dired-dired-disp-props |
| 102 | (image-dired-dired-display-properties))) | 107 | (image-dired-dired-display-properties))) |
| 103 | 108 | ||
| @@ -105,18 +110,17 @@ Used by `image-dired-dired-toggle-marked-thumbs'." | |||
| 105 | "Move to previous Dired line and display thumbnail image." | 110 | "Move to previous Dired line and display thumbnail image." |
| 106 | (interactive nil dired-mode) | 111 | (interactive nil dired-mode) |
| 107 | (dired-previous-line 1) | 112 | (dired-previous-line 1) |
| 108 | (image-dired-display-thumbs | 113 | (image-dired-display-thumbs t image-dired-dired-append-when-browsing t) |
| 109 | t (or image-dired-append-when-browsing nil) t) | ||
| 110 | (if image-dired-dired-disp-props | 114 | (if image-dired-dired-disp-props |
| 111 | (image-dired-dired-display-properties))) | 115 | (image-dired-dired-display-properties))) |
| 112 | 116 | ||
| 113 | (defun image-dired-toggle-append-browsing () | 117 | (defun image-dired-toggle-append-browsing () |
| 114 | "Toggle `image-dired-append-when-browsing'." | 118 | "Toggle `image-dired-dired-append-when-browsing'." |
| 115 | (interactive nil dired-mode) | 119 | (interactive nil dired-mode) |
| 116 | (setq image-dired-append-when-browsing | 120 | (setq image-dired-dired-append-when-browsing |
| 117 | (not image-dired-append-when-browsing)) | 121 | (not image-dired-dired-append-when-browsing)) |
| 118 | (message "Append browsing %s" | 122 | (message "Append browsing %s" |
| 119 | (if image-dired-append-when-browsing | 123 | (if image-dired-dired-append-when-browsing |
| 120 | "on" | 124 | "on" |
| 121 | "off"))) | 125 | "off"))) |
| 122 | 126 | ||
| @@ -124,8 +128,7 @@ Used by `image-dired-dired-toggle-marked-thumbs'." | |||
| 124 | "Mark current file in Dired and display next thumbnail image." | 128 | "Mark current file in Dired and display next thumbnail image." |
| 125 | (interactive nil dired-mode) | 129 | (interactive nil dired-mode) |
| 126 | (dired-mark 1) | 130 | (dired-mark 1) |
| 127 | (image-dired-display-thumbs | 131 | (image-dired-display-thumbs t image-dired-dired-append-when-browsing t) |
| 128 | t (or image-dired-append-when-browsing nil) t) | ||
| 129 | (if image-dired-dired-disp-props | 132 | (if image-dired-dired-disp-props |
| 130 | (image-dired-dired-display-properties))) | 133 | (image-dired-dired-display-properties))) |
| 131 | 134 | ||
| @@ -233,7 +236,7 @@ With prefix argument, move ARG lines." | |||
| 233 | :selected image-dired-dired-disp-props] | 236 | :selected image-dired-dired-disp-props] |
| 234 | ["Toggle append browsing" image-dired-toggle-append-browsing | 237 | ["Toggle append browsing" image-dired-toggle-append-browsing |
| 235 | :style toggle | 238 | :style toggle |
| 236 | :selected image-dired-append-when-browsing] | 239 | :selected image-dired-dired-append-when-browsing] |
| 237 | ["Toggle movement tracking" image-dired-toggle-movement-tracking | 240 | ["Toggle movement tracking" image-dired-toggle-movement-tracking |
| 238 | :style toggle | 241 | :style toggle |
| 239 | :selected image-dired-track-movement] | 242 | :selected image-dired-track-movement] |