X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=ian-dotfiles.git;a=blobdiff_plain;f=home%2Femacs%2Fian.el;h=e846da6b9b682bb624801980e96a42839b621d27;hp=0bc4a11896f168139c06d55297bd96f3c67ac037;hb=f22d3b792d7689ce773bdc76a680b37825679750;hpb=009a9b3c83362f21a23b262d7caaa7d157d12713

diff --git a/home/emacs/ian.el b/home/emacs/ian.el
index 0bc4a11..e846da6 100644
--- a/home/emacs/ian.el
+++ b/home/emacs/ian.el
@@ -10,7 +10,7 @@
 ; Un-disable narrow and eval-expression
 (put 'narrow-to-region 'disabled nil)
 (put 'eval-expression 'disabled nil)
-(standard-display-european t)
+;(standard-display-european t)
 ;
 (setq browse-url-netscape-program "mozilla")
 (setq common-lisp-hyperspec-root "/usr/share/doc/hyperspec/")
@@ -40,6 +40,8 @@
 (setq line-move-visual nil)
 (display-time)
 ;
+(set-default 'indent-line-function 'insert-tab)
+(set-default 'electric-indent-mode nil)
 (set-variable 'search-repeat-char 28)
 (set-fringe-mode (cons 0 nil))
 (if (string-match "^19\." emacs-version)
@@ -189,6 +191,8 @@
 ;(autoload 'vm-submit-bug-report "vm" "Send a bug report about VM." t)
 ;
 ;(require 'vm-autoload)
+
+(vm-legacy-key-bindings)
 ;
 ; (autoload 'info "info-fixed" "Patched info browser" t)
 (setq shell-mode-hook
@@ -436,27 +440,27 @@ then call send-and-exit."
           '(lambda ()
              (local-set-key "Q" 'vm-quit)
              (local-set-key "q" "###Q")))
-(add-hook 'mail-mode-hook
-          '(lambda ()
-             (if (and (boundp 'folder-buffer)
-                      folder-buffer
-                      (string= (buffer-file-name folder-buffer)
-                               (file-truename vm-sysadmin-inbox)))
-                 (progn
-                   (make-local-variable 'vm-mail-header-from)
-                   (setq vm-mail-header-from
-                         "sysadmin@chiark.greenend.org.uk (Ian Jackson)")
-                   (make-local-variable 'mail-archive-file-name)
-                   (setq mail-archive-file-name
-                         "~/mail/SOutbound")))))
-;
-;(defun vmi ()
+;(add-hook 'mail-mode-hook
+;          '(lambda ()
+;             (if (and (boundp 'folder-buffer)
+;                      folder-buffer
+;                      (string= (buffer-file-name folder-buffer)
+;                               (file-truename vm-sysadmin-inbox)))
+;                 (progn
+;                   (make-local-variable 'vm-mail-header-from)
+;                   (setq vm-mail-header-from
+;                         "sysadmin@chiark.greenend.org.uk (Ian Jackson)")
+;                   (make-local-variable 'mail-archive-file-name)
+;                   (setq mail-archive-file-name
+;                         "~/mail/SOutbound")))))
+;
+;;(defun vmi ()
 ;  (interactive)
 ;  (vm "/u/ijackson/mail/INBOX"))
 ;;
-(defun vms ()
-  (interactive)
-  (vm vm-sinbin-inbox))
+;(defun vms ()
+;  (interactive)
+;  (vm vm-sinbin-inbox))
 ;
 (defun make-session ()
   "Makes this emacs hard to kill by requiring ^X^Cy to kill it
@@ -466,20 +470,20 @@ instead of just ^X^C."
   (global-set-key "y" 'save-buffers-kill-emacs))
 ;
 ; Fix problems with M-| setting window title of emacs' parent xterm
-(defun envdelete-term-termcap-windowid (list)
-  (let ((l list))
-    (mapcar '(lambda (x)
-               (if x (delq x l)))
-            (mapcar '(lambda (x)
-                       (if (or (string-match "^TERM=" x)
-                               (string-match "^TERMCAP=" x)
-                               (string-match "^WINDOWID=" x))
-                           x
-                         nil))
-                    l))
-    l))
-(setq process-environment
-      (envdelete-term-termcap-windowid process-environment))
+;(defun envdelete-term-termcap-windowid (list)
+;  (let ((l list))
+;    (mapcar '(lambda (x)
+;               (if x (delq x l)))
+;            (mapcar '(lambda (x)
+;                       (if (or (string-match "^TERM=" x)
+;                               (string-match "^TERMCAP=" x)
+;                               (string-match "^WINDOWID=" x))
+;                           x
+;                         nil))
+;                    l))
+;    l))
+;(setq process-environment
+;      (envdelete-term-termcap-windowid process-environment))
 ;
 (defun add-insertion-keys (table)
   "Adds keybindings according to TABLE.  Each element of
@@ -535,4 +539,38 @@ The citation string is taken from cite-string."
            (> (point-max) (point)))
         (insert cite-string)))))
 ;
+;
+
+
+;; (defun hack-dir-local-variables ()
+;;   "Read per-directory local variables for the current buffer.
+;; Store the directory-local variables in `dir-local-variables-alist'
+;; and `file-local-variables-alist', without applying them."
+;;   (when (and enable-local-variables
+;; 	     (buffer-file-name))
+;;     ;; Find the variables file.
+;;     (let ((variables-file (dir-locals-find-file (buffer-file-name)))
+;; 	  (class nil)
+;; 	  (dir-name nil))
+;;       (cond
+;;        ((stringp variables-file)
+;; 	(setq dir-name (file-name-directory (buffer-file-name)))
+;; 	(setq class (dir-locals-read-from-file variables-file)))
+;;        ((consp variables-file)
+;; 	(setq dir-name (nth 0 variables-file))
+;; 	(setq class (nth 1 variables-file))))
+;;       (when class
+;; 	(let ((variables
+;; 	       (dir-locals-collect-variables
+;; 		(dir-locals-get-class-variables class) dir-name nil)))
+;; 	  (when variables
+;; 	    (dolist (elt variables)
+;; 	      (unless (memq (car elt) '(eval mode))
+;; 		(setq dir-local-variables-alist
+;; 		      (assq-delete-all (car elt) dir-local-variables-alist)))
+;; 	      (push elt dir-local-variables-alist))
+;; 	    (hack-local-variables-filter variables dir-name)))))))
+
+(delete ".git/" completion-ignored-extensions)
+
 ; End of this file.