Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/profile

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index 0181bd00116bb6b7ae5ad3bc7f687ec4482c7ed3..5c567fac788f0347ebe323c0af27de82db069d3c 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -172,6 +172,8 @@
       send-mail-function 'sendmail-send-it
       mail-interactive t
       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)
@@ -206,7 +208,8 @@
       (lambda ()
        (let ((group gnus-newsgroup-name))
          (and (string-match "^nn\\(imap\\|folder\\)\\+" group)
-              (not (string-match ":\\(crap\\|spam\\|lists\\)\\." group)))))
+              (not (string-match ":\\(crap\\|spam\\|lists\\|corpus\\)\\."
+                                 group)))))
       bbdb-user-mail-names
       (concat "^"
              "\\(" "\\(mdw\\|markw\\|root\\|postmaster\\)"
@@ -310,7 +313,7 @@
 (setq read-quoted-char-radix 16)       ;C-q HEX-STUFF [RET]
 (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 fill-column mdw-text-width) ;I use rather narrow windows
 (setq-default comment-column 40)       ;Set a standard comment column
 (setq-default truncate-partial-width-windows nil
              truncate-lines t)
@@ -318,7 +321,7 @@
 (setq view-read-only t)
 (setq whitespace-style '(trailing empty indentation face lines-tail
                         space-before-tab space-after-tab)
-      whitespace-line-column 77)
+      whitespace-line-column mdw-text-width)
 (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
@@ -328,6 +331,7 @@
 (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 x-gtk-file-dialog-help-text nil)
 (setq Info-fontify-maximum-menu-size 100000)
 (setq set-mark-command-repeat-pop t)
@@ -396,8 +400,8 @@
       w3m-use-cookies t)
 
 (eval-after-load "w3m"
-  '(let ((entries '(("application/pdf" "\\.pdf\\'" ("evince" file) nil)
-                   ("application/x-pdf" "\\.pdf\\'" ("evince" file) nil))))
+  '(let ((entries '(("application/pdf" "\\.pdf\\'" ("xdg-open" file) nil)
+                   ("application/x-pdf" "\\.pdf\\'" ("xdg-open" file) nil))))
      (dolist (e entries)
        (setq w3m-content-type-alist
             (cons e (remove* (car e) w3m-content-type-alist
@@ -531,7 +535,8 @@
 
 (setq frame-background-mode (if mdw-black-background 'dark 'light)
       default-frame-alist
-      `((width . ,(if (>= emacs-major-version 21) 77 78))
+      `((width . ,(+ mdw-column-width
+                    (if (>= emacs-major-version 21) 0 1)))
        (height . 33)
        (vertical-scroll-bars . right)
        (cursor-type . bar)
@@ -544,7 +549,8 @@
        (cursor-color . "red")
        (background-mode . ,frame-background-mode))
       initial-frame-alist
-      `((width . ,(if (>= emacs-major-version 21) 77 78))
+      `((width . ,(+ mdw-column-width
+                    (if (>= emacs-major-version 21) 0 1)))
        (menu-bar-lines . ,(if window-system 1 0)))
       window-system-default-frame-alist
       '((pm (font . "-os2-System VIO-medium-r-normal--*-40-*-*-m-*-cp850")
@@ -611,7 +617,14 @@
   (global-set-key [?\C-c ?d ?a] 'devhelp-assistant-word-at-point)
   (global-set-key [f11] 'mdw-toggle-full-screen)
   (and (not mdw-fast-startup) (fboundp 'hippie-expand)
-       (global-set-key [?\M-/] 'hippie-expand)))
+       (global-set-key [?\M-?] 'hippie-expand)))
+
+(eval-after-load "hippie-exp"
+  '(setq hippie-expand-try-functions-list
+        (remove-if (lambda (name)
+                     (memq name '(try-expand-list
+                                  try-expand-list-all-buffers)))
+                   hippie-expand-try-functions-list)))
 
 (eval-after-load "dired"
   '(progn
@@ -815,6 +828,7 @@
 (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")))
@@ -879,9 +893,9 @@
 (setq TeX-output-view-style
       '(("^dvi$"
         ("^landscape$" "^pstricks$\\|^pst-\\|^psfrag$")
-        "%(o?)dvips -t landscape %d -o && evince %f")
+        "%(o?)dvips -t landscape %d -o && xdg-open %f")
        ("^dvi$" "^pstricks$\\|^pst-\\|^psfrag$"
-        "%(o?)dvips %d -o && evince %f")
+        "%(o?)dvips %d -o && xdg-open %f")
        ("^dvi$"
         ("^a4\\(?:dutch\\|paper\\|wide\\)\\|sem-a4$" "^landscape$")
         "%(o?)xdvi %dS -paper a4r -s 0 %d")
@@ -896,14 +910,17 @@
        ("^dvi$" "^legalpaper$" "%(o?)xdvi %dS -paper legal %d")
        ("^dvi$" "^executivepaper$" "%(o?)xdvi %dS -paper 7.25x10.5in %d")
        ("^dvi$" "." "%(o?)xdvi %dS %d")
-       ("^pdf$" "." "evince %o")
-       ("^html?$" "." "netscape %o")))
+       ("^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 "Evince")
-       (output-html "xdg-open")))
+       (output-pdf "mupdf")
+       (output-html "sensible-browser")))
 
 (setq TeX-open-quote "\""
       TeX-close-quote "\"")