Merge commit 'crybaby/master'; commit 'ponder/master'

* commit 'crybaby/master':
  bash_profile: Extend the collection of INFOPATH directories.

* commit 'ponder/master':
  zile: Yet another editor configuration.
  emacs: Give org-iswitchb a key binding, and include diary stuff in agenda.
  emacs, dot-emacs.el: Extend and semi-automate evil-keymap hacking.
  dot-emacs.el: Insert missing blank line before section header.

diff --git a/bash_profile b/bash_profile
index 7523cfc..57475a8 100644 (file)
--- a/bash_profile
+++ b/bash_profile
@@ -129,7 +129,11 @@ __mdw_programp distcc && export CCACHE_PREFIX=distcc
 
 export TEXINPUTS=".:$HOME/lib/tex//:"
 
-__mdw_addto INFOPATH r $HOME/info /usr/info /usr/share/info /usr/local/info
+__mdw_addto INFOPATH r \
+       $HOME/info \
+       /usr/info /usr/share/info \
+       /usr/local/info /usr/local/share/info \
+       /usr/local/share/info/its
 __mdw_addto PERLLIB r $HOME/lib/perl
 __mdw_addto PYTHONPATH r $HOME/lib/python
 

diff --git a/dot-emacs.el b/dot-emacs.el
index b8d5381..5b9408f 100644 (file)
--- a/dot-emacs.el
+++ b/dot-emacs.el
@@ -2090,7 +2090,7 @@ strip numbers instead."
   (make-variable-buffer-local 'lisp-indent-function)
   (setq lisp-indent-function 'common-lisp-indent-function))
 
-(setq lisp-simple-loop-indentation 1
+(setq lisp-simple-loop-indentation 2
       lisp-loop-keyword-indentation 6
       lisp-loop-forms-indentation 6)
 

diff --git a/emacs b/emacs
index ba6c442..4337d39 100644 (file)
--- a/emacs
+++ b/emacs
@@ -121,6 +121,18 @@
 (setq sendmail-program "~/bin/sendmail-hack")
 
 (setq mail-user-agent 'message-user-agent)
+(setq message-signature-separator "^-- \\(\\|\\[mdw\\]\\)$"
+      message-yank-prefix "> "
+      message-yank-cited-prefix "> "
+      message-indent-citation-function '(message-indent-citation
+                                        mdw-trim-spaces-after-citing))
+
+(defun mdw-trim-spaces-after-citing ()
+  (save-excursion
+    (save-restriction
+      (narrow-to-region (point) (mark t))
+      (while (re-search-forward "^> +$" nil t)
+       (replace-match ">")))))
 
 (and (fboundp 'turn-on-gnus-dired-mode)
      (not mdw-fast-startup)

diff --git a/screenrc b/screenrc
index 2c4ada0..134dd9b 100644 (file)
--- a/screenrc
+++ b/screenrc
@@ -5,3 +5,4 @@ deflogin off
 defencoding utf8
 setenv LC_CTYPE en_GB.utf8
 setenv LESSCHARSET utf-8
+altscreen on