2 files changed, 9 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b6f0a0f57bf..9e793bacc5c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2008-01-09  Eric S. Raymond  <esr@snark.thyrsus.com>
+
+        * testmodes/sgml-mode.el (sgml-tag-syntax-table):  Initialize this
+        constant with a computation on sgml-specials rather than a literal
+        list.  Without this change the syntax table is generated
+        incorrectly, and the mode will think it's in a comment following
+        any instance of the string "--".
+
 2008-01-09  Tassilo Horn  <tassilo@member.fsf.org>
 
         * doc-view.el (doc-view-mode-p): Add EPS as supported type.
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index 0c361463022..e8975252b15 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -159,7 +159,7 @@ This takes effect when first loading the `sgml-mode' library.")
   "Syntax table used in SGML mode.  See also `sgml-specials'.")
 
 (defconst sgml-tag-syntax-table
-  (let ((table (sgml-make-syntax-table '(?- ?\" ?\'))))
+  (let ((table (sgml-make-syntax-table sgml-specials)))
     (dolist (char '(?\( ?\) ?\{ ?\} ?\[ ?\] ?$ ?% ?& ?* ?+ ?/))
       (modify-syntax-entry char "." table))
     table)