refine hunks and load magit-annex

[lib.git] / emacs_el / configuration / don-configuration.org

diff --git a/emacs_el/configuration/don-configuration.org b/emacs_el/configuration/don-configuration.org
index 2dbe39ac2a6564d0a1a01781b356da9bbe67a3af..ec96338842a7a8e335b2620b9ce167991a211f37 100644 (file)
--- a/emacs_el/configuration/don-configuration.org
+++ b/emacs_el/configuration/don-configuration.org
@@ -50,6 +50,13 @@
 #+BEGIN_SRC emacs-lisp :tangle don-configuration.el
   ; don't verify where we are pushing
   (setq magit-push-always-verify nil)
+  ;; refine diffs always (hilight words)
+  (setq magit-diff-refine-hunk 'all)
+  ;; load magit-annex
+  (setq load-path
+        (append '("~/lib/emacs_el/magit-annex")
+                load-path))
+  (require 'magit-annex)
 #+END_SRC
 
 ** Perl
@@ -253,22 +260,22 @@
 * Misc (uncharacterized)
 #+BEGIN_SRC emacs-lisp  :tangle don-configuration.el
   (setq bibtex-user-optional-fields (quote (("annote" "Personal annotation (ignored)") ("abstract" "") ("pmid" "") ("doi" ""))))
-  (setq calendar-latitude [33 57 north])
-  (setq calendar-longitude [117 24 west])
+  (setq calendar-latitude 40.11)
+  (setq calendar-longitude -88.24)
   (setq case-fold-search t)
   (setq confirm-kill-emacs (quote y-or-n-p))
   (setq cperl-lazy-help-time nil)
   (setq debian-changelog-mailing-address "don@debian.org")
-  (setq display-time t)
+  (display-time)
   (setq display-time-24hr-format t)
   (setq display-time-day-and-date t)
-  (setq display-time-mode t)
+  (display-time-mode 1)
   (setq font-latex-fontify-script nil)
   (setq font-latex-fontify-sectioning (quote color))
   (setq font-latex-script-display (quote (nil)))
-  (setq global-auto-revert-mode t)
-  (setq global-font-lock-mode t)
-  (setq icomplete-mode t)
+  (global-auto-revert-mode 1)
+  (global-font-lock-mode 1)
+  (icomplete-mode 1)
   (setq log-edit-keep-buffer t)
   (setq mail-user-agent (quote sendmail-user-agent))
   (setq markdown-enable-math t)
@@ -289,7 +296,8 @@
   (setq sentence-end "[.?!][]\"')]*\\($\\|   \\| \\)[    
   ]*")
   (setq sentence-end-double-space nil)
-  (setq show-paren-mode t)
+  ; enable matching parenthesis
+  (show-paren-mode 1)
   (tool-bar-mode -1)
   (setq user-mail-address "don@donarmstrong.com")
   (setq vc-delete-logbuf-window nil)