diff options
| author | Stefan Kangas <stefankangas@gmail.com> | 2022-08-31 05:52:11 +0200 |
|---|---|---|
| committer | Stefan Kangas <stefankangas@gmail.com> | 2022-09-03 10:44:04 +0200 |
| commit | 504d5c2da867a932f7bb43af8be114607d70a572 (patch) | |
| tree | 351264d8bb907ec3a253615bc64ae0e94610a3af /lisp/image/image-dired-util.el | |
| parent | e50674833d9ba6eed2ec47ec2f0e867596713523 (diff) | |
| download | emacs-504d5c2da867a932f7bb43af8be114607d70a572.tar.gz emacs-504d5c2da867a932f7bb43af8be114607d70a572.tar.bz2 emacs-504d5c2da867a932f7bb43af8be114607d70a572.zip | |
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.
(image-dired-display-thumb-properties): Redefine as obsolete function
alias for 'image-dired-update-header-line'.
* 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.
Diffstat (limited to 'lisp/image/image-dired-util.el')
| -rw-r--r-- | lisp/image/image-dired-util.el | 14 |
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: |