dot/gpg.conf.m4, dot/gpg-agent.conf, Makefile: Adopt GnuPG configuration.

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index 5588a43..ea5a476 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -515,7 +515,8 @@
 
 (setq browse-url-browser-function (mdw-good-url-browser)
       browse-url-generic-program "mdw-chrome"
-      browse-url-mozilla-program "mdw-iceweasel")
+      browse-url-firefox-program "mdw-iceweasel"
+      browse-url-mozilla-program browse-url-firefox-program)
 
 (setq w3m-default-display-inline-images t
       w3m-use-cookies t)
@@ -779,6 +780,7 @@
   (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 ?f] 'mdw-set-fallback-window)
   (global-set-key [?\C-c ?w ?h] 'windmove-left)
   (global-set-key [?\C-c ?w ?j] 'windmove-down)
   (global-set-key [?\C-c ?w ?k] 'windmove-up)