scratch/image-dired 2cd2524900 4/6: image-dired: Minor cleanups

[Stefan Kangas]

branch: scratch/image-dired
commit 2cd252490032da76364cd572811c13cc13405762
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.
    * 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.  Update callers.
---
 lisp/image/image-dired-dired.el    | 3 ++-
 lisp/image/image-dired-external.el | 9 +++------
 lisp/image/image-dired-util.el     | 8 ++++----
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/lisp/image/image-dired-dired.el b/lisp/image/image-dired-dired.el
index f641761f4e..5846e3471b 100644
--- a/lisp/image/image-dired-dired.el
+++ b/lisp/image/image-dired-dired.el
@@ -61,7 +61,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))
diff --git a/lisp/image/image-dired-external.el 
b/lisp/image/image-dired-external.el
index a115dbb350..b54d7cb74b 100644
--- a/lisp/image/image-dired-external.el
+++ b/lisp/image/image-dired-external.el
@@ -144,8 +144,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'."
   :group 'image-dired
@@ -178,15 +177,13 @@ original file with `image-dired-temp-rotate-image-file'."
   :group 'image-dired
   :type 'boolean)
 
-(defcustom image-dired-cmd-write-exif-data-program
-  "exiftool"
+(defcustom image-dired-cmd-write-exif-data-program "exiftool"
   "Program used to write EXIF data to image.
 Used together with `image-dired-cmd-write-exif-data-options'."
   :group 'image-dired
   :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 7e591eb2ee..d579f74c33 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."
@@ -121,7 +120,8 @@ See also `image-dired-thumbnail-storage'."
 
 (defun image-dired-window-width-pixels (window)
   "Calculate WINDOW width in pixels."
-    (* (window-width window) (frame-char-width)))
+  (declare (obsolete window-body-width "29.1"))
+  (* (window-width window) (frame-char-width)))
 
 (defun image-dired-display-window ()
   "Return window where `image-dired-display-image-buffer' is visible."