Patch information for html-helper-mode (3.0.4kilo-2) html-helper-mode.el

--- html-helper-mode-3.0.4kilo.orig/html-helper-mode.el
+++ html-helper-mode-3.0.4kilo/html-helper-mode.el
@@ -153,7 +153,7 @@
 ;;    I think that people that have installed JDE, use it, so
 ;;    it would be logical to preset this automatically using
 ;;    `locate-library'
-(defcustom html-helper-mode-uses-JDE (locate-library "jde")
+(defcustom html-helper-mode-uses-JDE nil
   "No nil to use jde instead of java-mode"
   :type 'boolean
   :initialize 'custom-initialize-default
@@ -182,7 +182,7 @@
   :group 'html-helper
   :require 'html-helper-mode)
 
-(defcustom html-helper-mode-insert-attributes-always nil
+(defcustom html-helper-mode-insert-attributes-always t
   "non nil to make Emacs insert empty tag attributes when tempo-interactive is nil"
   :type 'boolean
   :initialize 'custom-initialize-default
@@ -220,7 +220,7 @@
 
 ;; variables to configure (these defaults are reasonable.)
 
-(defvar html-helper-htmldtd-version "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML//EN\">\n"
+(defvar html-helper-htmldtd-version "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n"
   "*Version of HTML DTD you're using.")
 
 (defvar html-helper-user-menu nil
@@ -282,7 +282,8 @@
 
 (defvar html-helper-new-buffer-template
   '(html-helper-htmldtd-version
-    "<html> <head>\n"
+    "<html>\n<head>\n"
+    "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=iso-8859-15\">\n"
     "<title>" p "</title>\n</head>\n\n"
     "<body>\n"
     "<h1>" p "</h1>\n\n"
@@ -333,7 +334,7 @@
 Inserted by `html-helper-insert-new-ASP-buffer-strings' if
 `html-helper-build-new-buffer' is set to t")
 
-(defvar html-helper-timestamp-start "<!-- hhmts start --> "
+(defvar html-helper-timestamp-start "<!-- hhmts start -->"
   "*Start delimiter for timestamps.
 Everything between `html-helper-timestamp-start' and
 `html-helper-timestamp-end' will be deleted and replaced with the output
@@ -721,7 +722,7 @@
    (logical "c"       "<code>"		"Code"
 	    ("<code>" (r "Code: ") "</code>"))
    (logical "x"       "<samp>"		"Sample"
-	    ("<samp>" (r "Sample code") "</samp>"))
+	    ("<samp>" (r "Sample code: ") "</samp>"))
    (logical "r"       "<cite>"		"Citation"
 	    ("<cite>" (r "Citation: ") "</cite>"))
    (logical "k"       "<kbd>"		"Keyboard Input"
@@ -755,10 +756,10 @@
 
 ;; html4.0 stuff, omitted
 
-;    (phys    "5" "<span style=" "Spanning style"
-; 	     ("<span style=\"" (p "style: ") "\">" 'r "</span>"))
-;    (phys    "l" "<span class=" "Spanning class"
-; 	     ("<span class=\"" (p "class: ") "\">" 'r "</span>"))
+   (phys    "5" "<span style=" "Spanning style"
+	     ("<span style=\"" (p "style: ") "\">" 'r "</span>"))
+   (phys    "l" "<span class=" "Spanning class"
+	     ("<span class=\"" (p "class: ") "\">" 'r "</span>"))
 
 
    ;;headers
@@ -926,18 +927,18 @@
    ;; scripting elements
    (script  "j"    "<SCRIPT>"       "JavaScript"
 	    ("<SCRIPT TYPE=\"text/javascript\">\n"
-	     (r "Script") "</SCRIPT>"))
+	     (r "Script: ") "</SCRIPT>"))
    (script  "v"    "<SCRIPT>"       "VBScript"
 	    ("<SCRIPT TYPE=\"text/vbscript\">\n"
-	     (r "Script") "</SCRIPT>"))
+	     (r "Script: ") "</SCRIPT>"))
    (script  "%"    "<%="            "ASP output"
-	    ("<%="(p " Variabile: ")"%>"))
+	    ("<%="(p " Variable: ")"%>"))
    (script  "a"    "<%xx%>"         "JSP/ASP code"
 	    ("<%\n"(r "Code: " )"\n%>"))
    (script  "<"    "<%xx%>"         "JSP/ASP break"
 	    ("%>\n"(r "Code: " )"\n<%"))
    (script  "="    "<?="            "PHP output"
-	    ("<?="(p " Variabile: ")"?>"))
+	    ("<?="(p " Variable: ")"?>"))
    (script  "p"    "<?xx?>"         "PHP code"
 	    ("<? PHP\n"(r "Code: " )"\n?>"))
    (script  "?"    "<?xx?>"         "PHP break"
@@ -1709,10 +1710,10 @@
 	  (progn (make-face 'html-helper-underline-face)
 		 (set-face-underline-p 'html-helper-underline-face t)
 		 (set-face-foreground html-helper-underline-face "goldenrod")))
-      (if (funcall change-it 'html-tag-face)
-	  (progn (make-face 'html-tag-face)
-		 (make-face-bold 'html-tag-face)
-		 (set-face-foreground html-tag-face "dodger blue")))
+      ;; Cheap hack to avoid autoload failure - lawrencc@debian.org
+      (defvar html-tag-face 
+        (make-face 'html-tag-face))
+      (make-face-bold 'html-tag-face)
 	;; PETER Neergaard <turtle@bu.edu> says
 	;;
 	;; "Another issue I just noticed is that font-lock-builtin-face
@@ -1869,11 +1870,11 @@
       ()
     ;; Emacs 19.28 and older
     ;; Define face variables that don't exist until Emacs 19.29.
-    (defvar html-helper-builtin-face (html-helper-emacs-19-build-face)
+    (defvar html-helper-builtin-face (html-helper-emacs-19-build-face))
     (defvar font-lock-variable-name-face 'font-lock-doc-string-face
       "Face to use for variable names -- and some HTML keywords.")
     (defvar font-lock-reference-face 'underline ; Ugly at line breaks
-      "Face to use for references -- including HTML hyperlink texts.")))
+      "Face to use for references -- including HTML hyperlink texts."))
 
 (defun html-helper-emacs-19-build-face ()
   (let ((x (make-face 'font-lock-builtin-face)))
@@ -2150,8 +2151,8 @@
 
 (defun html-helper-match-bold (last)
   (html-helper-match-ib
-   "\\(<\\(b\\|h[1-4]\\|strong\\title\\)\\(>\\|\\W\[^>]*>\\)\\)"
-   "</\\(b\\|h[1-4]\\|strong\\title\\)" last))
+   "\\(<\\(b\\|h[1-4]\\|strong\\|title\\)\\(>\\|\\W\[^>]*>\\)\\)" 
+   "</\\(b\\|h[1-4]\\|strong\\|title\\)" last))
 
 (defun html-helper-match-italics (last)
   (html-helper-match-ib "\\(<\\(i\\|em\\)\\(>\\|\\W\[^>]*>\\)\\)"
html-helper-mode (3.0.4kilo-2) html-helper-mode.el

Summary

Patch contents
