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

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index b78c03c..ea5a476 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -141,11 +141,14 @@
                  edit-server-new-frame nil
                  server-raise-frame nil
                  gnuserv-frame t)
-           (trap (let ((warning-suppress-types
-                        (cons '(server)
-                              (and (boundp 'warning-suppress-types)
-                                   warning-suppress-types))))
-                   (server-start)))
+           (trap (progn
+                   (require 'server)
+                   (let ((state (server-running-p)))
+                     (if state
+                         (message "Emacs server %s: not starting"
+                                  (cond ((eq state t) "already running")
+                                        (t "maybe running")))
+                       (server-start)))))
            (trap (progn
                    (require 'edit-server)
                    (edit-server-start)
@@ -385,7 +388,9 @@
       wdired-allow-to-change-permissions 'advanced)
 (setq read-quoted-char-radix 16)       ;C-q HEX-STUFF [RET]
 (setq case-fold-file-names nil)                ;Don't translate file names (grr...)
-(setq scroll-step 5)                   ;Don't scroll too much at a time
+(setq scroll-step 5                    ;Don't scroll too much at a time
+      hscroll-step 8
+      auto-hscroll-mode 'current-line)
 (setq custom-unlispify-tag-names nil   ;Display variable names properly
       custom-unlispify-menu-entries nil
       custom-buffer-done-kill t)
@@ -510,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)
@@ -774,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)