X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/94526c3fc940d29e2ff9dce5fc1f7b024f78fcc6..3a87e7efbc7e021c68b08dddb52523144027ebef:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index c339a17..ba3096b 100644
--- 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)
@@ -311,7 +313,7 @@
 
 ;; Splash screen stuff.
 
-(or window-system
+(if (not mdw-splashy-startup)
     (setq inhibit-splash-screen t
 	  inhibit-startup-message t))
 
@@ -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
@@ -413,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
@@ -506,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)
@@ -532,7 +538,7 @@
 (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))))
 
@@ -1029,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.