diff options
| author | Manuel Giraud | 2023-02-19 21:03:57 +0100 |
|---|---|---|
| committer | Eli Zaretskii | 2023-02-22 15:20:45 +0200 |
| commit | 1f4886fdb09ad6eba5b24bc5032fa650da3a7fcd (patch) | |
| tree | af90b242419cfdd0fde14a3f3bdde30b98f6adc7 | |
| parent | 003759a6dca730df6fae6c9bc8d4a47761b10014 (diff) | |
| download | emacs-1f4886fdb09ad6eba5b24bc5032fa650da3a7fcd.tar.gz emacs-1f4886fdb09ad6eba5b24bc5032fa650da3a7fcd.zip | |
Do not error out on non image file (bug#61639)
* lisp/image/image-dired.el
(image-dired-display-thumbs): Do not insert non image file and do not
display image-dired buffer if it is empty.
| -rw-r--r-- | lisp/image/image-dired.el | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lisp/image/image-dired.el b/lisp/image/image-dired.el index 11632e7f28e..8e2a75a418f 100644 --- a/lisp/image/image-dired.el +++ b/lisp/image/image-dired.el | |||
| @@ -585,13 +585,15 @@ thumbnail buffer to be selected." | |||
| 585 | (erase-buffer)) | 585 | (erase-buffer)) |
| 586 | (goto-char (point-max))) | 586 | (goto-char (point-max))) |
| 587 | (dolist (file files) | 587 | (dolist (file files) |
| 588 | (let ((thumb (image-dired--get-create-thumbnail-file file))) | 588 | (when (string-match-p (image-dired--file-name-regexp) file) |
| 589 | (image-dired-insert-thumbnail | 589 | (image-dired-insert-thumbnail |
| 590 | thumb file dired-buf | 590 | (image-dired--get-create-thumbnail-file file) file dired-buf |
| 591 | (cl-incf image-dired--number-of-thumbnails))))) | 591 | (cl-incf image-dired--number-of-thumbnails))))) |
| 592 | (if do-not-pop | 592 | (if (> image-dired--number-of-thumbnails 0) |
| 593 | (display-buffer buf) | 593 | (if do-not-pop |
| 594 | (pop-to-buffer buf)) | 594 | (display-buffer buf) |
| 595 | (pop-to-buffer buf)) | ||
| 596 | (message "No images selected")) | ||
| 595 | (image-dired--line-up-with-method) | 597 | (image-dired--line-up-with-method) |
| 596 | (image-dired--update-header-line)))) | 598 | (image-dired--update-header-line)))) |
| 597 | 599 | ||