bug#61734: 30.0.50; [PATCH] Defaults to zero for image-dired--number-of-thumbnails

bug#61734: 30.0.50; [PATCH] Defaults to zero for image-dired--number-of-thumbnails

[Manuel Giraud via Bug reports for GNU Emacs, the Swiss army knife of text editors]

[-- Attachment #1: Type: text/plain, Size: 273 bytes --]


Hi,

Here is a patch to avoid "wrong type error" upon comparision to zero of
image-dired--number-of-thumbnails.  How to reproduce:

    - Do not have an existing *image-dired* buffer
    - Hit 'C-t a' (image-dired-display-thumbs-append) on an image file
      from Dired


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Defaults-to-zero-for-image-dired-number-of-thumbnail.patch --]
[-- Type: text/x-patch, Size: 919 bytes --]

From c88f74aaa381580c183a8692bc467bfef7cd192b Mon Sep 17 00:00:00 2001
From: Manuel Giraud <manuel@ledu-giraud.fr>
Date: Thu, 23 Feb 2023 16:42:48 +0100
Subject: [PATCH] Defaults to zero for image-dired--number-of-thumbnails

* lisp/image/image-dired.el (image-dired--number-of-thumbnails):
Defaults to zero to avoid wrong type error down the line.
---
 lisp/image/image-dired.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/image/image-dired.el b/lisp/image/image-dired.el
index 8e2a75a418f..6ecb307ce12 100644
--- a/lisp/image/image-dired.el
+++ b/lisp/image/image-dired.el
@@ -546,7 +546,7 @@ image-dired--line-up-with-method
         (t
          (image-dired-line-up-dynamic))))
 
