bug#67764: 30.0.50; Opening image in eww no longer works

bug#67764: 30.0.50; Opening image in eww no longer works

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

In Emacs 29.1 the image opens as expected:

  emacs -Q
  M-: (eww "https://www.gnu.org/software/emacs/images/emacs.png")

On master it fails with "Wrong type argument: stringp, nil".
Bisect says 4254544 is the first bad commit.


In GNU Emacs 30.0.50 (build 3, x86_64-pc-linux-gnu, GTK+ Version
 3.24.38, cairo version 1.18.0) of 2023-12-11 built on localhost
Repository revision: cd702556759b33662cd6536c89ef02ddcd93d4ff
Repository branch: master
Windowing system distributor 'The X.Org Foundation', version 11.0.12302002
System Description: Fedora Linux 39 (Thirty Nine)

Configured using:
 'configure --with-native-compilation=no'

Configured features:
ACL CAIRO DBUS FREETYPE GIF GLIB GMP GNUTLS GPM GSETTINGS
HARFBUZZ JPEG JSON LIBOTF LIBSELINUX LIBSYSTEMD LIBXML2 M17N_FLT
MODULES NOTIFY INOTIFY PDUMPER PNG RSVG SECCOMP SOUND SQLITE3
THREADS TIFF TOOLKIT_SCROLL_BARS TREE_SITTER WEBP X11 XDBE XIM
XINPUT2 XPM GTK3 ZLIB

bug#67764: 30.0.50; Opening image in eww no longer works

[Visuwesh]

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

[Monday December 11, 2023] john muhl via "Bug reports for GNU Emacs, the Swiss army knife of text editors" wrote:

> In Emacs 29.1 the image opens as expected:
>
>   emacs -Q
>   M-: (eww "https://www.gnu.org/software/emacs/images/emacs.png")
>
> On master it fails with "Wrong type argument: stringp, nil".
> Bisect says 4254544 is the first bad commit.

Recent changes in shr-put-image didn't account for the possible nil
value for ALT.  Attached patch fixes the issue on my end.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Fix-shr-put-image-with-nil-value-for-ALT.patch --]
[-- Type: text/x-diff, Size: 885 bytes --]

From f6d3fc0de572a1039e83df0389c1c7efce0ef0cf Mon Sep 17 00:00:00 2001
From: Visuwesh <visuweshm@gmail.com>
Date: Mon, 11 Dec 2023 17:09:03 +0530
Subject: [PATCH] ; Fix shr-put-image with nil value for ALT

