[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
scratch/image-dired f7a5591707 8/8: image-dired: Minor cleanups
From: |
Stefan Kangas |
Subject: |
scratch/image-dired f7a5591707 8/8: image-dired: Minor cleanups |
Date: |
Tue, 30 Aug 2022 23:57:00 -0400 (EDT) |
branch: scratch/image-dired
commit f7a5591707566321e82f6120802a16d86bcca4d7
Author: Stefan Kangas <stefankangas@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>
image-dired: Minor cleanups
* lisp/image/image-dired-dired.el
(image-dired-dired-after-readin-hook, image-dired-minor-mode):
Minor doc fixes.
(image-dired-dired-display-image): Don't accept ineffectual prefix
argument.
* lisp/image/image-dired-util.el
(image-dired-file-name-at-point): Use when-let.
* lisp/image/image-dired-util.el
(image-dired-window-width-pixels): Make obsolete in favor of
window-body-width.
* lisp/image/image-dired.el (image-dired-line-up-dynamic)
(image-dired-display-window-width): Don't use above obsolete function.
---
lisp/image/image-dired-dired.el | 13 +++++++------
lisp/image/image-dired-external.el | 6 ++----
lisp/image/image-dired-util.el | 14 +++++++-------
lisp/image/image-dired.el | 16 ++++++++--------
4 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/lisp/image/image-dired-dired.el b/lisp/image/image-dired-dired.el
index 4ed861aeeb..e9b8e426f9 100644
--- a/lisp/image/image-dired-dired.el
+++ b/lisp/image/image-dired-dired.el
@@ -81,7 +81,8 @@ previous -ARG, if ARG<0) files."
(defun image-dired-dired-after-readin-hook ()
"Relocate existing thumbnail overlays in Dired buffer after reverting.
Move them to their corresponding files if they still exist.
-Otherwise, delete overlays."
+Otherwise, delete overlays.
+Used by `image-dired-dired-toggle-marked-thumbs'."
(mapc (lambda (overlay)
(when (overlay-get overlay 'put-image)
(let* ((image-file (overlay-get overlay 'image-file))
@@ -289,12 +290,12 @@ With prefix argument ARG, create thumbnails even if they
already exist
image-dired-external-viewer file)))
;;;###autoload
-(defun image-dired-dired-display-image (&optional arg)
+(defun image-dired-dired-display-image (&optional _)
"Display current image file.
-See documentation for `image-dired-display-image' for more information.
-With prefix argument ARG, display image in its original size."
- (interactive "P" dired-mode)
- (image-dired-display-image (dired-get-filename) arg))
+See documentation for `image-dired-display-image' for more information."
+ (declare (advertised-calling-convention () "29.1"))
+ (interactive nil dired-mode)
+ (image-dired-display-image (dired-get-filename)))
;;;###autoload
(defun image-dired-mark-tagged-files (regexp)
diff --git a/lisp/image/image-dired-external.el
b/lisp/image/image-dired-external.el
index 6ee07f25c3..093f037d9a 100644
--- a/lisp/image/image-dired-external.el
+++ b/lisp/image/image-dired-external.el
@@ -142,8 +142,7 @@ Available format specifiers are the same as in
:version "26.1"
:type '(repeat (string :tag "Argument")))
-(defcustom image-dired-cmd-rotate-original-program
- "jpegtran"
+(defcustom image-dired-cmd-rotate-original-program "jpegtran"
"Executable used to rotate original image.
Used together with `image-dired-cmd-rotate-original-options'."
:type 'file)
@@ -171,8 +170,7 @@ original image file name and %t which is replaced by
Used together with `image-dired-cmd-write-exif-data-options'."
:type 'file)
-(defcustom image-dired-cmd-write-exif-data-options
- '("-%t=%v" "%f")
+(defcustom image-dired-cmd-write-exif-data-options '("-%t=%v" "%f")
"Arguments of command used to write EXIF data.
Used with `image-dired-cmd-write-exif-data-program'.
Available format specifiers are: %f which is replaced by
diff --git a/lisp/image/image-dired-util.el b/lisp/image/image-dired-util.el
index 1318b25a12..cb1632e1be 100644
--- a/lisp/image/image-dired-util.el
+++ b/lisp/image/image-dired-util.el
@@ -104,9 +104,8 @@ See also `image-dired-thumbnail-storage'."
(defun image-dired-file-name-at-point ()
"Get abbreviated file name for thumbnail or display image at point."
- (let ((f (image-dired-original-file-name)))
- (when f
- (abbreviate-file-name f))))
+ (when-let ((f (image-dired-original-file-name)))
+ (abbreviate-file-name f)))
(defun image-dired-associated-dired-buffer ()
"Get associated Dired buffer at point."
@@ -119,10 +118,6 @@ See also `image-dired-thumbnail-storage'."
(equal (window-buffer window) buf))
nil t))
-(defun image-dired-window-width-pixels (window)
- "Calculate WINDOW width in pixels."
- (* (window-width window) (frame-char-width)))
-
(defun image-dired-display-window ()
"Return window where `image-dired-display-image-buffer' is visible."
(get-window-with-predicate
@@ -152,6 +147,11 @@ See also `image-dired-thumbnail-storage'."
"Return non-nil if there is an `image-dired' thumbnail at point."
(get-text-property (point) 'image-dired-thumbnail))
+(defun image-dired-window-width-pixels (window)
+ "Calculate WINDOW width in pixels."
+ (declare (obsolete window-body-width "29.1"))
+ (* (window-width window) (frame-char-width)))
+
(provide 'image-dired-util)
;; Local Variables:
diff --git a/lisp/image/image-dired.el b/lisp/image/image-dired.el
index a58eaa4775..1444dfb2cf 100644
--- a/lisp/image/image-dired.el
+++ b/lisp/image/image-dired.el
@@ -1056,13 +1056,13 @@ See also `image-dired-line-up-dynamic'."
Calculate how many thumbnails fit."
(interactive nil image-dired-thumbnail-mode)
(let* ((char-width (frame-char-width))
- (width (image-dired-window-width-pixels
(image-dired-thumbnail-window)))
- (image-dired-thumbs-per-row
- (/ width
- (+ (* 2 image-dired-thumb-relief)
- (* 2 image-dired-thumb-margin)
- (image-dired-thumb-size 'width)
- char-width))))
+ (width (window-body-width (image-dired-thumbnail-window) t))
+ (image-dired-thumbs-per-row
+ (/ width
+ (+ (* 2 image-dired-thumb-relief)
+ (* 2 image-dired-thumb-margin)
+ (image-dired-thumb-size 'width)
+ char-width))))
(image-dired-line-up)))
(defun image-dired-line-up-interactive ()
@@ -1368,7 +1368,7 @@ completely fit)."
(defun image-dired-display-window-width (window)
"Return width, in pixels, of WINDOW."
(declare (obsolete nil "29.1"))
- (- (image-dired-window-width-pixels window)
+ (- (window-body-width window t)
image-dired-display-window-width-correction))
(defun image-dired-display-window-height (window)
- branch scratch/image-dired created (now f7a5591707), Stefan Kangas, 2022/08/30
- scratch/image-dired 9f4d88de8d 4/8: image-dired: Make HTML gallery generation obsolete, Stefan Kangas, 2022/08/30
- scratch/image-dired c3fcb960c8 3/8: image-dired: Do more interactive mode tagging, Stefan Kangas, 2022/08/30
- scratch/image-dired 7e2c5ddea4 6/8: Add new defgroup image-dired-external, Stefan Kangas, 2022/08/30
- scratch/image-dired 5b857953a7 7/8: image-dired: Prefer defvar-keymap, Stefan Kangas, 2022/08/30
- scratch/image-dired f7a5591707 8/8: image-dired: Minor cleanups,
Stefan Kangas <=
- scratch/image-dired 6a75bd93a2 2/8: Split image-dired.el into several files (part 2/2), Stefan Kangas, 2022/08/30
- scratch/image-dired 5756d52fde 1/8: Split image-dired.el into several files (part 1/2), Stefan Kangas, 2022/08/30
- scratch/image-dired 566d684be3 5/8: ; image-dired: Indentation fixes, Stefan Kangas, 2022/08/30