Merge remote-tracking branches 'spirit', 'crybaby' and 'staging'

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index 2bb33180e74249bb99955e56f1efd0dc95050fbf..370cfeefca76b75202f1c4d134f4a3e0dceaee88 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -328,11 +328,23 @@
 ;; Postscript printing.
 
 (setq ps-paper-type 'a4
-      ps-print-color-p nil
-      ps-landscape-mode t
-      ps-number-of-columns 2
-      ps-font-family 'Courier
-      ps-font-size 6.5)
+      ps-print-only-one-header t
+      ps-print-color-p t
+      ps-landscape-mode t ps-number-of-columns 4
+      ps-line-number t ps-line-number-step 5 ps-line-number-start 5
+      ps-zebra-stripes nil ps-zebra-stripe-height 5
+      ps-spool-duplex t ps-spool-tumble nil ps-spool-config 'setpagedevice
+      ps-top-margin (* 12 (/ 72 25.4))
+      ps-bottom-margin (* 16 (/ 72 25.4))
+      ps-header-offset (* 8 (/ 72 25.4))
+      ps-left-margin (* 12 (/ 72 25.4))
+      ps-right-margin (* 12 (/ 72 25.4))
+      ps-inter-column (* 4 (/ 72 25.4))
+      ps-font-family 'CourierCondensed ps-font-size '(4.5 . 5.16)
+      ps-line-number-font 'Palatino ps-line-number-font-size 3
+      ps-header-font-family 'Helvetica
+       ps-header-title-font-size '(8 . 10)
+       ps-header-font-size '(6 . 8))
 
 ;; Splash screen stuff.
 
@@ -721,6 +733,7 @@
   (global-set-key [?\C-c ?v ?i] 'vm-visit-imap-folder)
   (global-set-key [?\C-c ?v ?m] 'vm-visit-folder)
   (global-set-key [?\C-c ?v ?v] 'mdw-auto-revert)
+  (global-set-key [?\C-c ?w ?b] 'w3m-bookmark-view)
   (global-set-key [?\C-c ?w ?c] 'mdw-set-frame-colour)
   (global-set-key [?\C-c ?w ?d] 'mdw-divvy-window)
   (global-set-key [?\C-c ?w ?h] 'windmove-left)