(setq load-path (nconc load-path (list "~/lib/emacs")))
(require 'dot-emacs)
+(require 'cl)
;;;--------------------------------------------------------------------------
;;; Some random initialisation.
(add-to-list 'auto-mode-alist
`(,(concat "/debian/"
"\\("
- "[" "[:lower:][:digit:]]"
+ "[" "[:lower:][:digit:]]"
"[[:lower:][:digit:].+-" "]+"
"\\."
"\\)?"
(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)))
(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.
;; Emacs server behaviour.
(and (or window-system (>= emacs-major-version 23))
- (trap (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$"))
- (server-start)
- (gnuserv-start)))
+ (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.
(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))
(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 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)
(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)
;; 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))
(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.
(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)
(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)))
+
+;; 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.
("\\.m$" . objc-mode)
("\\.mxd$" . c-mode)
("\\.cs$" . csharp-mode)
+ ("\\.go$" . go-mode)
("\\.org$" . org-mode)
;; ("/[ch]/" . c-mode)
(,(concat "/\\("
(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.
'(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
;;; 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")))))))
(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)
;; 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\\):"))
+ "[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.