# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1268423316 -7200
# Node ID fe7a197bebe47fdab9a7697759209522f1d0d7d9
# Parent  547a46ad8b1912559074fd5d97b76abf968db5a7# Parent  7515e5a6b3b9b071ea98f8eaff95ecf9a3823e5d
Automated merge with file:///E:\srv\hg\dot-emacs

diff -r 547a46ad8b19 -r fe7a197bebe4 .emacs-my
--- a/.emacs-my	Mon Mar 08 10:46:25 2010 +0200
+++ b/.emacs-my	Fri Mar 12 21:48:36 2010 +0200
@@ -32,6 +32,7 @@
       (set-background-color "white")
       (set-foreground-color "black")
       (set-cursor-color "brown")
+      ;; (set-mouse-color "white")
       (setq cursor-type 'box)           ; box, hollow, bar, hbar
       ;;(setq blink-matching-delay 0.01)
       (blink-cursor-mode 1)
@@ -597,6 +598,7 @@
       (setq org-agenda-ndays 14
             org-deadline-warning-days 7
             org-agenda-show-all-dates t
+            org-agenda-format-date "%Y-%m-%d, %A %e %B"
             org-agenda-skip-deadline-if-done t
             org-agenda-skip-scheduled-if-done t
             org-agenda-start-on-weekday nil
diff -r 547a46ad8b19 -r fe7a197bebe4 bat-file-mode.el
--- a/bat-file-mode.el	Mon Mar 08 10:46:25 2010 +0200
+++ b/bat-file-mode.el	Fri Mar 12 21:48:36 2010 +0200
@@ -36,7 +36,8 @@
     ("[cC][aA][lL][lL][[:blank:]]+\\(:[[:alpha:]][[:alnum:]_]*\\)" (1 'font-lock-function-name-face))
     ("\\(%[[:digit:]]\\|%%[[:alpha:]]\\|%[[:alpha:]][[:alnum:]_]*%\\)" (1 'font-lock-variable-name-face))
     ("[sS][eE][tT][[:blank:]]+\\([[:alpha:]][[:alnum:]_]*\\)[[:blank:]]*=" (1 'font-lock-variable-name-face))
-    ("[[:blank:]]+\\([-/][[:alnum:]_.]+\\)" (1 'font-lock-preprocessor-face))
+    ;; Options for program like --help or /quiet.
+    ("[[:blank:]]+\\([-/]-?[[:alnum:]_.]+\\)" (1 'font-lock-preprocessor-face))
     ;; ("\\(\\%[a-z]\\)" (1 'font-lock-reference-face))
     ;; ("\\(%\\sw+%\\)" (1 'font-lock-reference-face))
     ;; ("\\(%[0-9]\\)" (1 'font-lock-reference-face))