X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/fbc10dba9a1ff359cf6f3774a240189e4cd25512..6ada84f4e0acb4149b95b02ab35ec7a3f73ac1c8:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index 41f8130..d661617 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -327,24 +327,25 @@
 
 ;; Postscript printing.
 
-(setq ps-paper-type 'a4
-      ps-print-only-one-header t
-      ps-print-color-p t
-      ps-landscape-mode t ps-number-of-columns 4
-      ps-line-number t ps-line-number-step 5 ps-line-number-start 5
-      ps-zebra-stripes nil ps-zebra-stripe-height 5
-      ps-spool-duplex t ps-spool-tumble nil ps-spool-config 'setpagedevice
-      ps-top-margin (* 12 (/ 72 25.4))
-      ps-bottom-margin (* 16 (/ 72 25.4))
-      ps-header-offset (* 8 (/ 72 25.4))
-      ps-left-margin (* 12 (/ 72 25.4))
-      ps-right-margin (* 12 (/ 72 25.4))
-      ps-inter-column (* 4 (/ 72 25.4))
-      ps-font-family 'CourierCondensed ps-font-size '(4.5 . 5.16)
-      ps-line-number-font 'Palatino ps-line-number-font-size 3
-      ps-header-font-family 'Helvetica
-	ps-header-title-font-size '(8 . 10)
-	ps-header-font-size '(6 . 8))
+(let ((mm (/ 72 25.4)))
+  (setq ps-paper-type 'a4
+	ps-print-only-one-header t
+	ps-print-color-p t
+	ps-landscape-mode t ps-number-of-columns 4
+	ps-line-number t ps-line-number-step 5 ps-line-number-start 5
+	ps-zebra-stripes nil ps-zebra-stripe-height 5
+	ps-spool-duplex t ps-spool-tumble nil ps-spool-config 'setpagedevice
+	ps-top-margin (* 12 mm)
+	ps-bottom-margin (* 16 mm)
+	ps-header-offset (* 8 mm)
+	ps-left-margin (* 12 mm)
+	ps-right-margin (* 12 mm)
+	ps-inter-column (* 4 mm)
+	ps-font-family 'CourierCondensed ps-font-size '(4.5 . 5.16)
+	ps-line-number-font 'Palatino ps-line-number-font-size 3
+	ps-header-font-family 'Helvetica
+	  ps-header-title-font-size '(8 . 10)
+	  ps-header-font-size '(6 . 8)))
 
 ;; Splash screen stuff.
 
@@ -382,6 +383,9 @@
 (setq read-quoted-char-radix 16)	;C-q HEX-STUFF [RET]
 (setq case-fold-file-names nil)		;Don't translate file names (grr...)
 (setq scroll-step 5)			;Don't scroll too much at a time
+(setq custom-unlispify-tag-names nil	;Display variable names properly
+      custom-unlispify-menu-entries nil
+      custom-buffer-done-kill t)
 (setq blink-cursor-blinks 0)		;Keep blinking the cursor
 (setq-default fill-column mdw-text-width) ;I use rather narrow windows
 (setq adaptive-fill-mode nil)		;I have my own machinery instead
@@ -389,6 +393,8 @@
 (setq-default comment-column 40)	;Set a standard comment column
 (setq-default truncate-partial-width-windows nil
 	      truncate-lines t)
+(setq line-move-visual t
+      visual-order-cursor-movement t)
 (setq default-indicate-empty-lines t)
 (setq view-read-only t)
 (setq-default view-exit-action #'kill-buffer)
@@ -429,9 +435,11 @@
 	      viper-ex-style-editing nil
 	      viper-expert-level 5
 	      viper-inhibit-startup-message t
+	      ;;viper-insert-state-cursor-color "red"
 	      viper-no-multiple-ESC nil
 	      viper-re-query-replace t
 	      viper-re-search t
+	      ;;viper-replace-overlay-cursor-color "red"
 	      viper-shift-width 2
 	      viper-vi-style-in-minibuffer nil
 	      viper-want-ctl-h-help t)
@@ -449,7 +457,16 @@
   (tool-bar-mode 0))
 (trap (or mdw-fast-startup (global-auto-revert-mode t)))
 
-(defvar mdw-black-background t)
+(defun mdw-set-viper-cursor-colour ()
+  ;; ?? doesn't seem to work
+  (set-frame-parameter nil 'cursor-color "green")
+  (message ";; %S" post-command-hook)
+  (sit-for 2))
+;;(add-hook 'viper-vi-state-hook 'mdw-set-viper-cursor-colour)
+
+(defcustom mdw-black-background t
+  "Whether the Emacs background is black (or dark, at any rate)."
+  :type 'boolean)
 
 (eval-after-load "outline"
   '(progn
@@ -665,10 +682,13 @@
 
 ;; Other frame fiddling.
 
-(defvar mdw-hostname
+(defcustom mdw-hostname
   (if (string-match "\\." system-name)
       (substring system-name 0 (match-beginning 0))
-    system-name))
+    system-name)
+  "Unqualified hostname Emacs is running on."
+  :type 'string
+  :safe 'stringp)
 (setq frame-title-format '("Emacs " user-login-name "@" mdw-hostname " – %b")
       icon-title-format frame-title-format)
 
@@ -720,6 +740,7 @@
   (global-set-key [?\C-c ?m ?b] 'magit-blame)
   (global-set-key [?\C-c ?m ?d] 'magit-dispatch-popup)
   (global-set-key [?\C-c ?m ?f] 'magit-find-file)
+  (global-set-key [?\C-c ?m ?l] 'magit-toggle-buffer-lock)
   (global-set-key [?\C-c ?m ?m] 'magit-status)
   (global-set-key [?\C-c ?m ?r] 'magit-list-repositories)
   (global-set-key [?\C-c ?m ?w] 'magit-wip-log)