commit e8cf271e64e69852da983da432423396b5b01b2b (HEAD, refs/remotes/origin/master)
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Thu Nov 7 09:35:56 2024 +0200

    ; * etc/symbol-releases.eld: Add 'read-number'.

diff --git a/etc/symbol-releases.eld b/etc/symbol-releases.eld
index b08f3e7ad73..bdf5858102e 100644
--- a/etc/symbol-releases.eld
+++ b/etc/symbol-releases.eld
@@ -22,6 +22,7 @@
  ("22.1" fun version=)
  ("22.1" fun version<)
  ("22.1" fun version<=)
+ ("22.1" fun read-number)
  ("19.7" fun defsubst)
  ("19.34" fun make-directory)
  ("18.59" fun mark)

commit 19ce31ecab8361ef8b44c8a1777d09cf9a902714
Author: Stefan Kangas <stefankangas@gmail.com>
Date:   Wed Nov 6 23:41:46 2024 +0100

    * etc/symbol-releases.eld: Add version=, version<, version<=.

diff --git a/etc/symbol-releases.eld b/etc/symbol-releases.eld
index 4931be2fb7d..b08f3e7ad73 100644
--- a/etc/symbol-releases.eld
+++ b/etc/symbol-releases.eld
@@ -19,6 +19,9 @@
 ;; https://github.com/larsbrinkhoff/emacs-history/tree/sources/decuslib.com/decus/vax85b/gnuemax
 
  ("24.4" fun set-transient-map)
+ ("22.1" fun version=)
+ ("22.1" fun version<)
+ ("22.1" fun version<=)
  ("19.7" fun defsubst)
  ("19.34" fun make-directory)
  ("18.59" fun mark)

commit b5845eb5ef54162da6f0735880b36315ca984852
Author: Ulf Jasper <ulf.jasper@web.de>
Date:   Wed Nov 6 14:17:15 2024 +0100

    * lisp/net/newst-plainview.el (newsticker--buffer-do-insert-text): Bug#74197
    
    Use "[logo: <feed name>]" instead of "<feed name>" for the string
    holding the logo image.

diff --git a/lisp/net/newst-plainview.el b/lisp/net/newst-plainview.el
index 0ff7985f0dc..1bc4bc84440 100644
--- a/lisp/net/newst-plainview.el
+++ b/lisp/net/newst-plainview.el
@@ -1279,7 +1279,7 @@ FEED-NAME-SYMBOL tells to which feed this item belongs."
                         (let ((img (newsticker--image-read feed-name-symbol
                                                            disabled)))
                           (when img
-                            (newsticker--insert-image img (car item)))))
+                            (newsticker--insert-image img (format "[logo: %s]" (car item))))))
                       (setq format (substring format 2)))
                      ((string= "%L" prefix)
                       ;; logo or title
@@ -1292,7 +1292,7 @@ FEED-NAME-SYMBOL tells to which feed this item belongs."
                         (let ((img (newsticker--image-read feed-name-symbol
                                                            disabled)))
                           (if img
-                              (newsticker--insert-image img (car item))
+                              (newsticker--insert-image img (format "[logo: %s]" (car item)))
                             (when (car item)
                               (setq pos-text-start (point-marker))
 			      (if (eq (newsticker--age item) 'feed)

commit 42fe3420e476045228a219579343f16da29256cf
Author: Mattias Engdegård <mattiase@acm.org>
Date:   Wed Nov 6 13:41:39 2024 +0100

    * lisp/term/w32-win.el (w32--textual-mime-types): Escape literal `+`

diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index 7579608ac22..911bd72184d 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -469,10 +469,10 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
     "application/yaml"
     "application/json-seq"
     "\\`text/"
-    "+xml\\'"
-    "+json\\'"
-    "+yaml\\'"
-    "+json-seq\\'"))
+    "\\+xml\\'"
+    "\\+json\\'"
+    "\\+yaml\\'"
+    "\\+json-seq\\'"))
 
 (defun w32--mime-type-textual-p (mime-type)
   "Returns t if MIME-TYPE, a symbol, names a textual MIME type.

commit 9ee9154247454c18f9f75d0d32592b817d7e977a
Author: Mattias Engdegård <mattiase@acm.org>
Date:   Wed Nov 6 13:29:23 2024 +0100

    Fix wrong value of `when` and `unless` with empty body (bug#74215)
    
    Reported by Brennan Vincent.
    
    * lisp/subr.el (when, unless): Return nil when the body is empty.
    * test/lisp/subr-tests.el (subr-test-when): Add test cases.

diff --git a/lisp/subr.el b/lisp/subr.el
index e630087b68f..b56512aac05 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -299,7 +299,7 @@ value of last one, or nil if there are none."
   (if body
       (list 'if cond (cons 'progn body))
     (macroexp-warn-and-return (format-message "`when' with empty body")
-                              cond '(empty-body when) t)))
+                              (list 'progn cond nil) '(empty-body when) t)))
 
 (defmacro unless (cond &rest body)
   "If COND yields nil, do BODY, else return nil.
@@ -309,7 +309,7 @@ value of last one, or nil if there are none."
   (if body
       (cons 'if (cons cond (cons nil body)))
     (macroexp-warn-and-return (format-message "`unless' with empty body")
-                              cond '(empty-body unless) t)))
+                              (list 'progn cond nil) '(empty-body unless) t)))
 
 (defsubst subr-primitive-p (object)
   "Return t if OBJECT is a built-in primitive written in C.
diff --git a/test/lisp/subr-tests.el b/test/lisp/subr-tests.el
index 6f28e057342..e12e3c62e0c 100644
--- a/test/lisp/subr-tests.el
+++ b/test/lisp/subr-tests.el
@@ -454,7 +454,11 @@
                    x)))
     (should (= x 2)))
   (should (equal (macroexpand-all '(when a b c d))
-                 '(if a (progn b c d)))))
+                 '(if a (progn b c d))))
+  (with-suppressed-warnings ((empty-body when unless))
+    (should (equal (when t) nil))
+    (should (equal (unless t) nil))
+    (should (equal (unless nil) nil))))
 
 (ert-deftest subr-test-xor ()
   "Test `xor'."