From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 19 Oct 2024 06:40:53 +0000 (+0300)
Subject: Fix skeleton-related errors in sgml-mode.el
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3a5beb24ca2e2157bbd43ca767636d4f5284ba46;p=emacs.git

Fix skeleton-related errors in sgml-mode.el

* lisp/textmodes/sgml-mode.el (sgml-mode-facemenu-add-face-function)
(sgml-attributes): Require 'skeleton before using its symbols.
(Bug#53710)

(cherry picked from commit b730c4acfcff20047a5c574fbf36c5ef1271b902)
---

diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index f126df8955a..ee585896946 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -533,6 +533,7 @@ an optional alist of possible values."
   "Add \"face\" tags with `facemenu-keymap' commands."
   (let ((tag-face (ensure-list (cdr (assq face sgml-face-tag-alist)))))
     (cond (tag-face
+           (require 'skeleton)
 	   (setq tag-face (funcall skeleton-transformation-function tag-face))
            (setq facemenu-end-add-face
                  (mapconcat (lambda (f) (concat "</" f ">")) (reverse tag-face)))
@@ -851,6 +852,7 @@ If QUIET, do not print a message when there are no attributes for TAG."
             (setq alist (cons '("class") alist)))
           (unless (assoc-string "id" alist)
             (setq alist (cons '("id") alist))))
+        (require 'skeleton)
 	(if (stringp (car alist))
 	    (progn
 	      (insert (if (eq (preceding-char) ?\s) "" ?\s)