# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1316455509 -10800
# Node ID 9ec79850e725162c0954375dfe8a297cc782b582
# Parent  2a081d4e2e7c79f9d2e7571abaab6f354fb08934# Parent  d19881accc91ae3b8d2ab64f65595a945143fc75
merged

diff -r 2a081d4e2e7c -r 9ec79850e725 .emacs-autogen.sh
--- a/.emacs-autogen.sh	Mon Sep 19 21:04:48 2011 +0300
+++ b/.emacs-autogen.sh	Mon Sep 19 21:05:09 2011 +0300
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 if [ -z "$1" ]; then
   echo "Where config file?"
@@ -34,6 +34,13 @@
   esac
 }
 
+print_header() {
+  echo
+  echo ';; ================================================================'
+  echo ";; ${FUNCNAME[1]}."
+  echo
+}
+
 check_ispell() {
   command -v ispell >/dev/null && return 0 || return 1
 }
@@ -59,11 +66,8 @@
   echo '(setq-default ispell-local-dictionary "en")'
 }
 
-check_speller() {
-  echo
-  echo ';; ================================================================'
-  echo ';; Speller settings (check_speller).'
-  echo
+print_speller() {
+  print_header
   check_ispell
   ispell_present=$?
   check_aspell
@@ -100,6 +104,15 @@
   esac
 }
 
+print_man() {
+  print_header
+  if man -a man >/dev/null 2>&1; then
+    echo '(setq Man-switches "-a")'
+  else
+    echo '(setq Man-switches "")'
+  fi
+}
+
 # Remove old auto-generated config and fill it by standard header.
 echo ";; -*- mode: emacs-lisp; coding: utf-8; fill-column: 78 -*-
 ;;
@@ -107,4 +120,6 @@
 " >$cfg
 
 check_platform
-check_speller >>$cfg
+print_speller >>$cfg
+print_man >>$cfg
+
diff -r 2a081d4e2e7c -r 9ec79850e725 .emacs-my
--- a/.emacs-my	Mon Sep 19 21:04:48 2011 +0300
+++ b/.emacs-my	Mon Sep 19 21:05:09 2011 +0300
@@ -102,13 +102,14 @@
 
 (defvar my-devel-mode-list
   '(
-    sh-mode script-mode
+    sh-mode script-mode tcl-mode
     c-mode c++-mode java-mode js-mode
     python-mode
     lisp-mode
     emacs-lisp-mode
     makefile-mode makefile-gmake-mode
     nsis-mode
+    bat-generic-mode
     html-mode
     )
   "List of development modes.")
@@ -652,6 +653,12 @@
 (define-key dired-mode-map (kbd "<return>")
   'my-dired-enter-to-dir)
 
+;; Make behaviour same as in GUI.
+(unless window-system
+  (define-key dired-mode-map (kbd "DEL") 'my-dired-up-dir)
+  (define-key dired-mode-map (kbd "RET") 'my-dired-enter-to-dir)
+  )
+
 (when (>= emacs-major-version 22)
   ;; Enable 'a' command.
   (put 'dired-find-alternate-file 'disabled nil)
diff -r 2a081d4e2e7c -r 9ec79850e725 Makefile
--- a/Makefile	Mon Sep 19 21:04:48 2011 +0300
+++ b/Makefile	Mon Sep 19 21:05:09 2011 +0300
@@ -58,7 +58,7 @@
 		if [ ! -f $(HOME)/$$file ]; then cp $$file $(HOME)/$$file; fi; \
 	done
 	cp .emacs $(HOME)/.emacs
-	sh .emacs-autogen.sh $(HOME)/.emacs-autogen
+	./.emacs-autogen.sh $(HOME)/.emacs-autogen
 	cp .emacs-my $(HOME)/.emacs-my
 	rm -f -r $(HOME)/.emacs.d/my-lisp
 	mkdir -p $(HOME)/.emacs.d/my-lisp