X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/ad191f4eb0a643961acfd7cee6e558fef9236eab..c60cbbe8c902c3bd56a093e5479de4f7855e464f:/dot/emacs diff --git a/dot/emacs b/dot/emacs index fe5b563..faae519 100644 --- a/dot/emacs +++ b/dot/emacs @@ -23,6 +23,7 @@ (setq load-path (nconc load-path (list "~/lib/emacs"))) (require 'dot-emacs) +(require 'cl) ;;;-------------------------------------------------------------------------- ;;; Some random initialisation. @@ -45,7 +46,7 @@ (add-to-list 'auto-mode-alist `(,(concat "/debian/" "\\(" - "[" "[:lower:][:digit:]]" + "[" "[:lower:][:digit:]]" "[[:lower:][:digit:].+-" "]+" "\\." "\\)?" @@ -54,15 +55,21 @@ (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))) -(and (library-exists-p "quilt") - (not mdw-fast-startup) - (load "quilt")) + +(trap (or mdw-fast-startup (require 'p4))) (trap (or mdw-fast-startup (require 'tex-site))) -(trap (or mdw-fast-startup (semantic-load-enable-minimum-features))) +(trap (or mdw-fast-startup t (semantic-load-enable-code-helpers))) (setq semanticdb-default-save-directory "~/.emacs.d/semanticdb/") +(eval-after-load "senator" + '(setq isearch-mode-hook + (remq 'senator-isearch-mode-hook isearch-mode-hook) + isearch-mode-end-hook + (remq 'senator-isearch-mode-hook isearch-mode-end-hook))) ;; Skeleton stuff. @@ -86,9 +93,17 @@ ;; Emacs server behaviour. -(and window-system - (trap (gnuserv-start) - (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$")))) +(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 (progn + (require 'edit-server) + (edit-server-start) + (let ((edit (get-process "edit-server"))) + (and edit + (set-process-query-on-exit-flag edit nil))))))) ;; Control backup behaviour. @@ -112,20 +127,23 @@ ;; ---- Some mail and news configuration --- -(setq mail-from-style 'parens) -(setq mail-signature t) -(setq mail-yank-prefix "> ") -(setq mail-archive-file-name "~/Mail/sent") +(setq mail-from-style 'parens + mail-signature t + mail-yank-prefix "> " + mail-archive-file-name "~/Mail/sent" + compose-mail-user-agent-warnings nil) (setq rmail-display-summary t) (setq rmail-file-name "~/Mail/rmail") (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 "> " + message-send-mail-function 'message-send-mail-with-sendmail message-indent-citation-function '(message-indent-citation mdw-trim-spaces-after-citing)) @@ -186,22 +204,29 @@ (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 @@ -212,9 +237,15 @@ (setq x-gtk-file-dialog-help-text nil) (setq Info-fontify-maximum-menu-size 100000) (setq set-mark-command-repeat-pop t) -(setq ispell-program-name "aspell" +(setq password-cache-expiry nil) +(setq-default proced-filter 'all + proced-sort 'user) +(setq ispell-program-name "aspell-hack" ispell-local-dictionary "en_GB-ize-w_accents" flyspell-default-dictionary "en_GB-ize-w_accents" + ispell-local-dictionary-alist + '(("en_GB-ize-w_accents" "[[:alpha:]]" "[^[:alpha:]]" "'" t + ("-d" "en_GB-ize-w_accents") nil utf-8)) ispell-silently-savep t) (trap (require 'uniquify) @@ -250,10 +281,19 @@ (setq url-cookie-untrusted-urls '(".")) (setq browse-url-browser-function (mdw-good-url-browser) + browse-url-generic-program "mdw-chrome" browse-url-mozilla-program "firefox") (setq w3m-default-display-inline-images t) +(eval-after-load "w3m" + '(let ((entries '(("application/pdf" "\\.pdf\\'" ("evince" file) nil) + ("application/x-pdf" "\\.pdf\\'" ("evince" file) nil)))) + (dolist (e entries) + (setq w3m-content-type-alist + (cons e (remove* (car e) w3m-content-type-alist + :key #'car :test #'string=)))))) + (setq w3-do-incremental-display t w3-use-menus '(file edit view go bookmark options buffers style search emacs nil help) @@ -313,8 +353,12 @@ ;; Cosmetic stuff. +(setq calendar-view-diary-initially-flag t + calendar-view-holidays-initially-flag t) + (setq display-time-24hr-format t) (display-time) +(column-number-mode 1) (trap (if window-system (let ((view-diary-entries-initially t)) @@ -359,25 +403,21 @@ (mdw-uniquify-alist '((width . 78) (height . 33) - (vertical-scroll-bars . right)) - (and window-system - '((cursor-type . bar) - (cursor-blink . t) - (left-fringe . 5) - (right-fringe . 5) - (scroll-bar-width . 15))) - '((cursor-color . "red")) + (vertical-scroll-bars . right) + (cursor-type . bar) + (cursor-blink . t) + (left-fringe . 5) + (right-fringe . 5) + (scroll-bar-width . 15) + (cursor-color . "red")) (if mdw-black-background - '((background-color . "black") - (foreground-color . "white") - (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"))) - '((transparency . t)) - default-frame-alist)) + '((background-mode . dark)) + '((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. @@ -389,49 +429,75 @@ (windmove-default-keybindings)) (setq windmove-wrap-around t) (trap (iswitchb-mode)) -(global-set-key [?\C-x ?w left] 'windmove-left) -(global-set-key [?\C-x ?w ?h] 'windmove-left) -(global-set-key [?\C-x ?w up] 'windmove-up) -(global-set-key [?\C-x ?w ?k] 'windmove-up) -(global-set-key [?\C-x ?w down] 'windmove-down) -(global-set-key [?\C-x ?w ?j] 'windmove-down) -(global-set-key [?\C-x ?w right] 'windmove-right) -(global-set-key [?\C-x ?w ?l] 'windmove-right) -(global-set-key [?\C-x ?g ?l] 'org-store-link) -(global-set-key [?\C-x ?g ?a] 'org-agenda) -(global-set-key [?\C-x ?g ?b] 'org-iswitchb) -(global-set-key [?\C-x ?t ?i] 'timeclock-in) -(global-set-key [?\C-x ?t ?c] 'timeclock-change) -(global-set-key [?\C-x ?t ?o] 'timeclock-out) -(global-set-key [?\C-x ?t ?r] 'timeclock-reread-log) -(global-set-key [?\C-x ?t ?w] 'timeclock-workday-remaining-string) -(global-set-key [?\C-x ?t ?s] 'timeclock-status-string) -(global-set-key [?\C-x ?t ?p] 'nc-timesheet-prepare) -(global-set-key [?\C-x ?t ?\C-m] 'nc-timesheet-submit) -(global-set-key [?\M-#] 'calc-dispatch) -(global-set-key [?\C-x ?/] 'auto-fill-mode) -(global-set-key [?\C-x ?w ?d] 'mdw-divvy-window) -(global-set-key [insertchar] 'overwrite-mode) -(global-set-key [?\C-x ?\C-n] 'skel-create-file) -(global-set-key [?\C-x ?4 ?n] 'skel-create-file-other-window) -(global-set-key [?\C-x ?5 ?n] 'skel-create-file-other-frame) -(global-set-key [delete] 'delete-char) -(global-set-key [?\M-q] 'mdw-fill-paragraph) -(global-set-key [?\C-h ?\C-m] 'manual-entry) -(global-set-key [C-M-backspace] 'backward-kill-sexp) -(global-set-key [mode-line C-mouse-1] 'mouse-tear-off-window) -(global-set-key [vertical-scroll-bar C-down-mouse-1] - 'mouse-drag-vertical-line) -(global-set-key [vertical-scroll-bar C-mouse-1] - #'(lambda () (interactive))) -(global-set-key [XF86WakeUp] "") -(and (not mdw-fast-startup) (fboundp 'hippie-expand) - (global-set-key [?\M-/] 'hippie-expand)) +(progn + (global-set-key [?\C-x ?w left] 'windmove-left) + (global-set-key [?\C-x ?w ?h] 'windmove-left) + (global-set-key [?\C-x ?w up] 'windmove-up) + (global-set-key [?\C-x ?w ?k] 'windmove-up) + (global-set-key [?\C-x ?w down] 'windmove-down) + (global-set-key [?\C-x ?w ?j] 'windmove-down) + (global-set-key [?\C-x ?w right] 'windmove-right) + (global-set-key [?\C-x ?w ?l] 'windmove-right) + (global-set-key [?\C-x ?g ?l] 'org-store-link) + (global-set-key [?\C-x ?g ?a] 'org-agenda) + (global-set-key [?\C-x ?g ?b] 'org-iswitchb) + (global-set-key [?\C-x ?t ?i] 'timeclock-in) + (global-set-key [?\C-x ?t ?c] 'timeclock-change) + (global-set-key [?\C-x ?t ?o] 'timeclock-out) + (global-set-key [?\C-x ?t ?r] 'timeclock-reread-log) + (global-set-key [?\C-x ?t ?w] 'timeclock-workday-remaining-string) + (global-set-key [?\C-x ?t ?s] 'timeclock-status-string) + (global-set-key [?\C-x ?t ?p] 'nc-timesheet-prepare) + (global-set-key [?\C-x ?t ?\C-m] 'nc-timesheet-submit) + (global-set-key [?\C-x ?3] 'mdw-split-window-horizontally) + (global-set-key [?\M-#] 'calc-dispatch) + (global-set-key [?\C-x ?/] 'auto-fill-mode) + (global-set-key [?\C-x ?w ?d] 'mdw-divvy-window) + (global-set-key [insertchar] 'overwrite-mode) + (global-set-key [?\C-x ?\C-n] 'skel-create-file) + (global-set-key [?\C-x ?4 ?n] 'skel-create-file-other-window) + (global-set-key [?\C-x ?5 ?n] 'skel-create-file-other-frame) + (global-set-key [delete] 'delete-char) + (global-set-key [?\M-q] 'mdw-fill-paragraph) + (global-set-key [?\C-h ?\C-m] 'manual-entry) + (global-set-key [C-M-backspace] 'backward-kill-sexp) + (global-set-key [mode-line C-mouse-1] 'mouse-tear-off-window) + (global-set-key [vertical-scroll-bar C-down-mouse-1] + 'mouse-drag-vertical-line) + (global-set-key [vertical-scroll-bar C-mouse-1] + #'(lambda () (interactive))) + (global-set-key [XF86WakeUp] "") + (and (not mdw-fast-startup) (fboundp 'hippie-expand) + (global-set-key [?\M-/] 'hippie-expand))) + +(eval-after-load "dired" + '(progn + (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))) + +;; Minor mode listing + +(setq minor-mode-alist + (mdw-uniquify-alist '((reveal-mode (hs-minor-mode + " hs/r" + (global-reveal-mode + "" " Reveal"))) + (hs-minor-mode (reveal-mode "" " hs")) + (abbrev-mode "") + (gtags-mode "")) + minor-mode-alist)) ;; Recognising types of files. @@ -440,6 +506,7 @@ ("\\.m$" . objc-mode) ("\\.mxd$" . c-mode) ("\\.cs$" . csharp-mode) + ("\\.go$" . go-mode) ("\\.org$" . org-mode) ;; ("/[ch]/" . c-mode) (,(concat "/\\(" @@ -476,6 +543,13 @@ (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. @@ -485,7 +559,7 @@ '(c-mode-hook c++-mode-hook objc-mode-hook java-mode-hook csharp-mode-hook perl-mode-hook cperl-mode-hook python-mode-hook pyrec-mode-hook icon-mode-hook awk-mode-hook - tcl-mode-hook + tcl-mode-hook go-mode-hook asm-mode-hook TeX-mode-hook LaTeX-mode-hook TeXinfo-mode-hook tex-mode-hook latex-mode-hook texinfo-mode-hook emacs-lisp-mode-hook scheme-mode-hook @@ -502,7 +576,8 @@ ;;; 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" @@ -512,28 +587,35 @@ (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-remote-sh "/bin/sh")) ,@tramp-methods))) - (setq tramp-multi-connection-function-alist - (mdw-uniquify-alist - '(("bc" tramp-multi-connect-su "become TERM=dumb %u%n")) - '(("r" tramp-multi-connect-su "really -u %u%n")) - tramp-multi-connection-function-alist)) (setq tramp-default-method "ssh") - (setq tramp-default-method-alist - `(("\\`localhost\\'" "" - ,(cond ((executable-find "become") "become") - ((executable-find "really") "really") - (t "su"))))))) + (let ((rootlyness (cond ((executable-find "really") "really") + ((executable-find "become") "become") + ((executable-find "sudo") "sudo") + (t "su"))) + (this-host (concat "\\`\\(localhost\\|" + (system-name) "\\|\\)\\'")) + (this-user (concat "\\`\\(" (user-login-name) "\\|" + (user-real-login-name) "\\|\\)\\'"))) + (setq tramp-default-method-alist + `((,this-host nil ,rootlyness) + (nil ,this-user "ssh") + (nil "." ,rootlyness))) + (setq tramp-default-proxies-alist + `((,this-host nil nil) + (nil "." "/ssh:%h:")))))) ;;;-------------------------------------------------------------------------- ;;; General fontification. @@ -543,52 +625,51 @@ (and (fboundp 'lazy-lock-mode) (setq font-lock-support-mode 'lazy-lock-mode)) ; (setq lazy-lock-defer-contextually t) -(setq lazy-lock-defer-time nil) -(setq font-lock-maximum-decoration 3) -(setq lazy-lock-minimum-size 0) -(setq lazy-lock-stealth-time 5) -(setq lazy-lock-stealth-lines 100) -(setq lazy-lock-stealth-verbose t) - -(add-hook 'after-make-frame-functions 'mdw-do-set-font) -(add-hook 'term-setup-hook (lambda () (mdw-do-set-font (selected-frame)))) -(add-hook 'window-setup-hook (lambda () (mdw-do-set-font (selected-frame)))) - -(add-hook 'c-mode-hook 'mdw-fontify-c-and-c++ t) -(add-hook 'objc-mode-hook 'mdw-fontify-c-and-c++ t) -(add-hook 'c++-mode-hook 'mdw-fontify-c-and-c++ t) -(add-hook 'linux-c-mode-hook #'(lambda () (setq c-basic-offset 8))) -(add-hook 'asm-mode-hook 'mdw-fontify-asm t) - -(add-hook 'icon-mode-hook 'mdw-fontify-icon t) - -(add-hook 'apcalc-mode-hook 'mdw-misc-mode-config t) -(add-hook 'apcalc-mode-hook 'mdw-fontify-apcalc t) - -(add-hook 'java-mode-hook 'mdw-fontify-java t) -(add-hook 'csharp-mode-hook 'mdw-fontify-csharp t) - -(add-hook 'awk-mode-hook 'mdw-fontify-awk t) - -(add-hook 'perl-mode-hook 'mdw-fontify-perl t) -(add-hook 'cperl-mode-hook 'mdw-fontify-perl t) - -(setq-default py-indent-offset 2) -(add-hook 'python-mode-hook 'mdw-fontify-python t) -(add-hook 'pyrex-mode-hook 'mdw-fontify-pyrex t) -(setq py-python-command-args `("-i" "-colors" ,(if mdw-black-background - "Linux" - "LightBG"))) +(setq lazy-lock-defer-time nil + font-lock-maximum-decoration 3 + lazy-lock-minimum-size 0 + lazy-lock-stealth-time 5 + lazy-lock-stealth-lines 100 + lazy-lock-stealth-verbose t) + +(progn + (add-hook 'c-mode-hook 'mdw-fontify-c-and-c++ t) + (add-hook 'objc-mode-hook 'mdw-fontify-c-and-c++ t) + (add-hook 'c++-mode-hook 'mdw-fontify-c-and-c++ t) + (add-hook 'linux-c-mode-hook #'(lambda () (setq c-basic-offset 8))) + (add-hook 'asm-mode-hook 'mdw-fontify-asm t) + (add-hook 'go-mode-hook 'mdw-fontify-go t) + + (add-hook 'icon-mode-hook 'mdw-fontify-icon t) + + (add-hook 'apcalc-mode-hook 'mdw-misc-mode-config t) + (add-hook 'apcalc-mode-hook 'mdw-fontify-apcalc t) + + (add-hook 'java-mode-hook 'mdw-fontify-java t) + (add-hook 'csharp-mode-hook 'mdw-fontify-csharp t) + + (add-hook 'awk-mode-hook 'mdw-fontify-awk t) + + (add-hook 'perl-mode-hook 'mdw-fontify-perl t) + (add-hook 'cperl-mode-hook 'mdw-fontify-perl t)) + +(progn + (setq-default py-indent-offset 2 + py-python-command-args + `("-i" "-colors" ,(if mdw-black-background + "Linux" "LightBG"))) + (add-hook 'python-mode-hook 'mdw-fontify-python t) + (add-hook 'pyrex-mode-hook 'mdw-fontify-pyrex t)) (setq-default tcl-indent-level 2) (add-hook 'tcl-mode-hook 'mdw-fontify-tcl t) (add-hook 'rexx-mode-hook 'mdw-fontify-rexx t) -(setq sml-nested-if-indent t) -(setq sml-case-indent nil) -(setq sml-indent-level 4) -(setq sml-type-of-indent nil) +(setq sml-nested-if-indent t + sml-case-indent nil + sml-indent-level 4 + sml-type-of-indent nil) (add-hook 'sml-mode-hook 'mdw-fontify-sml t) (add-hook 'haskell-mode-hook 'mdw-fontify-haskell t) @@ -613,16 +694,17 @@ (add-hook 'smalltalk-mode-hook 'mdw-fontify-smalltalk t) (add-hook 'smalltalk-mode-hook 'mdw-setup-smalltalk t) -(add-hook 'emacs-lisp-mode-hook 'mdw-fontify-lispy t) -(add-hook 'scheme-mode-hook 'mdw-fontify-lispy t) -(add-hook 'lisp-mode-hook 'mdw-fontify-lispy t) -(add-hook 'inferior-lisp-mode-hook 'mdw-fontify-lispy t) -(add-hook 'lisp-interaction-mode-hook 'mdw-fontify-lispy t) -(add-hook 'slime-repl-mode-hook 'mdw-fontify-lispy t) -(add-hook 'lisp-mode-hook 'mdw-common-lisp-indent t) -(add-hook 'inferior-lisp-mode-hook +(progn + (add-hook 'emacs-lisp-mode-hook 'mdw-fontify-lispy t) + (add-hook 'scheme-mode-hook 'mdw-fontify-lispy t) + (add-hook 'lisp-mode-hook 'mdw-fontify-lispy t) + (add-hook 'inferior-lisp-mode-hook 'mdw-fontify-lispy t) + (add-hook 'lisp-interaction-mode-hook 'mdw-fontify-lispy t) + (add-hook 'slime-repl-mode-hook 'mdw-fontify-lispy t) + (add-hook 'lisp-mode-hook 'mdw-common-lisp-indent t) + (add-hook 'inferior-lisp-mode-hook #'(lambda () - (local-set-key "\C-m" 'comint-send-and-indent)) t) + (local-set-key "\C-m" 'comint-send-and-indent)) t)) (add-hook 'text-mode-hook 'mdw-text-mode t) @@ -652,6 +734,9 @@ ("^pdf$" "." "evince %o") ("^html?$" "." "netscape %o"))) +(setq TeX-open-quote "\"" + TeX-close-quote "\"") + (setq reftex-use-external-file-finders t reftex-auto-recenter-toc t) @@ -714,10 +799,12 @@ ;; Make the shell mode aware of my prompt. -(setq shell-prompt-pattern "^[^]#$%>»}\n]*[]#$%>»}] *") +(setq shell-prompt-pattern "^[^]#$%>»}\n]*\\([]#$%»}]\\|>>?\\) *") (setq comint-password-prompt-regexp - (concat "\\(\\([Oo]ld \\|[Nn]ew \\|[a-zA-Z0-9_]*'s \\|^\\)" - "[Pp]assword\\|pass phrase\\):\\s *\\'")) + (concat "\\(\\([Ee]nter \\|[Oo]ld \\|[Nn]ew \\|[a-zA-Z0-9_]*'s \\|^\\)" + "[Pp]assword\\|[Pp]ass ?phrase\\(\\| [-a-zA-Z0-9._]+\\)\\):") + comint-file-name-chars "~/A-Za-z0-9+@:_.$#%,={}-" + shell-file-name-chars comint-file-name-chars) ;; Notice passwords, and make C-a work right.