Automated merge with file:///cygdrive/d/srv/hg-home/dot-emacs
authorOleksandr Gavenko <gavenkoa@gmail.com>
Wed, 21 Sep 2011 10:08:37 +0300
changeset 701 f0697b66858f
parent 699 9ec79850e725 (diff)
parent 700 87b7f0f427dc (current diff)
child 702 0617020b53d8
Automated merge with file:///cygdrive/d/srv/hg-home/dot-emacs
--- a/.emacs-my	Wed Sep 21 10:08:29 2011 +0300
+++ b/.emacs-my	Wed Sep 21 10:08:37 2011 +0300
@@ -1646,26 +1646,32 @@
 ;;; ----------------------------------------------------------------
 (message "psgml")
 
+(setq my-html-template
+      '("html"
+        (nil
+         "\n<head>" \n
+         "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=" (read-input "Charset: ") "\">" \n
+         "<title>" (setq str (read-input "Title: ")) "</title>\n"
+         "</head>\n"
+         "<body>\n<h1>" str "</h1>"
+         "\n<address>" \n
+         "<a href=\"mailto:" user-mail-address "\">" (user-full-name) "</a>" \n
+         "</address>" \n
+         "</body>\n"
+         ))
+      )
+
 (setq sgml-set-face t)                  ; for highlighting in sgml
 (eval-after-load 'sgml-mode
   '(progn
-     (setq html-tag-alist
-           (cons
-            '("html" (nil
-                      "\n<head>" \n
-                      "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=" (read-input "Charset: ") "\">" \n
-                      "<title>" (setq str (read-input "Title: ")) "</title>\n"
-                      "</head>\n"
-                      "<body>\n<h1>" str "</h1>"
-                      "\n<address>" \n
-                      "<a href=\"mailto:" user-mail-address "\">" (user-full-name) "</a>" \n
-                      "</address>" \n
-                      "</body>\n"
-                      ))
-            (my-filter
-             (lambda (item) (not (equal (car item) "html")))
-             html-tag-alist)))
-     ))
+     (unless (featurep 'psgml)
+       (setq html-tag-alist
+             (cons
+              my-html-template
+              (my-filter
+               (lambda (item) (not (equal (car item) "html")))
+               html-tag-alist)))
+     )))
 
 ;;; ----------------------------------------------------------------
 (message "sh, bash")