# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1256647799 -7200
# Node ID f511a2b4694b95df639c057e6964a7216204e574
# Parent  c3ec8e16a00717c8d933501c5a05ff0135b64ce5# Parent  3a0f6acd7e2bec4721ad47ab3b1acd9f92edface
merged

diff -r c3ec8e16a007 -r f511a2b4694b .emacs-my
--- a/.emacs-my	Sun Oct 18 11:10:35 2009 +0300
+++ b/.emacs-my	Tue Oct 27 14:49:59 2009 +0200
@@ -213,7 +213,11 @@
 (global-set-key [?\C-x right] 'next-buffer)
 (global-set-key [?\C-x left]  'previous-buffer)
 
-(global-set-key (kbd "C-x C-d") 'dired)
+;; I usually mistype "C-x C-f" to "C-x d" or "C-x C-d", so always use find-file,
+;; because when file if directory find-file load dired, if regular file open it.
+(global-set-key (kbd "C-x C-f") 'find-file)
+(global-set-key (kbd "C-x C-d") 'find-file)
+(global-set-key (kbd "C-x d") 'find-file)
 
 (global-set-key (kbd "\e\eg") 'goto-line)
 (global-set-key (kbd "\e\er") 'query-replace-regexp)
@@ -850,6 +854,7 @@
 (require 'compile)
 (add-to-list 'compilation-error-regexp-alist '("^\\( +\\[csc\\] \\|\\)\\(.*\\)(\\([0-9]*\\),\\([0-9]*\\)):" 2 3 4))
 (add-to-list 'compilation-error-regexp-alist '("^ *\\(.*\\)(\\([0-9]*\\)) +:" 1 2))
+(add-to-list 'compilation-error-regexp-alist '("^\"?\\([^\"]*\\)\"?,\\([0-9]*\\) .*\\[.*\\]: " 1 2)) ; KEIL compiler
 ;; (add-to-list 'compilation-mode-font-lock-keywords '("\\(/[Oo][Uu][Tt]:[^ 	]+\\)" . 1))
 ;; (add-to-list 'compilation-mode-font-lock-keywords '("[ 	]\\(/F[oe][^ 	]+\\)" . 1))
 
@@ -858,6 +863,8 @@
 ;; (setq-default asm-comment-char 59)
 (add-hook 'asm-mode-hook '(lambda () (setq comment-start "/*") (setq comment-end "*/")) t)
 
+(add-to-list 'auto-mode-alist '("\\.\\([sS]79\\|[sS]\\)\\'" . asm-mode))
+
 ;; (add-hook 'asm-mode-hook '(lambda () (local-unset-key ":")))
 ;; (add-hook 'asm-mode-hook '(lambda () (local-set-key ":" ":")))