X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/f5a7f2454290ef7473e0b32def4486d0b50096d0..77619173fdf73ef9835c877f6376bcfc25733c28:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index 13d142c..ff4843f 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -177,6 +177,11 @@
 (setq calc-settings-file "~/.emacs-calc")
 (load calc-settings-file)
 
+;; Saving window-configuration state.
+
+(or mdw-fast-startup
+    (winner-mode 1))
+
 ;; Some mail and news configuration.
 
 (setq mail-from-style 'angles
@@ -395,7 +400,7 @@
 (setq Info-fontify-maximum-menu-size 100000)
 (setq set-mark-command-repeat-pop t)
 (setq password-cache-expiry nil)
-(setq mouse-autoselect-window t)
+(setq mouse-autoselect-window nil)
 (setq-default proced-filter 'all
 	      proced-sort 'user)
 (setq ispell-program-name "aspell-hack"
@@ -594,6 +599,8 @@
 	      (define-key mc-write-mode-map "\C-c/E" 'mc-encrypt-region)
 	      (add-hook 'text-mode-hook 'mc-install-write-mode))))
 
+(setq epa-pinentry-mode 'loopback)
+
 ;;;--------------------------------------------------------------------------
 ;;; Other common declarations.
 
@@ -709,6 +716,7 @@
   (global-set-key [?\C-c ?t ?s] 'timeclock-status-string)
   (global-set-key [?\C-c ?t ?t] 'gtags-find-tag-from-here)
   (global-set-key [?\C-c ?t ?w] 'timeclock-workday-remaining-string)
+  (global-set-key [?\C-c ?v ?f] 'view-file)
   (global-set-key [?\C-c ?v ?i] 'vm-visit-imap-folder)
   (global-set-key [?\C-c ?v ?m] 'vm-visit-folder)
   (global-set-key [?\C-c ?v ?v] 'mdw-auto-revert)
@@ -717,6 +725,8 @@
   (global-set-key [?\C-c ?w ?j] 'windmove-down)
   (global-set-key [?\C-c ?w ?k] 'windmove-up)
   (global-set-key [?\C-c ?w ?l] 'windmove-right)
+  (global-set-key [?\C-c ?w ?r] 'winner-redo)
+  (global-set-key [?\C-c ?w ?u] 'winner-undo)
   (global-set-key [?\C-c ?w ?w] 'mdw-set-frame-width)
   (global-set-key [?\C-c ?w up] 'windmove-up)
   (global-set-key [?\C-c ?w down] 'windmove-down)