# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1229788165 -7200
# Node ID 817be82fdfc9e2fd49fc9b6b2f44fa30285ffd4e
# Parent  0591d06cf752a43f79cd79ca6f8852ff42ad2c62# Parent  52a334c6c9084a896ee519f37503bb610bb8805a
Automated merge with file:///home/sasha/site/hg/dot-emacs

diff -r 0591d06cf752 -r 817be82fdfc9 .emacs-my
--- a/.emacs-my	Fri Dec 19 18:28:17 2008 +0200
+++ b/.emacs-my	Sat Dec 20 17:49:25 2008 +0200
@@ -436,13 +436,11 @@
 ;; (desire 'filladapt)
 ;;;; (desire 'hugs-mode)
 ;; (desire 'haskell-mode)
-;; (desire 'ispell)
 ;; (desire 'latex)
 ;; (desire 'lispdir)
 ;; (desire 'mpg123)
 ;; (desire 'php-mode)
 ;; (desire 'ps-print)
-;; (desire 'psgml)
 ;; (desire 'sh-script)
 ;; (desire 'shell)
 ;; (desire 'tex)
@@ -593,6 +591,7 @@
 ;;
 ;; Spell
 
+(setq ispell-program-name "ispell")
 ;(setq ispell-dictionary "russianw"); default dictionary
 ;(setq ispell-local-dictionary "russianw"); default dictionary
 ;(add-hook 'text-mode-hook 'flyspell-mode)
@@ -898,6 +897,16 @@
 
 ;; (global-set-key (kbd "\e\eE") 'ecb-activate)
 
+;; ----------------------------------------------------------------------
+;; html
+
+;; ----------------------------------------------------------------------
+;; xml
+
+;; ----------------------------------------------------------------------
+;; psgml
+(setq sgml-set-face t)			; for highlighting in sgml
+
 ;; ======================================================================
 ;; Printing
 
diff -r 0591d06cf752 -r 817be82fdfc9 Makefile
--- a/Makefile	Fri Dec 19 18:28:17 2008 +0200
+++ b/Makefile	Sat Dec 20 17:49:25 2008 +0200
@@ -9,9 +9,10 @@
 all: install
 
 install: .emacs .emacs-my .emacs-my-pre .emacs-my-post
-	for file in .emacs .emacs-my-pre .emacs-my-post; do \
+	for file in .emacs-my-pre .emacs-my-post; do \
 		if [ ! -f $(HOME)/$$file ]; then cp $$file $(HOME)/$$file; fi; \
 	done
+	cp .emacs $(HOME)/.emacs
 	cp .emacs-my $(HOME)/.emacs-my
 
 install-all: .emacs .emacs-my .emacs-my-pre .emacs-my-post