X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/aa024d097d762aaa2149027fecc28012103f59dd..52b00db2fa42b48fb818bb68ed2c31fbc55bdfa9:/emacs?ds=sidebyside

diff --git a/emacs b/emacs
index 4337d39..1664bd6 100644
--- a/emacs
+++ b/emacs
@@ -60,7 +60,7 @@
 
 (trap (or mdw-fast-startup (require 'tex-site)))
 
-(trap (or mdw-fast-startup (semantic-load-enable-excessive-code-helpers)))
+(trap (or mdw-fast-startup (semantic-load-enable-minimum-features)))
 
 ;; --- Skeleton stuff ---
 
@@ -139,7 +139,7 @@
      (add-hook 'dired-mode-hook 'turn-on-gnus-dired-mode))
 
 (or mdw-fast-startup
-    (trap (bbdb-initialize 'gnus 'sendmail 'vm 'message)))
+    (trap (bbdb-initialize 'gnus 'sendmail 'message)))
 (setq bbdb-north-american-phone-numbers-p nil)
 
 ;; --- Customization ---
@@ -170,9 +170,9 @@
 (setq ps-paper-type 'a4
       ps-print-color-p nil
       ps-landscape-mode t
-      ps-number-of-columns 3
+      ps-number-of-columns 2
       ps-font-family 'Courier
-      ps-font-size 4)
+      ps-font-size 6.5)
 
 ;; --- Splash screen stuff ---
 
@@ -303,7 +303,8 @@
 
 ;; --- Org-mode agenda ---
 
-(setq org-agenda-include-diary t)
+(setq org-agenda-include-diary t
+      org-tags-column -77)
 
 ;; --- Cosmetic stuff ---
 
@@ -416,6 +417,7 @@
 		'mouse-drag-vertical-line)
 (global-set-key [vertical-scroll-bar C-mouse-1]
 		#'(lambda () (interactive)))
+(global-set-key [XF86WakeUp] "")
 (and (not mdw-fast-startup) (fboundp 'hippie-expand)
      (global-set-key [?\M-/] 'hippie-expand))