Merge remote-tracking branch 'ponder/master'

* ponder/master:
  dot/emacs: Fix awful calendar snafu.
  el/dot-emacs.el: Define org-mode variables to make Docbook output work.
  dot/e16-bindings: New bindings for fiddling with window opacity.

diff --git a/dot/e16-bindings b/dot/e16-bindings
index 978182676f27bb7363dca0c3f11de3d03cd8e749..ebb44cefc600d48a367961f79a798273438d6957 100644 (file)
--- a/dot/e16-bindings
+++ b/dot/e16-bindings
@@ -74,3 +74,6 @@ KeyDown         SC5      Up wop * sr 0 -15
 KeyDown          SC5    Down wop * sr 0 +15
 KeyDown          SC5    Left wop * sr -15 0
 KeyDown          SC5   Right wop * sr +15 0
+KeyDown          5      Home wop * opacity 100
+KeyDown          5      Next wop * opacity -5
+KeyDown          5     Prior wop * opacity +5

diff --git a/dot/emacs b/dot/emacs
index faae519ba4183d4d82c2056e6973fcfbad63adb5..81db066561aca960b7845368f5023e3528875c9f 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -359,10 +359,7 @@
 (setq display-time-24hr-format t)
 (display-time)
 (column-number-mode 1)
-(trap
-  (if window-system
-      (let ((view-diary-entries-initially t))
-       (calendar))))
+(trap (if window-system (calendar)))
 
 ;;;--------------------------------------------------------------------------
 ;;; MailCrypt.

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 1704f7dea58bf2d5a7827f894b6f89bf53959cd6..ea20e5ddc8505116e95d6a07070b3686d32debef 100644 (file)
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -285,6 +285,11 @@ (eval-after-load "org-latex"
             ("\\subparagraph{%s}" . "\\subparagraph*{%s}"))
           org-export-latex-classes)))
 
+(setq org-export-docbook-xslt-proc-command "xsltproc --output %o %s %i"
+      org-export-docbook-xsl-fo-proc-command "fop %i.safe %o"
+      org-export-docbook-xslt-stylesheet
+      "/usr/share/xml/docbook/stylesheet/docbook-xsl/fo/docbook.xsl")
+
 ;;;--------------------------------------------------------------------------
 ;;; Mail and news hacking.