summaryrefslogtreecommitdiff
path: root/lisp/image/image-dired-util.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/image/image-dired-util.el')
-rw-r--r--lisp/image/image-dired-util.el14
1 files changed, 7 insertions, 7 deletions
diff --git a/lisp/image/image-dired-util.el b/lisp/image/image-dired-util.el
index 1318b25a12a..cb1632e1be4 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: