master 3993dcca823 1/7: Merge from origin/emacs-30

[Eli Zaretskii]

branch: master
commit 3993dcca823753237800dee598386ca6c14746a9
Merge: 69191aeefdb f65de1019dc
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Merge from origin/emacs-30
    
    f65de1019dc Fix the version of librsvg API change
    43c4a06ffcc ; Fix grammar in Emacs user manual
    6bca138d60e Fix latest test for dabbrev-expand
---
 doc/emacs/trouble.texi     |  2 +-
 src/image.c                | 10 +++++-----
 test/lisp/dabbrev-tests.el | 20 ++++++--------------
 3 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi
index 2e2ee2dc961..f867943a8a0 100644
--- a/doc/emacs/trouble.texi
+++ b/doc/emacs/trouble.texi
@@ -1255,7 +1255,7 @@ Send them @emph{individually}.
 
 If you make two changes for separate reasons, then we might not want
 to install them both.  We might want to install just one, or install
-each one in a different versions of Emacs.  If you send them all
+them separately in different versions of Emacs.  If you send them all
 jumbled together in a single set of diffs, we have to do extra work to
 disentangle them---to figure out which parts of the change serve which
 purpose.  If we don't have time for this, we might have to postpone
diff --git a/src/image.c b/src/image.c
index 43220758324..0012abcb451 100644
--- a/src/image.c
+++ b/src/image.c
@@ -11688,7 +11688,7 @@ DEF_DLL_FN (void, rsvg_handle_get_dimensions,
 DEF_DLL_FN (gboolean, rsvg_handle_set_stylesheet,
            (RsvgHandle *, const guint8 *, gsize, GError **));
 #  endif
-#  if LIBRSVG_CHECK_VERSION (2, 58, 0)
+#  if LIBRSVG_CHECK_VERSION (2, 59, 0)
 DEF_DLL_FN (GdkPixbuf *, rsvg_handle_get_pixbuf_and_error, (RsvgHandle *, 
GError **));
 #  else
 DEF_DLL_FN (GdkPixbuf *, rsvg_handle_get_pixbuf, (RsvgHandle *));
@@ -11751,7 +11751,7 @@ init_svg_functions (void)
 #if LIBRSVG_CHECK_VERSION (2, 48, 0)
   LOAD_DLL_FN (library, rsvg_handle_set_stylesheet);
 #endif
-#if LIBRSVG_CHECK_VERSION (2, 58, 0)
+#if LIBRSVG_CHECK_VERSION (2, 59, 0)
   LOAD_DLL_FN (library, rsvg_handle_get_pixbuf_and_error);
 #else
   LOAD_DLL_FN (library, rsvg_handle_get_pixbuf);
@@ -11800,7 +11800,7 @@ init_svg_functions (void)
 #  if LIBRSVG_CHECK_VERSION (2, 48, 0)
 #   undef rsvg_handle_set_stylesheet
 #  endif
-#  if LIBRSVG_CHECK_VERSION (2, 58, 0)
+#  if LIBRSVG_CHECK_VERSION (2, 59, 0)
 #   undef rsvg_handle_get_pixbuf_and_error
 #  else
 #   undef rsvg_handle_get_pixbuf
@@ -11845,7 +11845,7 @@ init_svg_functions (void)
 #  if LIBRSVG_CHECK_VERSION (2, 48, 0)
 #   define rsvg_handle_set_stylesheet fn_rsvg_handle_set_stylesheet
 #  endif
-#  if LIBRSVG_CHECK_VERSION (2, 58, 0)
+#  if LIBRSVG_CHECK_VERSION (2, 59, 0)
 #   define rsvg_handle_get_pixbuf_and_error fn_rsvg_handle_get_pixbuf_and_error
 #  else
 #   define rsvg_handle_get_pixbuf fn_rsvg_handle_get_pixbuf
@@ -12354,7 +12354,7 @@ svg_load_image (struct frame *f, struct image *img, 
char *contents,
 
   /* We can now get a valid pixel buffer from the svg file, if all
      went ok.  */
-#if LIBRSVG_CHECK_VERSION (2, 58, 0)
+#if LIBRSVG_CHECK_VERSION (2, 59, 0)
   pixbuf = rsvg_handle_get_pixbuf_and_error (rsvg_handle, &err);
   if (err) goto rsvg_error;
 #else
diff --git a/test/lisp/dabbrev-tests.el b/test/lisp/dabbrev-tests.el
index b5737373875..3e84024698f 100644
--- a/test/lisp/dabbrev-tests.el
+++ b/test/lisp/dabbrev-tests.el
@@ -278,12 +278,8 @@ minibuffer was entered, the replacement should found in 
another buffer."
 (ert-deftest dabbrev-expand-after-killing-buffer ()
   "Test expansion after killing buffer containing first expansion.
 Finding successive expansions in another live buffer should succeed, but
-after killing the buffer, expansion should fail with a user-error."
-  ;; FIXME?  The message shown by the user-error is in *Messages* but
-  ;; since the test finishes on hitting the user-error, we cannot test
-  ;; further, either for the content of the message or the content of
-  ;; the current buffer, so apparently cannot reproduce what a user
-  ;; entering these commands manually sees.
+after killing the buffer, expansion should fail with a user-error,
+leaving the unexpanded string in the buffer." ; See bug#74090.
   (with-dabbrev-test
    (with-current-buffer (get-buffer-create "foo")
      (insert "abc abd"))
@@ -298,13 +294,9 @@ after killing the buffer, expansion should fail with a 
user-error."
    (should (string= (buffer-string) "abc abd"))
    (kill-buffer "foo")
    (erase-buffer)
-   (should-error (execute-kbd-macro (kbd "abc SPC ab M-/ M-/"))
-                 :type 'user-error)
-   ;; (should (string= (buffer-string) "abc abc"))
-   ;; (with-current-buffer "*Messages*"
-   ;;   (goto-char (point-max))
-   ;;   (should (string= (buffer-substring (pos-bol) (pos-eol))
-   ;;                    "No further dynamic expansion for ‘ab’ found")))
-   ))
+   (let ((msg (cadr (should-error (execute-kbd-macro (kbd "abc SPC ab M-/ 
M-/"))
+                                  :type 'user-error))))
+     (should (string= (buffer-string) "abc ab"))
+     (should (string= msg "No further dynamic expansion for ‘ab’ found")))))
 
 ;;; dabbrev-tests.el ends here