Merge branch 'master' of ustrat:~markw/git/staging/profile

* 'master' of ustrat:~markw/git/staging/profile:
  dot/emacs: Turn on `view-read-only' by default.
  el/dot-emacs.el: Hook more functions for angry-fruit-salad.
  dot/emacs: Kick BBDB to always include a name when completing addresses.
  dot/gitconfig.in: Tell Git where to find the cookie jar.

diff --git a/dot/emacs b/dot/emacs
index 88acfe45ecfcc8c672a8425a7d88c97a28344139..1d902a6178be53d359e2265564250e0d417d4203 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -200,6 +200,7 @@
     (trap (bbdb-initialize 'gnus 'sendmail 'message)))
 (setq bbdb-file "~/etc/brain/bbdb"
       bbdb-north-american-phone-numbers-p nil
+      bbdb-dwim-net-address-allow-redundancy t
       bbdb-extract-address-components-func 'bbdb-extract-address-components
       bbdb/news-auto-create-p
       (lambda ()
@@ -310,6 +311,7 @@
 (setq-default truncate-partial-width-windows nil
              truncate-lines t)
 (setq default-indicate-empty-lines t)
+(setq view-read-only t)
 (setq whitespace-style
       '(trailing space-before-tab space-after-tab empty indentation face))
 (setq woman-use-own-frame nil          ;Keep man pages somewhere sensible

diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index c642c132ffe246c8aae766720621b4acaf95b00e..8dd1f90953ed122aec2c2fd64173157825656c24 100644 (file)
--- a/dot/gitconfig.in
+++ b/dot/gitconfig.in
@@ -128,3 +128,6 @@
 [gui]
        fontui = -family Sans -size 10
        fontdiff = -family Fixed -size 13
+
+[http]
+       cookiefile = @home@/.gitcookies

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 7d3bc10f0e9f55f7ac9b88302ffc3cea073fbcfa..4b53771e088918df3e458fab42889638dc46c258 100644 (file)
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -979,10 +979,20 @@ (defun mdw-post-local-vars-misc-mode-config ()
     (mdw-whitespace-mode 1)))
 (add-hook 'hack-local-variables-hook 'mdw-post-local-vars-misc-mode-config)
 
-(defadvice toggle-read-only (after mdw-angry-fruit-salad activate)
-  (when mdw-do-misc-mode-hacking
-    (setq show-trailing-whitespace (not buffer-read-only))
-    (mdw-whitespace-mode (if buffer-read-only 0 1))))
+(defmacro mdw-advise-update-angry-fruit-salad (&rest funcs)
+  `(progn ,@(mapcar (lambda (func)
+                     `(defadvice ,func
+                          (after mdw-angry-fruit-salad activate)
+                        (when mdw-do-misc-mode-hacking
+                          (setq show-trailing-whitespace
+                                (not buffer-read-only))
+                          (mdw-whitespace-mode (if buffer-read-only 0 1)))))
+                   funcs)))
+(mdw-advise-update-angry-fruit-salad toggle-read-only
+                                    read-only-mode
+                                    view-mode
+                                    view-mode-enable
+                                    view-mode-disable)
 
 (eval-after-load 'gtags
   '(progn