-(defvar-local image-dired--number-of-thumbnails nil)
+(defvar-local image-dired--number-of-thumbnails 0)
 
 ;;;###autoload
 (defun image-dired-display-thumbs (&optional arg append do-not-pop)
-- 
2.39.1


[-- Attachment #3: Type: text/plain, Size: 7256 bytes --]



In GNU Emacs 30.0.50 (build 1, x86_64-unknown-openbsd7.2, cairo version
 1.17.8) of 2023-02-23 built on computer
Repository revision: c88f74aaa381580c183a8692bc467bfef7cd192b
Repository branch: mgi/image-dired-fix
Windowing system distributor 'The X.Org Foundation', version 11.0.12101006
System Description: OpenBSD computer 7.2 GENERIC.MP#1052 amd64

Configured using:
 'configure --prefix=/home/manuel/emacs --bindir=/home/manuel/bin
 --with-x-toolkit=no --without-sound --without-compress-install
 CPPFLAGS=-I/usr/local/include LDFLAGS=-L/usr/local/lib'

Configured features:
CAIRO DBUS FREETYPE GIF GLIB GMP GNUTLS GSETTINGS HARFBUZZ JPEG JSON
LCMS2 LIBOTF LIBXML2 MODULES NOTIFY KQUEUE OLDXMENU PDUMPER PNG RSVG
SQLITE3 THREADS TIFF TREE_SITTER WEBP X11 XDBE XIM XINPUT2 XPM ZLIB

Important settings:
  value of $LC_ALL: en_US.UTF-8
  locale-coding-system: utf-8-unix

Major mode: Dired by name

Minor modes in effect:
  gnus-dired-mode: t
  display-time-mode: t
  display-battery-mode: t
  server-mode: t
  shell-dirtrack-mode: t
  repeat-mode: t
  desktop-save-mode: t
  global-eldoc-mode: t
  show-paren-mode: t
  electric-indent-mode: t
  mouse-wheel-mode: t
  menu-bar-mode: t
  file-name-shadow-mode: t
  global-font-lock-mode: t
  font-lock-mode: t
  blink-cursor-mode: t
  buffer-read-only: t
  line-number-mode: t
  indent-tabs-mode: t
  transient-mark-mode: t
  auto-composition-mode: t
  auto-encryption-mode: t
  auto-compression-mode: t

Load-path shadows:
/home/manuel/.emacs.d/elpa/ef-themes-0.10.0/theme-loaddefs hides /home/manuel/emacs/share/emacs/30.0.50/lisp/theme-loaddefs
/home/manuel/.emacs.d/elpa/transient-0.3.7/transient hides /home/manuel/emacs/share/emacs/30.0.50/lisp/transient

Features:
(shadow sort emacsbug gnus-async gnus-bcklg gnus-cite mail-extr
gnus-draft gnus-ml gnus-topic mm-archive url-http url-gw url-cache
url-auth utf-7 imap rfc2104 nndoc nndraft nnmh network-stream nsm
nnfolder nnml gnus-agent gnus-srvr gnus-score score-mode nnvirtual nntp
gnus-cache nnrss w3m w3m-hist bookmark-w3m w3m-ems w3m-favicon w3m-image
w3m-fb tab-line w3m-proc w3m-util pulse image-file image-converter
image-dired-dired image-dired image-dired-tags image-dired-external
image-dired-util org-indent vc-dir ewoc vc reveal pascal sh-script
executable texinfo texinfo-loaddefs org-element org-persist org-id
org-refile avl-tree oc-basic ol-eww ol-rmail ol-mhe ol-irc ol-info
ol-gnus nnselect ol-docview ol-bibtex bibtex ol-bbdb ol-w3m ol-doi
org-link-doi doc-view jka-compr image-mode exif vc-hg conf-mode css-mode
treesit smie sgml-mode facemenu imenu eww xdg url-queue mm-url
autorevert filenotify vc-git diff-mode bug-reference paredit edmacro
gnus-dired time battery exwm-randr xcb-randr exwm-config ido exwm
exwm-input xcb-keysyms xcb-xkb exwm-manage exwm-floating xcb-cursor
xcb-render exwm-layout exwm-workspace exwm-core xcb-ewmh xcb-icccm xcb
xcb-xproto xcb-types xcb-debug kmacro server modus-operandi-theme
modus-themes ytdious mingus libmpdee reporter edebug debug backtrace
transmission color calc-bin calc-ext calc calc-loaddefs rect calc-macs
w3m-load supercite regi ebdb-message ebdb-gnus gnus-msg gnus-art mm-uu
mml2015 mm-view mml-smime smime gnutls dig gnus-sum shr pixel-fill
kinsoku url-file svg dom gnus-group gnus-undo gnus-start gnus-dbus
gnus-cloud nnimap nnmail mail-source utf7 nnoo gnus-spec gnus-int
gnus-range message sendmail yank-media puny rfc822 mml mml-sec epa epg
rfc6068 epg-config mm-decode mm-bodies mm-encode mail-parse rfc2231
rfc2047 rfc2045 ietf-drums gmm-utils mailheader gnus-win gnus nnheader
gnus-util mail-utils range mm-util mail-prsvr ebdb-mua ebdb-com crm
ebdb-format ebdb mailabbrev eieio-opt cl-extra help-mode speedbar
ezimage dframe eieio-base pcase timezone org ob ob-tangle ob-ref ob-lob
ob-table ob-exp org-macro org-src ob-comint org-pcomplete org-list
org-footnote org-faces org-entities ob-emacs-lisp ob-core ob-eval
org-cycle org-table ol org-fold org-fold-core org-keys oc org-loaddefs
find-func org-version org-compat org-macs visual-basic-mode cl web-mode
derived disp-table erlang-start smart-tabs-mode skeleton cc-mode
cc-fonts cc-guess cc-menus cc-cmds cc-styles cc-align cc-engine cc-vars
cc-defs slime-asdf grep slime-tramp tramp rx tramp-loaddefs trampver
tramp-integration cus-edit cus-load wid-edit files-x tramp-compat shell
pcomplete parse-time iso8601 time-date ls-lisp format-spec slime-fancy
slime-indentation slime-cl-indent cl-indent slime-trace-dialog
slime-fontifying-fu slime-package-fu slime-references
slime-compiler-notes-tree advice slime-scratch slime-presentations
bridge slime-macrostep macrostep slime-mdot-fu slime-enclosing-context
slime-fuzzy slime-fancy-trace slime-fancy-inspector slime-c-p-c
slime-editing-commands slime-autodoc slime-repl slime-parse slime
apropos compile text-property-search etags fileloop generator xref
project arc-mode archive-mode noutline outline icons pp comint ansi-osc
ansi-color ring hyperspec thingatpt slime-autoloads view mule-util
cal-china lunar solar cal-dst cal-bahai cal-islam cal-hebrew holidays
holiday-loaddefs vc-dispatcher vc-svn appt diary-lib diary-loaddefs
cal-menu calendar cal-loaddefs dired-aux dired-x dired dired-loaddefs
notifications dbus xml repeat easy-mmode desktop frameset osm-autoloads
rust-mode-autoloads compat-autoloads ebdb-autoloads magit-autoloads
debbugs-autoloads git-commit-autoloads magit-section-autoloads
ef-themes-autoloads with-editor-autoloads paredit-autoloads
dash-autoloads ytdious-autoloads transmission-autoloads
transient-autoloads exwm-autoloads hyperbole-autoloads
detached-autoloads info package browse-url url url-proxy url-privacy
url-expand url-methods url-history url-cookie generate-lisp-file
url-domsuf url-util mailcap url-handlers url-parse auth-source cl-seq
eieio eieio-core cl-macs password-cache json subr-x map byte-opt gv
bytecomp byte-compile url-vars cl-loaddefs cl-lib rmc iso-transl tooltip
cconv eldoc paren electric uniquify ediff-hook vc-hooks lisp-float-type
elisp-mode mwheel term/x-win x-win term/common-win x-dnd tool-bar dnd
fontset image regexp-opt fringe tabulated-list replace newcomment
text-mode lisp-mode prog-mode register page tab-bar menu-bar rfn-eshadow
isearch easymenu timer select scroll-bar mouse jit-lock font-lock syntax
font-core term/tty-colors frame minibuffer nadvice seq simple cl-generic
indonesian philippine cham georgian utf-8-lang misc-lang vietnamese
tibetan thai tai-viet lao korean japanese eucjp-ms cp51932 hebrew greek
romanian slovak czech european ethiopic indian cyrillic chinese
composite emoji-zwj charscript charprop case-table epa-hook
jka-cmpr-hook help abbrev obarray oclosure cl-preloaded button loaddefs
theme-loaddefs faces cus-face macroexp files window text-properties
overlay sha1 md5 base64 format env code-pages mule custom widget keymap
hashtable-print-readable backquote threads dbusbind kqueue lcms2
dynamic-setting system-font-setting font-render-setting cairo xinput2 x
multi-tty make-network-process emacs)

Memory information:
((conses 16 681910 47010)
 (symbols 48 58183 11)
 (strings 32 185661 11716)
 (string-bytes 1 7215305)
 (vectors 16 108542)
 (vector-slots 8 2228124 137704)
 (floats 8 1047 375)
 (intervals 56 9844 144)
 (buffers 984 87))

-- 
Manuel Giraud

bug#61734: 30.0.50; [PATCH] Defaults to zero for image-dired--number-of-thumbnails

[Manuel Giraud via Bug reports for GNU Emacs, the Swiss army knife of text editors]

[-- Attachment #1: Type: text/plain, Size: 597 bytes --]

Manuel Giraud <manuel@ledu-giraud.fr> writes:

> Hi,
>
> Here is a patch to avoid "wrong type error" upon comparision to zero of
> image-dired--number-of-thumbnails.  How to reproduce:
>
>     - Do not have an existing *image-dired* buffer
>     - Hit 'C-t a' (image-dired-display-thumbs-append) on an image file
>       from Dired

Maybe this new version can go in too.  It updates the thumbnails counter
when removing a thumbnail.  What is not updated though is the number of
the image which is assign with a text-property at insertion...  So it is
not complete but an improvement nevertheless.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Defaults-to-zero-for-image-dired-number-of-thumbnail.patch --]
[-- Type: text/x-patch, Size: 1450 bytes --]

From 04a3bc1cf9b3c2685c3edba1e0f792d8f28de6b2 Mon Sep 17 00:00:00 2001
From: Manuel Giraud <manuel@ledu-giraud.fr>
Date: Thu, 23 Feb 2023 16:42:48 +0100
Subject: [PATCH] Defaults to zero for image-dired--number-of-thumbnails
 (bug#61734)

* lisp/image/image-dired.el (image-dired--number-of-thumbnails):
Defaults to zero to avoid wrong type error down the line.
(image-dired-delete-char): Update thumbnails counter upon deletion.
---
 lisp/image/image-dired.el | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lisp/image/image-dired.el b/lisp/image/image-dired.el
index 8e2a75a418f..2c2968b1b49 100644
--- a/lisp/image/image-dired.el
+++ b/lisp/image/image-dired.el
@@ -546,7 +546,7 @@ image-dired--line-up-with-method
         (t
          (image-dired-line-up-dynamic))))
 
-(defvar-local image-dired--number-of-thumbnails nil)
+(defvar-local image-dired--number-of-thumbnails 0)
 
 ;;;###autoload
 (defun image-dired-display-thumbs (&optional arg append do-not-pop)
@@ -1127,9 +1127,11 @@ image-dired-delete-char
   "Remove current thumbnail from thumbnail buffer and line up."
   (interactive nil image-dired-thumbnail-mode)
   (let ((inhibit-read-only t))
-    (delete-char 1))
+    (delete-char 1)
+    (cl-decf image-dired--number-of-thumbnails))
   (let ((pos (point)))
     (image-dired--line-up-with-method)
+    (image-dired--update-header-line)
     (goto-char pos)))
 
 (defun image-dired-line-up ()
-- 
2.39.1


[-- Attachment #3: Type: text/plain, Size: 18 bytes --]

-- 
Manuel Giraud

bug#61734: 30.0.50; [PATCH] Defaults to zero for image-dired--number-of-thumbnails

[Manuel Giraud via Bug reports for GNU Emacs, the Swiss army knife of text editors]

[-- Attachment #1: Type: text/plain, Size: 154 bytes --]

Hi,

Here is another version that fixes all the "out of sync" counter that I
have… but maybe it start to grow outside the scope of this bug report.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Fixes-on-image-dired-thumbnails-counter-bug-61734.patch --]
[-- Type: text/x-patch, Size: 3900 bytes --]

From 078cff71abc7125558ed492e894aa7d1b487d9bd Mon Sep 17 00:00:00 2001
From: Manuel Giraud <manuel@ledu-giraud.fr>
Date: Thu, 23 Feb 2023 16:42:48 +0100
Subject: [PATCH] Fixes on image-dired thumbnails counter (bug#61734)

* lisp/image/image-dired.el (image-dired--number-of-thumbnails):
Defaults to zero to avoid wrong type error down the line.
(image-dired-delete-char): Update thumbnails counter upon deletion.
(image-dired-insert-thumbnail, image-dired--update-header-line,
image-dired-display-thumbs): Remove 'image-number text-property and
rely on the (point).
---
 lisp/image/image-dired.el | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/lisp/image/image-dired.el b/lisp/image/image-dired.el
index 8e2a75a418f..c33a977e5dc 100644
--- a/lisp/image/image-dired.el
+++ b/lisp/image/image-dired.el
@@ -424,11 +424,10 @@ image-dired--get-create-thumbnail-file
                          (file-name-nondirectory thumb-file)))
     thumb-file))
 
