Add erc-compat adapter for xml-escape-string

* lisp/erc/erc-compat.el (erc-compat--xml-escape-string): New macro to
call `xml-escape-string' sans the NO-ERROR argument on Emacs 27.
* lisp/erc/erc-desktop-notifications.el (erc-notifications-notify): Use
compat macro.

(cherry picked from commit dd1b11d34cd1389fe5ee0dd80784f9cd0d66026d)

diff --git a/lisp/erc/erc-compat.el b/lisp/erc/erc-compat.el
index 7d5c87c4a5888a9feaa78d7bb6329898d1e5f3c1..4a8029d68ace08a0e06491e285a055ed7db63b8f 100644 (file)
--- a/lisp/erc/erc-compat.el
+++ b/lisp/erc/erc-compat.el
@@ -369,6 +369,15 @@ If START or END is negative, it counts from the end."
     client-final-message))
 
 
+;;;; Misc 28.1
+
+(defmacro erc-compat--xml-escape-string (string &optional noerror)
+  "Call `xml-escape-string' with NO-ERROR if supported."
+  (if (>= emacs-major-version 28)
+      `(xml-escape-string ,string ,noerror)
+    `(xml-escape-string ,string)))
+
+
 ;;;; Misc 29.1
 
 (defvar url-irc-function)

diff --git a/lisp/erc/erc-desktop-notifications.el b/lisp/erc/erc-desktop-notifications.el
index a8bde92686cc62fc9b3eafd531b8cd792ac0dd92..6ef2f0d8ea1de656c5c44ede258ef58d2bdd10e3 100644 (file)
--- a/lisp/erc/erc-desktop-notifications.el
+++ b/lisp/erc/erc-desktop-notifications.el
@@ -65,8 +65,11 @@ This will replace the last notification sent with this function."
   (dbus-ignore-errors
     (setq erc-notifications-last-notification
           (let* ((channel (if privp (erc-get-buffer nick) (current-buffer)))
-                 (title (format "%s in %s" (xml-escape-string nick t) channel))
-                 (body (xml-escape-string (erc-controls-strip msg) t)))
+                 (title (format "%s in %s"
+                                (erc-compat--xml-escape-string nick t)
+                                channel))
+                 (body (erc-compat--xml-escape-string (erc-controls-strip msg)
+                                                      t)))
             (funcall (cond ((featurep 'android)
                             #'android-notifications-notify)
                            ((featurep 'haiku)