Require skeleton when compiling.

(sgml-font-lock-keywords-1): Accept single-letter tags.
(v2): Defvar free variable.

diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index 895e1ca6ca7f1e0f256aef33d5641a20a22dfeef..c3c63089bc89446a207600c6a28b04cbcde54feb 100644 (file)
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -32,6 +32,8 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'skeleton))
+
 (defgroup sgml nil
   "SGML editing mode"
   :group 'languages)
@@ -207,9 +209,9 @@ Any terminating `>' or `/' is not matched.")
 
 ;; internal
 (defconst sgml-font-lock-keywords-1
-  '(("<\\([!?][a-z][-.a-z0-9]+\\)" 1 font-lock-keyword-face)
-    ("<\\(/?[a-z][-.a-z0-9]+\\)" 1 font-lock-function-name-face)
-    ("[&%][a-z][-.a-z0-9]+;?" . font-lock-variable-name-face)
+  '(("<\\([!?][a-z][-.a-z0-9]*\\)" 1 font-lock-keyword-face)
+    ("<\\(/?[a-z][-.a-z0-9]*\\)" 1 font-lock-function-name-face)
+    ("[&%][a-z][-.a-z0-9]*;?" . font-lock-variable-name-face)
     ("<! *--.*-- *>" . font-lock-comment-face)))
 
 (defconst sgml-font-lock-keywords-2 ())
@@ -276,6 +278,8 @@ an optional alist of possible values."
                       (string :tag "Description")))
   :group 'sgml)
 
+(defvar v2)                            ; free for skeleton
+
 (defun sgml-mode-common (sgml-tag-face-alist sgml-display-text)
   "Common code for setting up `sgml-mode' and derived modes.
 SGML-TAG-FACE-ALIST is used for calculating `sgml-font-lock-keywords-2'.