Merge branch 'master' of metalzone:etc/profile

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index 9e1f688d6366ae9a87b1351bbf610f97e6d181d4..fe5b563333e847c561f2288702411ef1d7b76e96 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -24,11 +24,12 @@
 (setq load-path (nconc load-path (list "~/lib/emacs")))
 (require 'dot-emacs)
 
 (setq load-path (nconc load-path (list "~/lib/emacs")))
 (require 'dot-emacs)
 

-;;;----- Some random initialisation -----------------------------------------
+;;;--------------------------------------------------------------------------
+;;; Some random initialisation.

 
 (setq mdw-init-window (selected-window))
 
 
 (setq mdw-init-window (selected-window))
 

-;; --- Load some other bits of code ---
+;; Load some other bits of code.

 
 (maybe-autoload 'cc-mode "cc-mode" nil t)
 (maybe-autoload 'rexx-mode "rexx-mode" nil t)
 
 (maybe-autoload 'cc-mode "cc-mode" nil t)
 (maybe-autoload 'rexx-mode "rexx-mode" nil t)


@@ -63,17 +64,17 @@
 (trap (or mdw-fast-startup (semantic-load-enable-minimum-features)))
 (setq semanticdb-default-save-directory "~/.emacs.d/semanticdb/")
 
 (trap (or mdw-fast-startup (semantic-load-enable-minimum-features)))
 (setq semanticdb-default-save-directory "~/.emacs.d/semanticdb/")
 

-;; --- Skeleton stuff ---
+;; Skeleton stuff.

 
 (trap (or mdw-fast-startup (require 'skel-init)))
 
 
 (trap (or mdw-fast-startup (require 'skel-init)))
 

-;; --- Window system-dependent things ---
+;; Window system-dependent things.

 
 (require 'paren)
 (trap (show-paren-mode t))
 (or window-system (menu-bar-mode -1))
 
 
 (require 'paren)
 (trap (show-paren-mode t))
 (or window-system (menu-bar-mode -1))
 

-;; --- Temporary directory handling ---
+;; Temporary directory handling.

 
 (defun mdw-check-dir-exists (dir)
   (and dir
 
 (defun mdw-check-dir-exists (dir)
   (and dir


@@ -83,13 +84,13 @@
                 (mdw-check-dir-exists (format "/tmp/%s" (user-login-name)))
                 "/tmp"))
 
                 (mdw-check-dir-exists (format "/tmp/%s" (user-login-name)))
                 "/tmp"))
 

-;; --- Emacs server behaviour ---
+;; Emacs server behaviour.

 
 (and window-system
      (trap (gnuserv-start)
           (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$"))))
 
 
 (and window-system
      (trap (gnuserv-start)
           (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$"))))
 

-;; --- Control backup behaviour ---
+;; Control backup behaviour.

 
 (setq backup-by-copying nil)
 (setq backup-by-copying-when-linked t)
 
 (setq backup-by-copying nil)
 (setq backup-by-copying-when-linked t)


@@ -99,12 +100,12 @@
       '("/\\.git/COMMIT_EDITMSG$"
        "/\\.stgit\\(-edit\\.txt\\|msg\\.txt\\|\\.msg\\)$"))
 
       '("/\\.git/COMMIT_EDITMSG$"
        "/\\.stgit\\(-edit\\.txt\\|msg\\.txt\\|\\.msg\\)$"))
 

-;; --- Safe variables ---
+;; Safe variables.

 
 (setq safe-local-variable-values
       '((make-backup-files . nil)))
 
 
 (setq safe-local-variable-values
       '((make-backup-files . nil)))
 

-;; --- Calculator fiddling ---
+;; Calculator fiddling.

 
 (setq calc-settings-file "~/.emacs-calc")
 (load calc-settings-file)
 
 (setq calc-settings-file "~/.emacs-calc")
 (load calc-settings-file)


@@ -143,14 +144,14 @@
     (trap (bbdb-initialize 'gnus 'sendmail 'message)))
 (setq bbdb-north-american-phone-numbers-p nil)
 
     (trap (bbdb-initialize 'gnus 'sendmail 'message)))
 (setq bbdb-north-american-phone-numbers-p nil)
 

-;; --- Customization ---
+;; Customization.

 
 (setq custom-file "~/.emacs-custom")
 (trap (load custom-file))
 
 (trap (load "~/.emacs-local"))
 
 
 (setq custom-file "~/.emacs-custom")
 (trap (load custom-file))
 
 (trap (load "~/.emacs-local"))
 

-;; --- Internationalization twiddling ---
+;; Internationalization twiddling.

 
 (trap
   ;; Have top-bit-set characters work properly in terminals.
 
 (trap
   ;; Have top-bit-set characters work properly in terminals.


@@ -158,15 +159,15 @@
     (apply #'set-input-mode
           (nconc (list (nth 0 im) (nth 1 im) 0) (nthcdr 3 im)))))
 
     (apply #'set-input-mode
           (nconc (list (nth 0 im) (nth 1 im) 0) (nthcdr 3 im)))))
 

-;; --- Don't disable any commands ---
+;; Don't disable any commands.

 
 (mapatoms #'(lambda (sym) (put sym 'disabled nil)))
 
 
 (mapatoms #'(lambda (sym) (put sym 'disabled nil)))
 

-;; --- Split a wide window ---
+;; Split a wide window.

 
 (mdw-divvy-window)
 
 
 (mdw-divvy-window)
 

-;; --- Postscript printing ---
+;; Postscript printing.

 
 (setq ps-paper-type 'a4
       ps-print-color-p nil
 
 (setq ps-paper-type 'a4
       ps-print-color-p nil


@@ -175,13 +176,13 @@
       ps-font-family 'Courier
       ps-font-size 6.5)
 
       ps-font-family 'Courier
       ps-font-size 6.5)
 

-;; --- Splash screen stuff ---
+;; Splash screen stuff.

 
 (or window-system
     (setq inhibit-splash-screen t
          inhibit-startup-message t))
 
 
 (or window-system
     (setq inhibit-splash-screen t
          inhibit-startup-message t))
 

-;; --- Other goodies ---
+;; Other goodies.

 
 (trap (resize-minibuffer-mode 1))      ;Make minibuffer grow dynamically
 (auto-compression-mode 1)              ;Enable automatic compression
 
 (trap (resize-minibuffer-mode 1))      ;Make minibuffer grow dynamically
 (auto-compression-mode 1)              ;Enable automatic compression


@@ -238,7 +239,8 @@
 (setq cltl2-root-url (mdw-config 'cltl-url))
 (setq common-lisp-hyperspec-root (mdw-config 'hyperspec-url))
 
 (setq cltl2-root-url (mdw-config 'cltl-url))
 (setq common-lisp-hyperspec-root (mdw-config 'hyperspec-url))
 

-;;;----- W3 and URL fetching stuff ------------------------------------------
+;;;--------------------------------------------------------------------------
+;;; W3 and URL fetching stuff.

 
 (let ((proxy (mdw-config 'http-proxy)))
   (setq url-proxy-services
 
 (let ((proxy (mdw-config 'http-proxy)))
   (setq url-proxy-services


@@ -258,17 +260,18 @@
       w3-display-inline-image t
       w3-keybinding 'info)
 
       w3-display-inline-image t
       w3-keybinding 'info)
 

-;;;----- Calendar configuration ---------------------------------------------
+;;;--------------------------------------------------------------------------
+;;; Calendar configuration.

 
 (setq diary-file "~/etc/diary")
 
 
 (setq diary-file "~/etc/diary")
 

-;; --- Trivial stuff for the sunrise/sunset calculations ---
+;; Trivial stuff for the sunrise/sunset calculations.

 
 (setq calendar-latitude 52.2)
 (setq calendar-longitude 0.1)
 (setq calendar-location-name "Cambridge, UK")
 
 
 (setq calendar-latitude 52.2)
 (setq calendar-longitude 0.1)
 (setq calendar-location-name "Cambridge, UK")
 

-;; --- Holidays ---
+;; Holidays.

 
 (and (not mdw-fast-startup)
      (trap
 
 (and (not mdw-fast-startup)
      (trap


@@ -276,7 +279,7 @@
        (setq other-holidays (append english-and-welsh-bank-holidays
                                    other-holidays))))
 
        (setq other-holidays (append english-and-welsh-bank-holidays
                                    other-holidays))))
 

-;; --- Date format fiddling ---
+;; Date format fiddling.

 
 (setq european-calendar-style t)
 
 
 (setq european-calendar-style t)
 


@@ -288,7 +291,7 @@
                         (year "[-/]" month "[-/]" day "[^0-9]")
                         (dayname "\\W")))
 
                         (year "[-/]" month "[-/]" day "[^0-9]")
                         (dayname "\\W")))
 

-;; --- Fancy diary handling ---
+;; Fancy diary handling.

 
 (add-hook 'diary-display-hook 'fancy-diary-display)
 (setq diary-list-include-blanks t)
 
 (add-hook 'diary-display-hook 'fancy-diary-display)
 (setq diary-list-include-blanks t)


@@ -296,19 +299,19 @@
 (add-hook 'list-diary-entries-hook 'include-other-diary-files)
 (add-hook 'mark-diary-entries-hook 'mark-included-diary-files)
 
 (add-hook 'list-diary-entries-hook 'include-other-diary-files)
 (add-hook 'mark-diary-entries-hook 'mark-included-diary-files)
 

-;; --- Appointment management ---
+;; Appointment management.

 
 (add-hook 'diary-hook 'appt-make-list)
 (setq appt-issue-message t)
 (setq appt-display-interval 3)
 (setq appt-message-warning-time 10)
 
 
 (add-hook 'diary-hook 'appt-make-list)
 (setq appt-issue-message t)
 (setq appt-display-interval 3)
 (setq appt-message-warning-time 10)
 

-;; --- Org-mode agenda ---
+;; Org-mode agenda.

 
 (setq org-agenda-include-diary t
       org-tags-column -77)
 
 
 (setq org-agenda-include-diary t
       org-tags-column -77)
 

-;; --- Cosmetic stuff ---
+;; Cosmetic stuff.

 
 (setq display-time-24hr-format t)
 (display-time)
 
 (setq display-time-24hr-format t)
 (display-time)


@@ -317,15 +320,16 @@
       (let ((view-diary-entries-initially t))
        (calendar))))
 
       (let ((view-diary-entries-initially t))
        (calendar))))
 

-;;;----- MailCrypt ----------------------------------------------------------
+;;;--------------------------------------------------------------------------
+;;; MailCrypt.

 
 

-;; --- Define more mode hooks for MailCrypt ---
+;; Define more mode hooks for MailCrypt.

 
 (setq mdw-mc-modes
       '((mdwmail-mode (encrypt . mdwmail-mc-encrypt)
                      (sign . mdwmail-mc-sign))))
 
 
 (setq mdw-mc-modes
       '((mdwmail-mode (encrypt . mdwmail-mc-encrypt)
                      (sign . mdwmail-mc-sign))))
 

-;; --- Load the MailCrypt support ---
+;; Load the MailCrypt support.

 
 (trap
   (and (string-match "linux" (symbol-name system-type))
 
 (trap
   (and (string-match "linux" (symbol-name system-type))


@@ -346,9 +350,10 @@
              (define-key mc-write-mode-map "\C-c/E" 'mc-encrypt-region)
              (add-hook 'text-mode-hook 'mc-install-write-mode))))
 
              (define-key mc-write-mode-map "\C-c/E" 'mc-encrypt-region)
              (add-hook 'text-mode-hook 'mc-install-write-mode))))
 

-;;;----- Other common declarations ------------------------------------------
+;;;--------------------------------------------------------------------------
+;;; Other common declarations.

 
 

-;; --- Default frame size ---
+;; Default frame size.

 
 (setq default-frame-alist
       (mdw-uniquify-alist
 
 (setq default-frame-alist
       (mdw-uniquify-alist


@@ -374,11 +379,11 @@
        '((transparency . t))
        default-frame-alist))
 
        '((transparency . t))
        default-frame-alist))
 

-;; --- Other frame fiddling ---
+;; Other frame fiddling.

 
 (setq frame-title-format '("" invocation-name "@" system-name ": %b"))
 
 
 (setq frame-title-format '("" invocation-name "@" system-name ": %b"))
 

-;; --- Global keymap changes ---
+;; Global keymap changes.

 
 (trap
   (windmove-default-keybindings))
 
 (trap
   (windmove-default-keybindings))


@@ -428,7 +433,7 @@
 (add-hook 'org-agenda-mode-hook
          #'(lambda () (mdw-clobber-evil-keymap org-agenda-mode-map)))
 
 (add-hook 'org-agenda-mode-hook
          #'(lambda () (mdw-clobber-evil-keymap org-agenda-mode-map)))
 

-;; --- Recognising types of files ---
+;; Recognising types of files.

 
 (setq auto-mode-alist
       (append `(("\\.p[lm]$" . perl-mode)
 
 (setq auto-mode-alist
       (append `(("\\.p[lm]$" . perl-mode)


@@ -472,7 +477,7 @@
 (setq completion-ignored-extensions
       (append `(".hc" ".hi") completion-ignored-extensions))
 
 (setq completion-ignored-extensions
       (append `(".hc" ".hi") completion-ignored-extensions))
 

-;; --- Some common local definitions ---
+;; Some common local definitions.

 
 (make-variable-buffer-local 'mdw-auto-indent)
 
 
 (make-variable-buffer-local 'mdw-auto-indent)
 


@@ -493,7 +498,8 @@
 (global-font-lock-mode t)
 (defalias 'perl-mode 'cperl-mode)
 
 (global-font-lock-mode t)
 (defalias 'perl-mode 'cperl-mode)
 

-;;;----- Rootly editingness -------------------------------------------------
+;;;--------------------------------------------------------------------------
+;;; Rootly editingness.

 
 (eval-after-load "tramp"
   '(progn
 
 (eval-after-load "tramp"
   '(progn


@@ -529,9 +535,10 @@
                     ((executable-find "really") "really")
                     (t "su")))))))
 
                     ((executable-find "really") "really")
                     (t "su")))))))
 

-;;;----- General fontification ----------------------------------------------
+;;;--------------------------------------------------------------------------
+;;; General fontification.

 
 

-;; --- Configure lazy fontification ---
+;; Configure lazy fontification.

 
 (and (fboundp 'lazy-lock-mode)
      (setq font-lock-support-mode 'lazy-lock-mode))
 
 (and (fboundp 'lazy-lock-mode)
      (setq font-lock-support-mode 'lazy-lock-mode))


@@ -619,7 +626,8 @@
 
 (add-hook 'text-mode-hook 'mdw-text-mode t)
 
 
 (add-hook 'text-mode-hook 'mdw-text-mode t)
 

-;;;----- TeX stuff ----------------------------------------------------------
+;;;--------------------------------------------------------------------------
+;;; TeX stuff.

 
 (setq TeX-output-view-style
       '(("^dvi$"
 
 (setq TeX-output-view-style
       '(("^dvi$"


@@ -668,7 +676,8 @@
                            unify-case)
       bibtex-include-OPTkey nil)
 
                            unify-case)
       bibtex-include-OPTkey nil)
 

-;;;----- SLIME setup --------------------------------------------------------
+;;;--------------------------------------------------------------------------
+;;; SLIME setup.

 
 (trap
  (if (not mdw-fast-startup)
 
 (trap
  (if (not mdw-fast-startup)


@@ -691,7 +700,8 @@
              (cons head slime-lisp-implementations))))))
 (setq slime-default-lisp 'sbcl)
 
              (cons head slime-lisp-implementations))))))
 (setq slime-default-lisp 'sbcl)
 

-;;;----- Blogging -----------------------------------------------------------
+;;;--------------------------------------------------------------------------
+;;; Blogging.

 
 (setq weblogger-config-alist
       '(("vox"
 
 (setq weblogger-config-alist
       '(("vox"


@@ -699,16 +709,17 @@
         ("server-url" . "http://vox.distorted.org.uk/admin/mt-xmlrpc.cgi")
         ("weblog" . "1"))))
 
         ("server-url" . "http://vox.distorted.org.uk/admin/mt-xmlrpc.cgi")
         ("weblog" . "1"))))
 

-;;;----- Shell mode ---------------------------------------------------------
+;;;--------------------------------------------------------------------------
+;;; Shell mode.

 
 

-;; --- Make the shell mode aware of my prompt ---
+;; Make the shell mode aware of my prompt.

 
 (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 *\\'"))
 
 
 (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 *\\'"))
 

-;; --- Notice passwords, and make C-a work right ---
+;; Notice passwords, and make C-a work right.

 
 (add-hook 'shell-mode-hook #'mdw-sh-mode-setup)
 (add-hook 'shell-mode-hook #'ansi-color-for-comint-mode-on)
 
 (add-hook 'shell-mode-hook #'mdw-sh-mode-setup)
 (add-hook 'shell-mode-hook #'ansi-color-for-comint-mode-on)


@@ -716,7 +727,8 @@
 
 (add-hook 'term-mode-hook #'mdw-term-mode-setup)
 
 
 (add-hook 'term-mode-hook #'mdw-term-mode-setup)
 

-;;;----- Finishing touches --------------------------------------------------
+;;;--------------------------------------------------------------------------
+;;; Finishing touches.

 
 (trap (select-window mdw-init-window))
 (provide 'emacs-init)
 
 (trap (select-window mdw-init-window))
 (provide 'emacs-init)