X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/11a169c1888d639143681b7b70b9a9d34b61588b..228374502b83afd5a84952bf017f42a10fc8ef28:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index a29ff0b..7c97a2d 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -59,6 +59,8 @@
      (not (memq 'git vc-handled-backends))
      (setq vc-handled-backends (cons 'GIT vc-handled-backends)))
 
+(setq magit-log-cutoff-length 512)
+
 (trap (or mdw-fast-startup (require 'p4)))
 
 (trap (or mdw-fast-startup (require 'tex-site)))
@@ -144,6 +146,7 @@
       message-yank-prefix "> "
       message-yank-cited-prefix "> "
       message-send-mail-function 'message-send-mail-with-sendmail
+      message-sendmail-envelope-from 'header
       message-indent-citation-function '(message-indent-citation
 					 mdw-trim-spaces-after-citing))
 
@@ -209,7 +212,7 @@
 (setq dabbrev-case-replace nil)		;Retain case when completing
 (setq linum-format "%7d ")
 (setq next-line-add-newlines nil)	;Don't add weird newlines
-(setq split-height-threshold 45)	;Reuse windows where sensible
+(setq split-height-threshold nil)	;Reuse windows where sensible
 (setq display-buffer-reuse-frames nil	;Don't confuse me by showing buffers
       iswitchb-default-method 'samewindow) ;in other random frames
 (setq dired-deletion-confirmer		;Make deletion easier in dired
@@ -268,6 +271,10 @@
      (define-key outline-mode-prefix-map [?\C-r] 'reveal-mode)
      (define-key outline-mode-prefix-map [?\C--] 'mdw-outline-collapse-all)))
 
+(setq imenu-auto-rescan t
+      imenu-auto-rescan-maxout (* 128 1024)
+      imenu-max-items 60)
+
 (setq cltl2-root-url (mdw-config 'cltl-url))
 (setq common-lisp-hyperspec-root (mdw-config 'hyperspec-url))
 
@@ -464,6 +471,7 @@
 		  'mouse-drag-vertical-line)
   (global-set-key [vertical-scroll-bar C-mouse-1]
 		  #'(lambda () (interactive)))
+  (global-set-key [M-S-mouse-3] 'imenu)
   (global-set-key [XF86WakeUp] "")
   (and (not mdw-fast-startup) (fboundp 'hippie-expand)
        (global-set-key [?\M-/] 'hippie-expand)))
@@ -538,6 +546,7 @@
 
 (setq interpreter-mode-alist
       (append `(("runlisp" . lisp-mode)
+		("@BASH@" . sh-mode)
 		("@PYTHON@" . python-mode)
 		("@PERL@" . perl-mode)
 		("@TCLSH@" . tcl-mode)