bug#58002: 29.1: Sokoban: obsoletion warnings in gamegrid

bug#58002: 29.1: Sokoban: obsoletion warnings in gamegrid

[Mattias Engdegård]

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

On Emacs master, starting Sokoban (from GNU ELPA) results in several warnings:

> Warning (gamegrid): Using obsolete XEmacs style "glyph"; convert to an Emacs image-spec instead

which apparently is from

> (defvar sokoban-target-options
>   `(((glyph
>       [xpm :data ,sokoban-target-xpm])
[...]

where (after some digging) it seems that the vector needs to be

      ((:type xpm :data ,sokoban-target-xpm :ascent center)))

somewhat non-intuitively, because of the slightly alarming line

> 	   (find-image data)) ;untested!

in gamegrid.el. Suggested patch attached.
Is this all correct and as desired? Does it break anything when using old Emacs versions?


[-- Attachment #2: sokoban-warning.diff --]
[-- Type: application/octet-stream, Size: 2120 bytes --]

diff --git a/sokoban.el b/sokoban.el
index 128d59ad98..710139b09f 100644
--- a/sokoban.el
+++ b/sokoban.el
@@ -403,7 +403,7 @@ static char * player_on_target_xpm[] = {
 
 (defvar sokoban-floor-options
   `(((glyph
-      [xpm :data ,sokoban-floor-xpm])
+      ((:type xpm :data ,sokoban-floor-xpm :ascent center)))
      (t ?\040))
     ((color-x color-x)
      (mono-x grid-x)
@@ -413,7 +413,7 @@ static char * player_on_target_xpm[] = {
 
 (defvar sokoban-target-options
   `(((glyph
-      [xpm :data ,sokoban-target-xpm])
+      ((:type xpm :data ,sokoban-target-xpm :ascent center)))
      ((mono-x mono-tty emacs-tty) ?\.)
      (t ?\040))
     ((color-x color-x)
@@ -424,7 +424,7 @@ static char * player_on_target_xpm[] = {
 
 (defvar sokoban-wall-options
   `(((glyph
-      [xpm :data ,sokoban-wall-xpm])
+      ((:type xpm :data ,sokoban-wall-xpm :ascent center)))
      (emacs-tty ?\X)
      (t ?\040))
     ((color-x color-x)
@@ -436,7 +436,7 @@ static char * player_on_target_xpm[] = {
 
 (defvar sokoban-block-options
   `(((glyph
-      [xpm :data ,sokoban-block-xpm])
+      ((:type xpm :data ,sokoban-block-xpm :ascent center)))
      ((mono-x mono-tty emacs-tty) ?\O)
      (t ?\040))
     ((color-x color-x)
@@ -447,7 +447,7 @@ static char * player_on_target_xpm[] = {
 
 (defvar sokoban-block-on-target-options
   `(((glyph
-      [xpm :data ,sokoban-block-on-target-xpm])
+      ((:type xpm :data ,sokoban-block-on-target-xpm :ascent center)))
      ((mono-x mono-tty emacs-tty) ?\O)
      (t ?\040))
     ((color-x color-x)
@@ -458,7 +458,7 @@ static char * player_on_target_xpm[] = {
 
 (defvar sokoban-player-options
   `(((glyph
-      [xpm :data ,sokoban-player-xpm])
+      ((:type xpm :data ,sokoban-player-xpm :ascent center)))
      (t ?\*))
     ((color-x color-x)
      (mono-x grid-x)
@@ -468,7 +468,7 @@ static char * player_on_target_xpm[] = {
 
 (defvar sokoban-player-on-target-options
   `(((glyph
-      [xpm :data ,sokoban-player-on-target-xpm])
+      ((:type xpm :data ,sokoban-player-on-target-xpm :ascent center)))
      (t ?\*))
     ((color-x color-x)
      (mono-x grid-x)

bug#58002: 29.1: Sokoban: obsoletion warnings in gamegrid

[Dieter Deyke]

Mattias Engdegård <mattias.engdegard@gmail.com> writes:

> On Emacs master, starting Sokoban (from GNU ELPA) results in several warnings:
>
>> Warning (gamegrid): Using obsolete XEmacs style "glyph"; convert to an Emacs image-spec instead
>
> which apparently is from
>
>> (defvar sokoban-target-options
>>   `(((glyph
>>       [xpm :data ,sokoban-target-xpm])
> [...]
>
> where (after some digging) it seems that the vector needs to be
>
>       ((:type xpm :data ,sokoban-target-xpm :ascent center)))
>
> somewhat non-intuitively, because of the slightly alarming line
>
>> 	   (find-image data)) ;untested!
>
> in gamegrid.el. Suggested patch attached.
> Is this all correct and as desired? Does it break anything when using old Emacs versions?

Thanks for your efforts, but that patch does not silence the warnings on
my system. It looks like more is needed, but I do not know how to fix
it.

-- 
Dieter Deyke
mailto:dieter.deyke@gmail.com
Get my Gnupg key:
gpg --keyserver keys.gnupg.net --recv-keys B116EA20

bug#58002: 29.1: Sokoban: obsoletion warnings in gamegrid

[Mattias Engdegård]

22 sep. 2022 kl. 14.29 skrev Dieter Deyke <dieter.deyke@gmail.com>:

> Thanks for your efforts, but that patch does not silence the warnings on
> my system. It looks like more is needed, but I do not know how to fix
> it.

That's odd. What warnings do you get with the patch applied?
And the usual IT support questions: Are you sure you are running the right file? Did you remember to recompile it?
Are you sure your computer is plugged in?

bug#58002: 29.1: Sokoban: obsoletion warnings in gamegrid

[Dieter Deyke]

Mattias Engdegård <mattias.engdegard@gmail.com> writes:

> 22 sep. 2022 kl. 14.29 skrev Dieter Deyke <dieter.deyke@gmail.com>:
>
>> Thanks for your efforts, but that patch does not silence the warnings on
>> my system. It looks like more is needed, but I do not know how to fix
>> it.
>
> That's odd. What warnings do you get with the patch applied?
> And the usual IT support questions: Are you sure you are running the
> right file? Did you remember to recompile it?
> Are you sure your computer is plugged in?

Obviously not.  I patched the file, loaded it into an emacs buffer, did
an eval-buffer on it, followed by M-x sokoban. That was not good
enough. So I deleted the .elc file, killed, and re-started emacs, and
now everything is fine, and I stand there as a fool (but I get used to
that).  I do not know, how your patch will affect older emacs versions,
but if I get no negative feedback, I will apply the patch to the repo in
a week.

Thanks again.
-- 
Dieter Deyke
mailto:dieter.deyke@gmail.com
Get my Gnupg key:
gpg --keyserver keys.gnupg.net --recv-keys B116EA20

bug#58002: 29.1: Sokoban: obsoletion warnings in gamegrid

[Stefan Kangas]

Dieter Deyke <dieter.deyke@gmail.com> writes:

> I do not know, how your patch will affect older emacs versions, but if
> I get no negative feedback, I will apply the patch to the repo in a
> week.

Thanks for the patch, Mattias.  I was meaning to look into this, but it
seems like you beat me to it.

I've done some minimal testing of the patch on Emacs 27.1 and current
master, and everything seems to work here.

bug#58002: 29.1: Sokoban: obsoletion warnings in gamegrid

[Mattias Engdegård]

22 sep. 2022 kl. 16.01 skrev Stefan Kangas <stefankangas@gmail.com>:

> I was meaning to look into this, but it
> seems like you beat me to it.

We must get our priorities right, it's Sokoban after all!

> I've done some minimal testing of the patch on Emacs 27.1 and current
> master, and everything seems to work here.

Thank you. Let's see how far back in Emacs history Dieter wants to test it.
Oh, and about the

> 	   (find-image data)) ;untested!

in gamegrid-make-glyph, well that path isn't untested any more -- but the Sokoban patch works backwards from that code so it isn't really a proper validation. Then again, the ;untested! line is 20 years old so...

bug#58002: 29.1: Sokoban: obsoletion warnings in gamegrid

[Stefan Kangas]

Dieter Deyke <dieter.deyke@gmail.com> writes:

> Mattias Engdegård <mattias.engdegard@gmail.com> writes:
>
>> 22 sep. 2022 kl. 14.29 skrev Dieter Deyke <dieter.deyke@gmail.com>:
>>
>>> Thanks for your efforts, but that patch does not silence the warnings on
>>> my system. It looks like more is needed, but I do not know how to fix
>>> it.
>>
>> That's odd. What warnings do you get with the patch applied?
>> And the usual IT support questions: Are you sure you are running the
>> right file? Did you remember to recompile it?
>> Are you sure your computer is plugged in?
>
> Obviously not.  I patched the file, loaded it into an emacs buffer, did
> an eval-buffer on it, followed by M-x sokoban. That was not good
> enough. So I deleted the .elc file, killed, and re-started emacs, and
> now everything is fine, and I stand there as a fool (but I get used to
> that).  I do not know, how your patch will affect older emacs versions,
> but if I get no negative feedback, I will apply the patch to the repo in
> a week.

Was this patch installed?  Can the bug be closed?  Thanks in advance.

bug#58002: 29.1: Sokoban: obsoletion warnings in gamegrid

[Dieter Deyke]

Stefan Kangas <stefankangas@gmail.com> writes:

> Dieter Deyke <dieter.deyke@gmail.com> writes:
>
>> Mattias Engdegård <mattias.engdegard@gmail.com> writes:
>>
>>> 22 sep. 2022 kl. 14.29 skrev Dieter Deyke <dieter.deyke@gmail.com>:
>>>
>>>> Thanks for your efforts, but that patch does not silence the warnings on
>>>> my system. It looks like more is needed, but I do not know how to fix
>>>> it.
>>>
>>> That's odd. What warnings do you get with the patch applied?
>>> And the usual IT support questions: Are you sure you are running the
>>> right file? Did you remember to recompile it?
>>> Are you sure your computer is plugged in?
>>
>> Obviously not.  I patched the file, loaded it into an emacs buffer, did
>> an eval-buffer on it, followed by M-x sokoban. That was not good
>> enough. So I deleted the .elc file, killed, and re-started emacs, and
>> now everything is fine, and I stand there as a fool (but I get used to
>> that).  I do not know, how your patch will affect older emacs versions,
>> but if I get no negative feedback, I will apply the patch to the repo in
>> a week.
>
> Was this patch installed?  Can the bug be closed?  Thanks in advance.

Yes, the patch was installed, the warnings are gone, everything is fine
now. Please close the bug.

Thank you,
-- 
Dieter Deyke
mailto:dieter.deyke@gmail.com
Get my Gnupg key:
gpg --keyserver keys.gnupg.net --recv-keys B116EA20

bug#58002: 29.1: Sokoban: obsoletion warnings in gamegrid

[Stefan Kangas]

Dieter Deyke <dieter.deyke@gmail.com> writes:

> Yes, the patch was installed, the warnings are gone, everything is fine
> now. Please close the bug.

Thanks, done.