(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)))
(setq sendmail-program "~/bin/sendmail-hack")
-(setq mail-user-agent 'message-user-agent)
+(setq mail-user-agent 'message-user-agent
+ read-mail-command 'gnus)
(setq message-signature-separator "^-- \\(\\|\\[mdw\\]\\)$"
message-yank-prefix "> "
message-yank-cited-prefix "> "
(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
iswitchb-default-method 'samewindow) ;in other random frames
(setq dired-deletion-confirmer ;Make deletion easier in dired
- (symbol-function 'y-or-n-p))
+ (symbol-function 'y-or-n-p)
+ dired-listing-switches "-alF" ;Do `ls -F' things in dired windows
+ wdired-allow-to-change-permissions 'advanced)
(setq read-quoted-char-radix 16) ;C-q HEX-STUFF [RET]
-(setq dired-listing-switches "-alF") ;Do `ls -F' things in dired windows
-(setq wdired-allow-to-change-permissions t)
(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-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
(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"
(setq display-time-24hr-format t)
(display-time)
+(column-number-mode 1)
(trap
(if window-system
(let ((view-diary-entries-initially t))
(cursor-color . "red"))
(if mdw-black-background
'((background-mode . dark))
- '((background-mode . light)))
- (and (eq window-system 'pm)
- '((font . "-os2-System VIO-medium-r-normal--*-40-*-*-m-*-cp850")
- (menu-font . "8.Helv")
- (background-color . "lightgrey")))
- default-frame-alist))
+ '((background-mode . light)))))
+(setq window-system-default-frame-alist
+ '((pm (font . "-os2-System VIO-medium-r-normal--*-40-*-*-m-*-cp850")
+ (menu-font . "8.Helv")
+ (background-color . "lightgrey"))
+ (nil (menu-bar-lines . 0))))
;; Other frame fiddling.
(eval-after-load "dired"
'(progn
- (define-key dired-mode-map [?\C-x ?\C-q]
- 'wdired-change-to-wdired-mode)))
+ (or (lookup-key dired-mode-map [?\C-x ?\C-q])
+ (define-key dired-mode-map [?\C-x ?\C-q]
+ 'wdired-change-to-wdired-mode))
+ (and (fboundp 'dired-do-relsymlink)
+ (define-key dired-mode-map [?\C-c ?\C-s] 'dired-do-relsymlink))))
(add-hook 'org-mode-hook
#'(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.
(setq completion-ignored-extensions
(append `(".hc" ".hi") completion-ignored-extensions))
+(dolist (dir (remove-if-not (lambda (ext)
+ (= (aref ext (- (length ext) 1)) ?/))
+ completion-ignored-extensions))
+ (if (/= (aref dir 0) ?/)
+ (setq completion-ignored-extensions
+ (cons (concat "/" dir)
+ (remove dir completion-ignored-extensions)))))
;; Some common local definitions.
;;; Rootly editingness.
(eval-after-load "tramp"
- '(progn
+ '(let ((fix-args (if (mdw-version-< tramp-version "2.1")
+ #'append #'list)))
(setq tramp-methods
(mdw-uniquify-alist
`(("become"
(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)
,@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")))))))
;; 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\\):"))
~mdw / profile / blobdiff