dot/emacs: Cope with `ido-completing-read+' configuration differences.

[profile] / el / dot-emacs.el

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index cb19d10..d2b9dcc 100644 (file)
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -404,6 +404,8 @@ as output rather than a string."
   (let ((mdw-diary-for-org-mode-p t))
     ad-do-it))
 
+(defvar diary-time-regexp nil)
+
 (defadvice diary-add-to-list (before mdw-trim-leading-space compile activate)
   "Trim leading space from the diary entry string."
   (save-match-data
@@ -546,6 +548,11 @@ Evil key bindings are defined in `mdw-evil-keymap-keys'."
 This is used by advice on `switch-to-buffer-other-frame' to inhibit finding
 buffers in random frames.")
 
+(setq display-buffer--other-frame-action
+      '((display-buffer-reuse-window display-buffer-pop-up-frame)
+       (reusable-frames . nil)
+       (inhibit-same-window . t)))
+
 (defadvice walk-windows (around mdw-inhibit activate)
   "If `mdw-inhibit-walk-windows' is non-nil, then do nothing."
   (and (not mdw-inhibit-walk-windows)
@@ -1393,6 +1400,10 @@ doesn't match any of the regular expressions in
   (((type w32)) :family "courier new" :height 85)
   (((type x)) :family "6x13" :foundry "trad" :height 130)
   (t :foreground "white" :background "black"))
+(mdw-define-face fixed-pitch-serif
+  (((type w32)) :family "courier new" :height 85 :weight bold)
+  (((type x)) :family "6x13" :foundry "trad" :height 130 :weight bold)
+  (t :foreground "white" :background "black" :weight bold))
 (if (mdw-emacs-version-p 23)
     (mdw-define-face variable-pitch
       (((type x)) :family "sans" :height 100))
@@ -1447,6 +1458,10 @@ doesn't match any of the regular expressions in
 (mdw-define-face comint-highlight-input
   (t nil))
 
+(mdw-define-face Man-underline
+  (((type tty)) :underline t)
+  (t :slant italic))
+
 (mdw-define-face ido-subdir
   (t :foreground "cyan" :weight bold))
 
@@ -4334,7 +4349,7 @@ This allows you to pass a list of arguments through `ansi-term'."
 ;;;--------------------------------------------------------------------------
 ;;; Magit configuration.
 
-(setq magit-diff-refine-hunk 'all
+(setq magit-diff-refine-hunk 't
       magit-view-git-manual-method 'man
       magit-log-margin '(nil age magit-log-margin-width t 18)
       magit-wip-after-save-local-mode-lighter ""