(sgml-mode-facemenu-add-face-function): New function.

(sgml-mode-common): Use that function for the hook value.

1 files changed, 10 insertions, 7 deletions

diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index a05d079ed5..6d52f835ca 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -333,13 +333,7 @@ varables of same name)."
 			      sgml-font-lock-keywords-1)
 			     nil
 			     t)
-	facemenu-add-face-function
-	  (lambda (face end)
-	    (if (setq face (cdr (assq face sgml-face-tag-alist)))
-		(progn
-		  (setq facemenu-end-add-face (concat "</" face ">"))
-		  (concat "<" face ">"))
-	      (error "Face not configured for %s mode." mode-name))))
+	facemenu-add-face-function 'sgml-mode-facemenu-add-face-function)
   (while sgml-display-text
     (put (car (car sgml-display-text)) 'before-string
 	 (cdr (car sgml-display-text)))
@@ -347,6 +341,15 @@ varables of same name)."
   (run-hooks 'text-mode-hook 'sgml-mode-hook))
 
 
+(defun sgml-mode-facemenu-add-face-function (face end)
+  (if (setq face (cdr (assq face sgml-face-tag-alist)))
+      (progn
+	(setq face (funcall skeleton-transformation face))
+	(setq facemenu-end-add-face (concat "</" face ">"))
+	(concat "<" face ">"))
+    (error "Face not configured for %s mode." mode-name)))
+
+
 ;;;###autoload
 (defun sgml-mode (&optional function)
   "Major mode for editing SGML documents.