--- a/lisp/psgml/psgml-html.el	Mon Aug 13 08:48:43 2007 +0200
+++ b/lisp/psgml/psgml-html.el	Mon Aug 13 08:49:20 2007 +0200
@@ -17,8 +17,9 @@
 ;; General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING.  If not, write to the Free
-;; Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with XEmacs; see the file COPYING.  If not, write to the 
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
 
 ;;; Synched up with: FSF 19.30.
 
@@ -30,9 +31,13 @@
 
 ;;; Code:
 
+(defvar html-auto-sgml-entity-conversion nil
+  "*Control automatic sgml entity to ISO-8859-1 conversion")
+
 (require 'psgml)
 (require 'derived)
-(require 'iso-sgml)
+(when html-auto-sgml-entity-conversion
+  (require 'iso-sgml))
 (require 'tempo)			;essential part of html-helper-mode
 
 ;;{{{ user variables
@@ -198,6 +203,14 @@
 
   (set (make-local-variable 'sgml-custom-markup)
        '(("<A>" "<A HREF=\"\">\r</a>")))
+
+  ;; Set up the syntax table.
+  (modify-syntax-entry ?< "(>" html-mode-syntax-table)
+  (modify-syntax-entry ?> ")<" html-mode-syntax-table)
+  (modify-syntax-entry ?\" ".   " html-mode-syntax-table)
+  (modify-syntax-entry ?\\ ".   " html-mode-syntax-table)
+  (modify-syntax-entry ?'  "w   " html-mode-syntax-table)
+
   ; sigh ...  need to call this now to get things working.
   (sgml-build-custom-menus)
   (add-submenu nil sgml-html-menu "SGML")