X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/f646ea77a485172601653f169440bc3d2006a70d..3d6231da04cd7ff9a3480815d4408349a0890d6e:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index d06795d..68c0068 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)))
@@ -210,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
@@ -269,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))
 
@@ -286,7 +292,8 @@
       browse-url-generic-program "mdw-chrome"
       browse-url-mozilla-program "firefox")
 
-(setq w3m-default-display-inline-images t)
+(setq w3m-default-display-inline-images t
+      w3m-use-cookies t)
 
 (eval-after-load "w3m"
   '(let ((entries '(("application/pdf" "\\.pdf\\'" ("evince" file) nil)
@@ -465,6 +472,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)))
@@ -507,6 +515,7 @@
 		("\\.cs$" . csharp-mode)
 		("\\.go$" . go-mode)
 		("\\.org$" . org-mode)
+		("\\.make$" . makefile-mode)
 		;; ("/[ch]/" . c-mode)
 		(,(concat "/\\("
 			  "\\.stgit\\.msg" "\\|"
@@ -539,10 +548,13 @@
 
 (setq interpreter-mode-alist
       (append `(("runlisp" . lisp-mode)
+		("@BASH@" . sh-mode)
 		("@PYTHON@" . python-mode)
 		("@PERL@" . perl-mode)
 		("@TCLSH@" . tcl-mode)
-		("@WISH@" . tcl-mode))
+		("@WISH@" . tcl-mode)
+		("/tclsh" . tcl-mode)
+		("/wish" . tcl-mode))
 	      interpreter-mode-alist))
 
 (setq completion-ignored-extensions