X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/43036e3a122c0c60f70907bec8dc71c5bca39031..47a5be0d6acb3d4d786162f83ae1443fd5b054ae:/dot/emacs diff --git a/dot/emacs b/dot/emacs index 4401cc6..b2c35ec 100644 --- a/dot/emacs +++ b/dot/emacs @@ -55,6 +55,7 @@ (and (library-exists-p "vc-git") (not (memq 'GIT vc-handled-backends)) (not (memq 'Git vc-handled-backends)) + (not (memq 'git vc-handled-backends)) (setq vc-handled-backends (cons 'GIT vc-handled-backends))) (trap (or mdw-fast-startup (require 'p4))) @@ -202,7 +203,11 @@ (setq-default fill-column 77) ;I use rather narrow windows (setq-default comment-column 40) ;Set a standard comment column (setq-default truncate-partial-width-windows nil) -(setq woman-use-own-frame nil) ;Keep man pages somewhere sensible +(setq default-indicate-empty-lines t) +(setq whitespace-style + '(trailing space-before-tab space-after-tab empty indentation)) +(setq woman-use-own-frame nil ;Keep man pages somewhere sensible + woman-fill-column 72) ;Right margin position. (setq diff-switches "-u" ;I like reading unified diffs cvs-diff-flags (list diff-switches)) (setq echo-keystrokes 10) ;Long delay before keystrokes echo @@ -508,7 +513,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" @@ -518,13 +524,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) @@ -532,7 +539,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"))))))) @@ -719,7 +726,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\\):"))