From 90ede4c02a102810b8ff3c2b50548a7a618c2a93 Mon Sep 17 00:00:00 2001 From: "F. Jason Park" Date: Tue, 11 Mar 2025 10:41:18 -0700 Subject: [PATCH] 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) --- lisp/erc/erc-compat.el | 9 +++++++++ lisp/erc/erc-desktop-notifications.el | 7 +++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/lisp/erc/erc-compat.el b/lisp/erc/erc-compat.el index 7d5c87c4a58..4a8029d68ac 100644 --- 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 a8bde92686c..6ef2f0d8ea1 100644 --- 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) -- 2.39.5