;; Load some other bits of code.
+;; Magic to make ELPA packages work.
+(trap
+(package-initialize)
+)
+
(maybe-autoload 'cc-mode "cc-mode" nil t)
(maybe-autoload 'rexx-mode "rexx-mode" nil t)
(maybe-autoload 'cvs-update "pcl-cvs" nil t)
(and (or window-system (mdw-emacs-version-p 23))
(not mdw-fast-startup)
+ (not (and (fboundp 'daemonp) (daemonp)))
(progn (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$")
edit-server-new-frame nil
gnuserv-frame t)
(trap (let ((warning-suppress-types
- (cons '(server) warning-suppress-types)))
+ (cons '(server)
+ (and (boundp 'warning-suppress-types)
+ warning-suppress-types))))
(server-start)))
(trap (progn
(require 'edit-server)
(setq sendmail-program "~/bin/sendmail-hack"
send-mail-function 'sendmail-send-it
mail-interactive t
+ mail-specify-envelope-from t
+ mail-envelope-from 'header
sendmail-error-reporting-interactive '("-odb" "-oee"))
(autoload 'sendmail-send-it "sendmail")
(autoload 'smtpmail-send-it "smtpmail")
(setq mail-user-agent 'message-user-agent
read-mail-command 'gnus)
-(setq message-signature-separator "^-- \\(\\|\\[mdw\\]\\)$"
+(setq message-signature-separator "^-- \\(\\[mdw\\]\\)?$"
message-yank-prefix "> "
message-yank-cited-prefix "> "
message-send-mail-function 'message-send-mail-with-sendmail
bbdb-north-american-phone-numbers-p nil
bbdb-dwim-net-address-allow-redundancy t
bbdb-extract-address-components-func 'bbdb-extract-address-components
+ bbdb-allow-duplicates t
bbdb/news-auto-create-p
(lambda ()
(let ((group gnus-newsgroup-name))
(and (string-match "^nn\\(imap\\|folder\\)\\+" group)
- (not (string-match ":\\(crap\\|spam\\|lists\\|corpus\\)\\."
+ (not (string-match (concat ":" "\\(" "\\(" "crap"
+ "\\|" "spam"
+ "\\|" "lists"
+ "\\|" "corpus"
+ "\\)" "\\."
+ "\\|" "Junk Email$"
+ "\\)")
group)))))
bbdb-user-mail-names
(concat "^"
"\\(" "\\(mdw\\|markw\\|root\\|postmaster\\)"
- "\\([-+][^@]*\\|\\)"
+ "\\([-+][^@]*\\)?"
"@\\(\\(dist\\|esc\\)orted\\.org\\.uk\\|odin\\.gg\\)"
"\\|" "\\(" "\\(mdw\\|mwooding\\)"
"\\(\\+[^@]*\\)?"
"\\|" "0" "\\(mdw\\|mwooding\\)" "k\\.[^@]*"
"\\)" "@"
"\\(chiark\\|slimy\\|coriolis\\)\\.greenend\\.org\\.uk"
- "\\|" "distorted\\.mdw@g\\(\\|oogle\\)mail.com"
+ "\\|" "distorted\\.mdw@g\\(oogle\\)?mail.com"
"\\|" "mwooding@\\(good\\|blackberry\\)\\.com"
"\\|" "mark\\.wooding@trustonic\\.com"
"\\)$")
;; Splash screen stuff.
-(or window-system
+(if (not mdw-splashy-startup)
(setq inhibit-splash-screen t
inhibit-startup-message t))
iswitchb-default-method 'samewindow ;in other random frames
ido-default-file-method 'selected-window
ido-default-buffer-method 'selected-window)
-(setq ido-emable-prefix t
+(setq ido-enable-prefix t
ido-enable-flex-matching t
ido-everywhere t
ido-confirm-unique-completion t
eshell-cmpl-cycle-completions nil)
(setq dired-deletion-confirmer ;Make deletion easier in dired
(symbol-function 'y-or-n-p)
- delete-by-moving-to-trash t
+ delete-by-moving-to-trash (mdw-emacs-version-p 24)
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 find-ls-option ;Build file lists efficiently
'("-print0 | xargs -0r ls -ld" . "ld"))
(setq bookmark-save-flag 0) ;Save bookmarks automatically
-(setq vc-follow-symlinks t)
+(setq vc-follow-symlinks t
+ vc-git-resolve-conflicts nil)
(setq x-gtk-file-dialog-help-text nil)
(setq use-dialog-box nil)
(setq Info-fontify-maximum-menu-size 100000)
(setq set-mark-command-repeat-pop t)
(setq password-cache-expiry nil)
+(setq mouse-autoselect-window t)
(setq-default proced-filter 'all
proced-sort 'user)
(setq ispell-program-name "aspell-hack"
(tooltip-mode 0)
(tool-bar-mode 0))
(trap (or mdw-fast-startup (global-auto-revert-mode t)))
-(setq psgml-html-build-new-buffer nil)
(defvar mdw-black-background t)
(define-key outline-mode-prefix-map [?\C-r] 'reveal-mode)
(define-key outline-mode-prefix-map [?\C--] 'mdw-outline-collapse-all)))
+(define-key isearch-mode-map [?\C-?] 'isearch-del-char)
+(define-key isearch-mode-map [backspace] 'isearch-del-char)
+(define-key isearch-mode-map [?\e ?\C-?] 'isearch-delete-char)
+
(setq imenu-auto-rescan t
imenu-auto-rescan-maxout (* 128 1024)
imenu-max-items 60)
(setq cltl2-root-url (mdw-config 'cltl-url))
(setq common-lisp-hyperspec-root (mdw-config 'hyperspec-url))
+(setq ediff-split-window-function 'split-window-horizontally)
+
(setq rfcview-rfc-location-pattern
"/ftp@mirror.distorted.org.uk:/pub/mirrors/rfc/rfc%s.txt"
rfcview-std-location-pattern
(display-time)
(column-number-mode 1)
(trap
- (if (and window-system (not mdw-fast-startup))
+ (if mdw-splashy-startup
(let ((calendar-view-diary-initially-flag t))
(calendar))))
;; Default frame size.
(setq frame-background-mode (if mdw-black-background 'dark 'light)
+ frame-inhibit-implied-resize t
default-frame-alist
- `((width . ,(+ mdw-column-width
- (if (>= emacs-major-version 21) 0 1)))
+ `((width . ,(+ mdw-column-width mdw-frame-width-fudge))
(height . 33)
(vertical-scroll-bars . right)
(cursor-type . bar)
;; Other frame fiddling.
-(setq frame-title-format '("" invocation-name "@" system-name ": %b"))
+(defvar mdw-hostname
+ (if (string-match "\\." system-name)
+ (substring system-name 0 (match-beginning 0))
+ system-name))
+(setq frame-title-format '("Emacs " user-login-name "@" mdw-hostname " – %b")
+ icon-title-format frame-title-format)
;; Global keymap changes.
(windmove-default-keybindings))
(setq windmove-wrap-around t)
(trap (require 'ido) (ido-mode 1)
- (require 'ido-ubiquitous) (ido-ubiquitous-mode 1)
- (setq ido-cr+-max-items nil
- ido-ubiquitous-command-overrides
- (append ido-ubiquitous-command-overrides
- `((enable-old regexp ,(concat "\\`"
- "gtags-find-"
- "\\(" "tag"
- "\\|file"
- "\\|rtag"
- "\\|symbol"
- "\\)"
- "\\(" "\\|-other-window"
- "\\)"
- "\\'")))))
+ (require 'ido-completing-read+)
+ (unless (fboundp 'ido-ubiquitous-mode) (require 'ido-ubiquitous))
+ (ido-ubiquitous-mode 1)
+ (setq ido-cr+-max-items nil)
+ (let ((excludes `(,(concat "\\`"
+ "gtags-find-"
+ "\\(" "tag"
+ "\\|file"
+ "\\|rtag"
+ "\\|symbol"
+ "\\)"
+ "\\(" "\\|-other-window"
+ "\\)"
+ "\\'"))))
+ (if (boundp 'ido-ubiquitous-command-overrides)
+ (setq ido-ubiquitous-command-overrides
+ (append ido-ubiquitous-command-overrides
+ (mapcar (lambda (exclude)
+ (if (symbolp exclude)
+ `(enable-old exact
+ ,(symbol-name exclude))
+ `(enable-old regexp ,exclude)))
+ excludes)))
+ (setq ido-cr+-function-blacklist
+ (append ido-cr+-function-blacklist excludes))))
(setq magit-completing-read-function 'magit-ido-completing-read)
(require 'smex) (smex-initialize) (global-set-key [?\M-x] 'smex))
(global-set-key [?\e ?\e] 'mdw-wrong)
(global-set-key [?\e ?\C-\] ?\C-\]] 'keyboard-escape-quit)
(global-set-key [?\C-c ?\M-x] 'execute-extended-command)
- (global-set-key [?\C-c ?d ?w] 'devhelp-word-at-point)
(global-set-key [?\C-c ?d ?a] 'devhelp-assistant-word-at-point)
+ (global-set-key [?\C-c ?d ?w] 'devhelp-word-at-point)
(global-set-key [?\C-c ?g ?a] 'org-agenda)
(global-set-key [?\C-c ?g ?b] 'org-iswitchb)
(global-set-key [?\C-c ?g ?l] 'org-store-link)
(global-set-key [?\C-c ?t ?s] 'timeclock-status-string)
(global-set-key [?\C-c ?t ?t] 'gtags-find-tag-from-here)
(global-set-key [?\C-c ?t ?w] 'timeclock-workday-remaining-string)
+ (global-set-key [?\C-c ?v ?i] 'vm-visit-imap-folder)
+ (global-set-key [?\C-c ?v ?m] 'vm-visit-folder)
(global-set-key [?\C-c ?v ?v] 'mdw-auto-revert)
(global-set-key [?\C-c ?w ?d] 'mdw-divvy-window)
(global-set-key [?\C-c ?w ?h] 'windmove-left)
(global-set-key [?\C-c ?w left] 'windmove-left)
(global-set-key [?\C-c ?w right] 'windmove-right)
(global-set-key [?\C-h ?\C-m] 'manual-entry)
+ (global-set-key [?\C-x ?4 ?\C-j] 'dired-jump-other-window)
+ (global-set-key [?\C-x ?4 ?j] 'dired-jump-other-window)
+ (global-set-key [?\C-x ?\C-j] 'dired-jump)
(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)
try-expand-list-all-buffers)))
hippie-expand-try-functions-list)))
+(autoload 'dired-jump "dired-x")
+(autoload 'dired-jump-other-window "dired-x")
+
(eval-after-load "dired"
'(progn
(or (lookup-key dired-mode-map [?\C-x ?\C-q])
(make-variable-buffer-local 'mdw-auto-indent)
-(mapc (lambda (hook) (add-hook hook 'mdw-misc-mode-config))
- '(c-mode-hook c++-mode-hook objc-mode-hook java-mode-hook
- csharp-mode-hook perl-mode-hook cperl-mode-hook dylan-mode-hook
- python-mode-hook pyrec-mode-hook icon-mode-hook awk-mode-hook
- tcl-mode-hook go-mode-hook js-mode-hook javascript-mode-hook
- conf-mode-hook m4-mode-hook autoconf-mode-hook autotest-mode-hook
- a68-mode-hook a68-mode-hooks asm-mode-hook fsharp-mode-hook
- scala-mode-hook rust-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
- lisp-mode-hook lisp-interaction-mode-hook makefile-mode-hook
- inferior-lisp-mode-hook slime-repl-mode-hook ielm-mode-hook
- sml-mode-hook haskell-mode-hook erlang-mode-hook
- smalltalk-mode-hook rexx-mode-hook lua-mode-hook
- arm-assembler-mode-hook))
-
(global-font-lock-mode t)
;;;--------------------------------------------------------------------------
((executable-find "sudo") "sudo")
(t "su")))
(this-host (concat "\\`\\(localhost\\|"
- (system-name) "\\|\\)\\'"))
+ (system-name) "\\)?\\'"))
(this-user (concat "\\`\\(" (user-login-name) "\\|"
- (user-real-login-name) "\\|\\)\\'")))
+ (user-real-login-name) "\\)?\\'")))
(setq tramp-default-method-alist
`((,this-host nil ,rootlyness)
(nil ,this-user "ssh")
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 'asm-mode-hook 'mdw-fontify-asm t)
- (add-hook 'go-mode-hook 'mdw-fontify-go t)
- (add-hook 'rust-mode-hook 'mdw-fontify-rust t)
-
- (add-hook 'lua-mode-hook 'mdw-fontify-lua 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 'scala-mode-hook 'mdw-fontify-scala t)
- (add-hook 'js-mode-hook 'mdw-fontify-javascript t)
- (add-hook 'csharp-mode-hook 'mdw-fontify-csharp t)
- (add-hook 'fsharp-mode-hook 'mdw-fontify-fsharp t)
- (add-hook 'inferior-fsharp-mode-hooks 'mdw-fontify-inferior-fsharp 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
- python-indent 2
- python-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
- 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)
-(setq-default haskell-indent-offset 2)
-
-(add-hook 'erlang-mode-hook 'mdw-fontify-erlang t)
-
-(add-hook 'texinfo-mode-hook 'mdw-fontify-texinfo t)
-(add-hook 'TeXinfo-mode-hook 'mdw-fontify-texinfo t)
-
-(setq LaTeX-table-label "tbl:")
-(setq TeX-auto-untabify nil)
-(add-hook 'TeX-mode-hook 'mdw-fontify-tex t)
-(add-hook 'tex-mode-hook 'mdw-fontify-tex t)
-(add-hook 'LaTeX-mode-hook 'mdw-fontify-tex t)
-(add-hook 'latex-mode-hook 'mdw-fontify-tex t)
-
-(add-hook 'sh-mode-hook #'mdw-setup-sh-script-mode)
-(add-hook 'autoconf-mode-hook #'mdw-setup-m4)
-(add-hook 'autotest-mode-hook #'mdw-setup-m4)
-(add-hook 'm4-mode-hook #'mdw-setup-m4)
-
-(add-hook 'smalltalk-mode-hook 'mdw-fontify-smalltalk t)
-(add-hook 'smalltalk-mode-hook 'mdw-setup-smalltalk t)
-
-(add-hook 'a68-mode-hook 'mdw-fontify-algol-68 t)
-(add-hook 'a68-mode-hooks 'mdw-fontify-algol-68 t)
-(add-hook 'dylan-mode-hook 'mdw-fontify-dylan t)
-
-(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 'ielm-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))
-
-(add-hook 'text-mode-hook 'mdw-text-mode t)
-
-;;;--------------------------------------------------------------------------
-;;; TeX stuff.
-
-(setq TeX-output-view-style
- '(("^dvi$"
- ("^landscape$" "^pstricks$\\|^pst-\\|^psfrag$")
- "%(o?)dvips -t landscape %d -o && xdg-open %f")
- ("^dvi$" "^pstricks$\\|^pst-\\|^psfrag$"
- "%(o?)dvips %d -o && xdg-open %f")
- ("^dvi$"
- ("^a4\\(?:dutch\\|paper\\|wide\\)\\|sem-a4$" "^landscape$")
- "%(o?)xdvi %dS -paper a4r -s 0 %d")
- ("^dvi$" "^a4\\(?:dutch\\|paper\\|wide\\)\\|sem-a4$"
- "%(o?)xdvi %dS -paper a4 %d")
- ("^dvi$"
- ("^a5\\(?:comb\\|paper\\)$" "^landscape$")
- "%(o?)xdvi %dS -paper a5r -s 0 %d")
- ("^dvi$" "^a5\\(?:comb\\|paper\\)$" "%(o?)xdvi %dS -paper a5 %d")
- ("^dvi$" "^b5paper$" "%(o?)xdvi %dS -paper b5 %d")
- ("^dvi$" "^letterpaper$" "%(o?)xdvi %dS -paper us %d")
- ("^dvi$" "^legalpaper$" "%(o?)xdvi %dS -paper legal %d")
- ("^dvi$" "^executivepaper$" "%(o?)xdvi %dS -paper 7.25x10.5in %d")
- ("^dvi$" "." "%(o?)xdvi %dS %d")
- ("^pdf$" "." "xdg-open %o")
- ("^html?$" "." "sensible-browser %o")))
-
-(setq TeX-view-program-list
- '(("mupdf" ("mupdf %o" (mode-io-correlate " %(outpage)")))))
-
-(setq TeX-view-program-selection
- '(((output-dvi style-pstricks) "dvips and gv")
- (output-dvi "xdvi")
- (output-pdf "mupdf")
- (output-html "sensible-browser")))
-
-(setq TeX-open-quote "\""
- TeX-close-quote "\"")
-
-(setq reftex-use-external-file-finders t
- reftex-auto-recenter-toc t)
-
-(setq reftex-label-alist
- '(("theorem" ?T "th:" "~\\ref{%s}" t ("theorems?" "th\\.") -2)
- ("axiom" ?A "ax:" "~\\ref{%s}" t ("axioms?" "ax\\.") -2)
- ("definition" ?D "def:" "~\\ref{%s}" t ("definitions?" "def\\.") -2)
- ("proposition" ?P "prop:" "~\\ref{%s}" t
- ("propositions?" "prop\\.") -2)
- ("lemma" ?L "lem:" "~\\ref{%s}" t ("lemmas?" "lem\\.") -2)
- ("example" ?X "eg:" "~\\ref{%s}" t ("examples?") -2)
- ("exercise" ?E "ex:" "~\\ref{%s}" t ("exercises?" "ex\\.") -2)
- ("enumerate" ?i "i:" "~\\ref{%s}" item ("items?"))))
-(setq reftex-section-prefixes
- '((0 . "part:")
- (1 . "ch:")
- (t . "sec:")))
-
-(setq bibtex-field-delimiters 'double-quotes
- bibtex-entry-format '(realign opts-or-alts required-fields
- numerical-fields last-comma delimiters
- unify-case)
- bibtex-include-OPTkey nil)
-
-;;;--------------------------------------------------------------------------
-;;; SLIME setup.
-
-(trap
- (if (not mdw-fast-startup)
- (progn
- (require 'slime-autoloads)
- (slime-setup '(slime-autodoc slime-c-p-c)))))
-
-(let ((stuff '((cmucl ("cmucl"))
- (sbcl ("sbcl") :coding-system utf-8-unix)
- (clisp ("clisp") :coding-system utf-8-unix))))
- (or (boundp 'slime-lisp-implementations)
- (setq slime-lisp-implementations nil))
- (while stuff
- (let* ((head (car stuff))
- (found (assq (car head) slime-lisp-implementations)))
- (setq stuff (cdr stuff))
- (if found
- (rplacd found (cdr head))
- (setq slime-lisp-implementations
- (cons head slime-lisp-implementations))))))
-(setq slime-default-lisp 'sbcl)
+;; Late, for `mdw-black-background'.
+(setq-default py-python-command-args
+ `("-i" "-colors" ,(if mdw-black-background "Linux" "LightBG")))
;;;--------------------------------------------------------------------------
;;; Blogging.
(setq shell-prompt-pattern "^[^]#$%>»}\n]*\\([]#$%»}]\\|>>?\\) *")
(setq comint-password-prompt-regexp
(concat "\\(\\([Ee]nter \\|[Oo]ld \\|[Nn]ew \\|[a-zA-Z0-9_]*'s \\|^\\)"
- "[Pp]assword\\|[Pp]ass ?phrase\\(\\| [-a-zA-Z0-9._]+\\)\\):")
+ "[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)
~mdw / profile / blobdiff