dot/emacs: Have `ediff' windows side-by-side by default.

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index ac44ce2..bd9c448 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -133,7 +133,9 @@
      (progn (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$")
                  edit-server-new-frame nil
                  gnuserv-frame t)
-           (trap (server-start))
+           (trap (let ((warning-suppress-types
+                        (cons '(server) warning-suppress-types)))
+                   (server-start)))
            (trap (progn
                    (require 'edit-server)
                    (edit-server-start)
@@ -329,7 +331,8 @@
       iswitchb-default-method 'samewindow ;in other random frames
       ido-default-file-method 'selected-window
       ido-default-buffer-method 'selected-window)
-(setq ido-enable-flex-matching t
+(setq ido-enable-prefix t
+      ido-enable-flex-matching t
       ido-everywhere t
       ido-confirm-unique-completion t
       ido-use-filename-at-point nil
@@ -370,6 +373,7 @@
 (setq bookmark-save-flag 0)            ;Save bookmarks automatically
 (setq vc-follow-symlinks t)
 (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)
@@ -412,6 +416,8 @@
 (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
@@ -430,7 +436,7 @@
 (setq url-cookie-untrusted-urls '("."))
 
 (setq browse-url-browser-function (mdw-good-url-browser)
-      browse-url-generic-program "chromium"
+      browse-url-generic-program "mdw-chrome"
       browse-url-mozilla-program "mdw-iceweasel")
 
 (setq w3m-default-display-inline-images t
@@ -505,9 +511,10 @@
 ;; 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)
+(setq appt-issue-message t
+      appt-display-interval 3
+      appt-message-warning-time 10
+      appt-display-diary nil)
 (and (not mdw-fast-startup)
      (trap (require 'org)
           (require 'bbdb)
@@ -664,6 +671,7 @@
   (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 ?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 ?j] 'windmove-down)
@@ -739,6 +747,7 @@
 
 (setq auto-mode-alist
       (append `(("\\.p[lm]$" . cperl-mode)
+               ("\\.sage$" . python-mode)
                ("\\.m$" . objc-mode)
                ("\\.mxd$" . c-mode)
                ("\\.cs$" . csharp-mode)
@@ -779,6 +788,7 @@
       (append `(("runlisp" . lisp-mode)
                ("@BASH@" . sh-mode)
                ("@PYTHON@" . python-mode)
+               ("sage" . python-mode)
                ("@PERL@" . cperl-mode)
                ("perl" . cperl-mode)
                ("@TCLSH@" . tcl-mode)
@@ -1025,10 +1035,20 @@
        (t . "sec:")))
 
 (setq bibtex-field-delimiters 'double-quotes
+      bibtex-align-at-equal-sign t
       bibtex-entry-format '(realign opts-or-alts required-fields
                            numerical-fields last-comma delimiters
-                           unify-case)
-      bibtex-include-OPTkey nil)
+                           unify-case sort-fields braces)
+      bibtex-sort-ignore-string-entries nil
+      bibtex-maintain-sorted-entries 'entry-class
+      bibtex-include-OPTkey t
+      bibtex-autokey-names-stretch 1
+      bibtex-autokey-expand-strings t
+      bibtex-autokey-name-separator "-"
+      bibtex-autokey-year-length 4
+      bibtex-autokey-titleword-separator "-"
+      bibtex-autokey-name-year-separator "-"
+      bibtex-autokey-year-title-separator ":")
 
 ;;;--------------------------------------------------------------------------
 ;;; SLIME setup.