-(defun image-dired-insert-thumbnail ( file original-file-name
-                           associated-dired-buffer image-number)
+(defun image-dired-insert-thumbnail (file original-file-name
+                                          associated-dired-buffer)
   "Insert thumbnail image FILE.
-Add text properties ORIGINAL-FILE-NAME, ASSOCIATED-DIRED-BUFFER
-and IMAGE-NUMBER."
+Add text properties ORIGINAL-FILE-NAME, ASSOCIATED-DIRED-BUFFER."
   (let (beg end)
     (setq beg (point))
     (image-dired-insert-image
@@ -452,7 +451,6 @@ image-dired-insert-thumbnail
            'keymap nil
            'original-file-name original-file-name
            'associated-dired-buffer associated-dired-buffer
-           'image-number image-number
            'tags (image-dired-list-tags original-file-name)
            'mouse-face 'highlight
            'comment (image-dired-get-comment original-file-name)))))
@@ -546,7 +544,7 @@ image-dired--line-up-with-method
         (t
          (image-dired-line-up-dynamic))))
 
-(defvar-local image-dired--number-of-thumbnails nil)
+(defvar-local image-dired--number-of-thumbnails 0)
 
 ;;;###autoload
 (defun image-dired-display-thumbs (&optional arg append do-not-pop)
@@ -587,8 +585,8 @@ image-dired-display-thumbs
         (dolist (file files)
           (when (string-match-p (image-dired--file-name-regexp) file)
             (image-dired-insert-thumbnail
-             (image-dired--get-create-thumbnail-file file) file dired-buf
-             (cl-incf image-dired--number-of-thumbnails)))))
+             (image-dired--get-create-thumbnail-file file) file dired-buf)
+            (cl-incf image-dired--number-of-thumbnails))))
       (if (> image-dired--number-of-thumbnails 0)
           (if do-not-pop
               (display-buffer buf)
@@ -789,7 +787,7 @@ image-dired--update-header-line
     (let ((file-name (image-dired-original-file-name))
           (dired-buf (buffer-name (image-dired-associated-dired-buffer)))
           (image-count (format "%s/%s"
-                               (get-text-property (point) 'image-number)
+                               (1+ (/ (point) 2)) ;; Why this magical formula?
                                image-dired--number-of-thumbnails))
           (props (string-join (get-text-property (point) 'tags) ", "))
           (comment (get-text-property (point) 'comment))
@@ -1127,10 +1125,12 @@ image-dired-delete-char
   "Remove current thumbnail from thumbnail buffer and line up."
   (interactive nil image-dired-thumbnail-mode)
   (let ((inhibit-read-only t))
-    (delete-char 1))
+    (delete-char 1)
+    (cl-decf image-dired--number-of-thumbnails))
   (let ((pos (point)))
     (image-dired--line-up-with-method)
-    (goto-char pos)))
+    (goto-char pos)
+    (image-dired--update-header-line)))
 
 (defun image-dired-line-up ()
   "Line up thumbnails according to `image-dired-thumbs-per-row'.
-- 
2.39.1


[-- Attachment #3: Type: text/plain, Size: 18 bytes --]

-- 
Manuel Giraud

bug#61734: 30.0.50; [PATCH] Defaults to zero for image-dired--number-of-thumbnails

[Manuel Giraud via Bug reports for GNU Emacs, the Swiss army knife of text editors]

Hi Eli,

Did you have a look at this patch?  I think that at least the first
version should go into 29.  Thanks.
-- 
Manuel Giraud

bug#61734: 30.0.50; [PATCH] Defaults to zero for image-dired--number-of-thumbnails

[Eli Zaretskii]

> From: Manuel Giraud <manuel@ledu-giraud.fr>
> Date: Mon, 27 Feb 2023 14:20:24 +0100
> 
> Hi Eli,
> 
> Did you have a look at this patch?  I think that at least the first
> version should go into 29.  Thanks.

I only ever keep the last version, and it's certainly not for
emacs-29.

What do you want to install on emacs-29, and what problem(s) is that
supposed to fix?

bug#61734: 30.0.50; [PATCH] Defaults to zero for image-dired--number-of-thumbnails

[Manuel Giraud via Bug reports for GNU Emacs, the Swiss army knife of text editors]

[-- Attachment #1: Type: text/plain, Size: 164 bytes --]

Eli Zaretskii <eliz@gnu.org> writes:

[...]

> I only ever keep the last version, and it's certainly not for
> emacs-29.

Ok, sorry.  So here is the first version.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Defaults-to-zero-for-image-dired-number-of-thumbnail.patch --]
[-- Type: text/x-patch, Size: 920 bytes --]

>From c88f74aaa381580c183a8692bc467bfef7cd192b Mon Sep 17 00:00:00 2001
From: Manuel Giraud <manuel@ledu-giraud.fr>
Date: Thu, 23 Feb 2023 16:42:48 +0100
Subject: [PATCH] Defaults to zero for image-dired--number-of-thumbnails

* lisp/image/image-dired.el (image-dired--number-of-thumbnails):
Defaults to zero to avoid wrong type error down the line.
---
 lisp/image/image-dired.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/image/image-dired.el b/lisp/image/image-dired.el
index 8e2a75a418f..6ecb307ce12 100644
--- a/lisp/image/image-dired.el
+++ b/lisp/image/image-dired.el
@@ -546,7 +546,7 @@ image-dired--line-up-with-method
         (t
          (image-dired-line-up-dynamic))))
 
-(defvar-local image-dired--number-of-thumbnails nil)
+(defvar-local image-dired--number-of-thumbnails 0)
 
 ;;;###autoload
 (defun image-dired-display-thumbs (&optional arg append do-not-pop)
-- 
2.39.1


[-- Attachment #3: Type: text/plain, Size: 451 bytes --]


> What do you want to install on emacs-29, and what problem(s) is that
> supposed to fix?

This fixes a "wrong type error" when comparing
image-dired--number-of-thumbnails to zero.  Here is a recipe to make it
happen:

    - Do not have an existing *image-dired* buffer
    - Hit 'C-t a' (image-dired-display-thumbs-append) on an image file
      from Dired

And you're right that the rest of the patch should not go into emacs-29.
-- 
Manuel Giraud

bug#61734: 30.0.50; [PATCH] Defaults to zero for image-dired--number-of-thumbnails

[Eli Zaretskii]

> From: Manuel Giraud <manuel@ledu-giraud.fr>
> Cc: 61734@debbugs.gnu.org
> Date: Mon, 27 Feb 2023 17:20:10 +0100
> 
> > I only ever keep the last version, and it's certainly not for
> > emacs-29.
> 
> Ok, sorry.  So here is the first version.

Thanks, installed on the emacs-29 branch.

bug#61734: 30.0.50; [PATCH] Defaults to zero for image-dired--number-of-thumbnails

[Manuel Giraud via Bug reports for GNU Emacs, the Swiss army knife of text editors]

Eli Zaretskii <eliz@gnu.org> writes:

[...]

> Thanks, installed on the emacs-29 branch.

Thanks.  You can close this bug report if you want and I'll make another
one for the other part of the patch (for main branch).
-- 
Manuel Giraud

bug#61734: 30.0.50; [PATCH] Defaults to zero for image-dired--number-of-thumbnails

[Eli Zaretskii]

> From: Manuel Giraud <manuel@ledu-giraud.fr>
> Cc: 61734@debbugs.gnu.org
> Date: Tue, 28 Feb 2023 14:31:18 +0100
> 
> Eli Zaretskii <eliz@gnu.org> writes:
> 
> > Thanks, installed on the emacs-29 branch.
> 
> Thanks.  You can close this bug report if you want and I'll make another
> one for the other part of the patch (for main branch).

Done.