* lisp/net/shr.el (shr-put-image): Account for nil value for ALT.
(Bug#6774)
---
 lisp/net/shr.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 9f030b4c743..19c52ac8802 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -1137,7 +1137,7 @@ shr-put-image
         (when image
           ;; The trailing space can confuse shr-insert into not
           ;; putting any space after inline images.
-	  (setq alt (string-trim alt))
+	  (setq alt (string-trim (or alt "*")))
 	  ;; When inserting big-ish pictures, put them at the
 	  ;; beginning of the line.
 	  (let ((inline (shr--inline-image-p image)))
-- 
2.42.0

bug#67764: 30.0.50; Opening image in eww no longer works

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

Visuwesh <visuweshm@gmail.com> writes:

> [Monday December 11, 2023] john muhl via "Bug reports for GNU Emacs,
> the Swiss army knife of text editors" wrote:
>
>> In Emacs 29.1 the image opens as expected:
>>
>>   emacs -Q
>>   M-: (eww "https://www.gnu.org/software/emacs/images/emacs.png")
>>
>> On master it fails with "Wrong type argument: stringp, nil".
>> Bisect says 4254544 is the first bad commit.
>
> Recent changes in shr-put-image didn't account for the possible nil
> value for ALT.  Attached patch fixes the issue on my end.

Thanks. That fixes it here too.

bug#67764: 30.0.50; Opening image in eww no longer works

[Eli Zaretskii]

> Cc: 67764@debbugs.gnu.org
> From: Visuwesh <visuweshm@gmail.com>
> Date: Mon, 11 Dec 2023 17:10:01 +0530
> 
> >   emacs -Q
> >   M-: (eww "https://www.gnu.org/software/emacs/images/emacs.png")
> >
> > On master it fails with "Wrong type argument: stringp, nil".
> > Bisect says 4254544 is the first bad commit.
> 
> Recent changes in shr-put-image didn't account for the possible nil
> value for ALT.  Attached patch fixes the issue on my end.
> 
> 
> >From f6d3fc0de572a1039e83df0389c1c7efce0ef0cf Mon Sep 17 00:00:00 2001
> From: Visuwesh <visuweshm@gmail.com>
> Date: Mon, 11 Dec 2023 17:09:03 +0530
> Subject: [PATCH] ; Fix shr-put-image with nil value for ALT
> 
> * lisp/net/shr.el (shr-put-image): Account for nil value for ALT.
> (Bug#6774)
> ---
>  lisp/net/shr.el | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/lisp/net/shr.el b/lisp/net/shr.el
> index 9f030b4c743..19c52ac8802 100644
> --- a/lisp/net/shr.el
> +++ b/lisp/net/shr.el
> @@ -1137,7 +1137,7 @@ shr-put-image
>          (when image
>            ;; The trailing space can confuse shr-insert into not
>            ;; putting any space after inline images.
> -	  (setq alt (string-trim alt))
> +	  (setq alt (string-trim (or alt "*")))
>  	  ;; When inserting big-ish pictures, put them at the
>  	  ;; beginning of the line.
>  	  (let ((inline (shr--inline-image-p image)))

Thanks, but can we please avoid running a fixed string through
string-trim?

Also, I think the fallback on "*" deserves a comment to explain why
that is done.

bug#67764: 30.0.50; Opening image in eww no longer works

[Visuwesh]

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

[Monday December 11, 2023] Eli Zaretskii wrote:

>> Cc: 67764@debbugs.gnu.org
>> From: Visuwesh <visuweshm@gmail.com>
>> Date: Mon, 11 Dec 2023 17:10:01 +0530
>> 
>> >   emacs -Q
>> >   M-: (eww "https://www.gnu.org/software/emacs/images/emacs.png")
>> >
>> > On master it fails with "Wrong type argument: stringp, nil".
>> > Bisect says 4254544 is the first bad commit.
>> 
>> Recent changes in shr-put-image didn't account for the possible nil
>> value for ALT.  Attached patch fixes the issue on my end.
>> 
>> 
>> >From f6d3fc0de572a1039e83df0389c1c7efce0ef0cf Mon Sep 17 00:00:00 2001
>> From: Visuwesh <visuweshm@gmail.com>
>> Date: Mon, 11 Dec 2023 17:09:03 +0530
>> Subject: [PATCH] ; Fix shr-put-image with nil value for ALT
>> 
>> [...]
>>
> Thanks, but can we please avoid running a fixed string through
> string-trim?
>
> Also, I think the fallback on "*" deserves a comment to explain why
> that is done.

OK, how about the attached instead?


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Fix-shr-put-image-with-nil-value-for-ALT.patch --]
[-- Type: text/x-diff, Size: 977 bytes --]

From 27cd2c4c028723009ebf19696825d22c15f59795 Mon Sep 17 00:00:00 2001
From: Visuwesh <visuweshm@gmail.com>
Date: Mon, 11 Dec 2023 17:09:03 +0530
Subject: [PATCH] Fix shr-put-image with nil value for ALT

* lisp/net/shr.el (shr-put-image): Account for nil value for ALT.
(Bug#6774)
---
 lisp/net/shr.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 9f030b4c743..bf5038a421d 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -1137,7 +1137,9 @@ shr-put-image
         (when image
           ;; The trailing space can confuse shr-insert into not
           ;; putting any space after inline images.
-	  (setq alt (string-trim alt))
+          ;; ALT may be nil when visiting image URLs in eww
+          ;; (bug#6774).
+	  (setq alt (if alt (string-trim alt) "*"))
 	  ;; When inserting big-ish pictures, put them at the
 	  ;; beginning of the line.
 	  (let ((inline (shr--inline-image-p image)))
-- 
2.42.0

bug#67764: 30.0.50; Opening image in eww no longer works

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

Visuwesh <visuweshm@gmail.com> writes:

[...]

> diff --git a/lisp/net/shr.el b/lisp/net/shr.el
> index 9f030b4c743..bf5038a421d 100644
> --- a/lisp/net/shr.el
> +++ b/lisp/net/shr.el
> @@ -1137,7 +1137,9 @@ shr-put-image
>          (when image
>            ;; The trailing space can confuse shr-insert into not
>            ;; putting any space after inline images.
> -	  (setq alt (string-trim alt))
> +          ;; ALT may be nil when visiting image URLs in eww
> +          ;; (bug#6774).

There is a 6 missing in the bug reference ;-)
-- 
Manuel Giraud

bug#67764: 30.0.50; Opening image in eww no longer works

[Visuwesh]

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

[Tuesday December 12, 2023] Manuel Giraud wrote:

> Visuwesh <visuweshm@gmail.com> writes:
>
> [...]
>
>> diff --git a/lisp/net/shr.el b/lisp/net/shr.el
>> index 9f030b4c743..bf5038a421d 100644
>> --- a/lisp/net/shr.el
>> +++ b/lisp/net/shr.el
>> @@ -1137,7 +1137,9 @@ shr-put-image
>>          (when image
>>            ;; The trailing space can confuse shr-insert into not
>>            ;; putting any space after inline images.
>> -	  (setq alt (string-trim alt))
>> +          ;; ALT may be nil when visiting image URLs in eww
>> +          ;; (bug#6774).
>
> There is a 6 missing in the bug reference ;-)

...and in the commit log.  I don't know how I managed to mess it up.
Thanks for catching the mistake.  Revised patch attached.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Fix-shr-put-image-with-nil-value-for-ALT.patch --]
[-- Type: text/x-diff, Size: 979 bytes --]

From 4327fb4eae80b217437fbabae6c2ef7c6ac940a3 Mon Sep 17 00:00:00 2001
From: Visuwesh <visuweshm@gmail.com>
Date: Mon, 11 Dec 2023 17:09:03 +0530
Subject: [PATCH] Fix shr-put-image with nil value for ALT

* lisp/net/shr.el (shr-put-image): Account for nil value for ALT.
(Bug#67764)
---
 lisp/net/shr.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 9f030b4c743..d6ea5213337 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -1137,7 +1137,9 @@ shr-put-image
         (when image
           ;; The trailing space can confuse shr-insert into not
           ;; putting any space after inline images.
-	  (setq alt (string-trim alt))
+          ;; ALT may be nil when visiting image URLs in eww
+          ;; (bug#67764).
+	  (setq alt (if alt (string-trim alt) "*"))
 	  ;; When inserting big-ish pictures, put them at the
 	  ;; beginning of the line.
 	  (let ((inline (shr--inline-image-p image)))
-- 
2.42.0

bug#67764: 30.0.50; Opening image in eww no longer works

[Eli Zaretskii]

> From: Visuwesh <visuweshm@gmail.com>
> Cc: Eli Zaretskii <eliz@gnu.org>,  67764@debbugs.gnu.org,  jm@pub.pink
> Date: Tue, 12 Dec 2023 14:44:12 +0530
> 
> > Visuwesh <visuweshm@gmail.com> writes:
> >
> > [...]
> >
> >> diff --git a/lisp/net/shr.el b/lisp/net/shr.el
> >> index 9f030b4c743..bf5038a421d 100644
> >> --- a/lisp/net/shr.el
> >> +++ b/lisp/net/shr.el
> >> @@ -1137,7 +1137,9 @@ shr-put-image
> >>          (when image
> >>            ;; The trailing space can confuse shr-insert into not
> >>            ;; putting any space after inline images.
> >> -	  (setq alt (string-trim alt))
> >> +          ;; ALT may be nil when visiting image URLs in eww
> >> +          ;; (bug#6774).
> >
> > There is a 6 missing in the bug reference ;-)
> 
> ...and in the commit log.  I don't know how I managed to mess it up.
> Thanks for catching the mistake.  Revised patch attached.

Thanks, installed on the master branch, and closing the bug.