X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/ac8c36037b333701550451291b94412876b7c173..ddf6e116b0354c87c7275e37513d9e58507ed5a9:/el/dot-emacs.el

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 547c4e9..c218411 100644
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -137,6 +137,33 @@ library."
 	  ((eq side 'left) 1)
 	  (t 2))))
 
+(defun mdw-horizontal-window-overhead ()
+  "Computes the horizontal window overhead.
+This is the number of columns used by fringes, scroll bars and other such
+cruft."
+  (if (not window-system)
+      1
+    (let ((tot 0))
+      (dolist (what '(scroll-bar fringe))
+	(dolist (side '(left right))
+	  (incf tot (funcall (intern (concat (symbol-name what) "-columns"))
+			     side))))
+      tot)))
+
+(defun mdw-split-window-horizontally (&optional width)
+  "Split a window horizontally.
+Without a numeric argument, split the window approximately in
+half.  With a numeric argument WIDTH, allocate WIDTH columns to
+the left-hand window (if positive) or -WIDTH columns to the
+right-hand window (if negative).  Space for scroll bars and
+fringes is not taken out of the allowance for WIDTH, unlike
+\\[split-window-horizontally]."
+  (interactive "P")
+  (split-window-horizontally
+   (cond ((null width) nil)
+	 ((>= width 0) (+ width (mdw-horizontal-window-overhead)))
+	 ((< width 0) width))))
+
 (defun mdw-divvy-window (&optional width)
   "Split a wide window into appropriate widths."
   (interactive "P")
@@ -146,16 +173,7 @@ library."
 		     77)
 		    (t 78)))
   (let* ((win (selected-window))
-	 (sb-width (if (not window-system)
-		       1
-		     (let ((tot 0))
-		       (dolist (what '(scroll-bar fringe))
-			 (dolist (side '(left right))
-			   (incf tot
-				 (funcall (intern (concat (symbol-name what)
-							  "-columns"))
-					  side))))
-		       tot)))
+	 (sb-width (mdw-horizontal-window-overhead))
 	 (c (/ (+ (window-width) sb-width)
 	       (+ width sb-width))))
     (while (> c 1)
@@ -706,7 +724,8 @@ case."
   (when (and (boundp 'whitespace-style)
 	     (fboundp 'whitespace-mode))
     (let ((whitespace-style (remove 'trailing whitespace-style)))
-      (whitespace-mode arg))))
+      (whitespace-mode arg))
+    (setq show-trailing-whitespace whitespace-mode)))
 
 (defun mdw-misc-mode-config ()
   (and mdw-auto-indent
@@ -727,8 +746,9 @@ case."
   (mdw-whitespace-mode 1)
   (and (fboundp 'gtags-mode)
        (gtags-mode))
-  (outline-minor-mode t)
-  (hs-minor-mode t)
+  (if (fboundp 'hs-minor-mode)
+      (hs-minor-mode t)
+    (outline-minor-mode t))
   (reveal-mode t)
   (trap (turn-on-font-lock)))
 
@@ -807,7 +827,7 @@ doesn't match any of the regular expressions in
     (mdw-define-face variable-pitch
       (((type x)) :family "sans" :height 100))
   (mdw-define-face variable-pitch
-    (((type x)) :family "helvetica" :height 120)))
+    (((type x)) :family "helvetica" :height 90)))
 (mdw-define-face region
   (((type tty) (class color)) :background "blue")
   (((type tty) (class mono)) :inverse-video t)
@@ -903,6 +923,8 @@ doesn't match any of the regular expressions in
   (((type tty)) :foreground "green") (t :foreground "SeaGreen1"))
 (mdw-define-face message-header-name
   (((type tty)) :foreground "green") (t :foreground "SeaGreen1"))
+(mdw-define-face which-func
+  (t nil))
 
 (mdw-define-face diff-index
   (t :weight bold))