X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/4983780af98c0465162b06554cd55ffcd213cfcd..116259a9cc62b355034279896076d2383b5f27ad:/dot/emacs?ds=sidebyside

diff --git a/dot/emacs b/dot/emacs
index 2a7796a..6fe3a05 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -89,8 +89,12 @@
 
 (and (or window-system (>= emacs-major-version 23))
      (progn (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$")
+		  edit-server-new-frame nil
 		  gnuserv-frame t)
-	    (trap (server-start))))
+	    (trap (server-start))
+	    (trap (progn
+		    (require 'edit-server)
+		    (edit-server-start)))))
 
 ;; Control backup behaviour.
 
@@ -188,7 +192,10 @@
 
 (trap (resize-minibuffer-mode 1))	;Make minibuffer grow dynamically
 (auto-compression-mode 1)		;Enable automatic compression
+(setq enable-local-variables :safe
+      enable-local-eval nil)
 (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 display-buffer-reuse-frames nil	;Don't confuse me by showing buffers
@@ -218,6 +225,7 @@
 (setq x-gtk-file-dialog-help-text nil)
 (setq Info-fontify-maximum-menu-size 100000)
 (setq set-mark-command-repeat-pop t)
+(setq password-cache-expiry nil)
 (setq-default proced-filter 'all
 	      proced-sort 'user)
 (setq ispell-program-name "aspell"
@@ -442,6 +450,10 @@
 	  #'(lambda () (mdw-clobber-evil-keymap org-mode-map)))
 (add-hook 'org-agenda-mode-hook
 	  #'(lambda () (mdw-clobber-evil-keymap org-agenda-mode-map)))
+(or mdw-fast-startup
+    (progn
+      (org-remember-insinuate)
+      (global-set-key [?\C-c ?r] 'org-remember)))
 
 ;; Recognising types of files.
 
@@ -513,7 +525,8 @@
 ;;; Rootly editingness.
 
 (eval-after-load "tramp"
-  '(progn
+  '(let ((fix-args (if (mdw-version-< tramp-version "2.1")
+		       #'append #'identity)))
      (setq tramp-methods
 	   (mdw-uniquify-alist
 	    `(("become"
@@ -523,13 +536,14 @@
 	       (tramp-copy-program nil)
 	       (tramp-copy-args nil)
 	       (tramp-copy-keep-date-arg nil)
-	       (tramp-login-args (("TERM=dumb" "%u"))))
+	       (tramp-login-args ,(funcall fix-args `("TERM=dumb" "%u"))))
 	      ("really"
 	       (tramp-connection-function tramp-open-connection-su)
 	       (tramp-login-program "really")
-	       (tramp-login-args (("-u" "%u")
-				  ("--")
-				  ("env" "TERM=dumb" "/bin/sh")))
+	       (tramp-login-args ,(funcall fix-args
+					   `("-u" "%u")
+					   `("--")
+					   `("env" "TERM=dumb" "/bin/sh")))
 	       (tramp-copy-program nil)
 	       (tramp-copy-args nil)
 	       (tramp-copy-keep-date-arg nil)
@@ -537,7 +551,7 @@
 	      ,@tramp-methods)))
      (setq tramp-default-method "ssh")
      (setq tramp-default-method-alist
-	   `(("\\`localhost\\'" ""
+	   `(("\\`\\(localhost\\|\\)\\'" ""
 	      ,(cond ((executable-find "become") "become")
 		     ((executable-find "really") "really")
 		     (t "su")))))))
@@ -724,7 +738,7 @@
 
 ;; Make the shell mode aware of my prompt.
 
-(setq shell-prompt-pattern "^[^]#$%>»}\n]*[]#$%>»}] *")
+(setq shell-prompt-pattern "^[^]#$%>»}\n]*\\([]#$%»}]\\|>>?\\) *")
 (setq comint-password-prompt-regexp
       (concat "\\(\\([Ee]nter \\|[Oo]ld \\|[Nn]ew \\|[a-zA-Z0-9_]*'s \\|^\\)"
 	      "[Pp]assword\\|pass phrase\\):"))