~mdw
/
profile
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
el/dot-emacs.el: Highlight Magit arguments less stupidly.
[profile]
/
el
/
dot-emacs.el
diff --git
a/el/dot-emacs.el
b/el/dot-emacs.el
index
01d3ac5
..
72dde3c
100644
(file)
--- a/
el/dot-emacs.el
+++ b/
el/dot-emacs.el
@@
-837,7
+837,8
@@
emphasis is on predictability rather than crazy DWIMmery."
((and fallback (window-live-p (cdr fallback)))
;; There's a fallback window set for this frame. Use it.
((and fallback (window-live-p (cdr fallback)))
;; There's a fallback window set for this frame. Use it.
- (setq chosen (cdr fallback))
+ (setq chosen (cdr fallback)
+ selected nil)
(display-buffer-record-window 'window chosen buffer))
((and full-height-p full-width-p)
(display-buffer-record-window 'window chosen buffer))
((and full-height-p full-width-p)
@@
-1408,7
+1409,8
@@
If NEW-SESSION-P, start a new session."
'(define-key w3m-mode-map [?\e ?\r] 'w3m-view-this-url-new-session))
(defcustom mdw-good-url-browsers
'(define-key w3m-mode-map [?\e ?\r] 'w3m-view-this-url-new-session))
(defcustom mdw-good-url-browsers
- '(browse-url-mozilla
+ '(browse-url-firefox
+ browse-url-mozilla
browse-url-generic
(w3m . mdw-w3m-browse-url)
browse-url-w3)
browse-url-generic
(w3m . mdw-w3m-browse-url)
browse-url-w3)
@@
-2214,6
+2216,10
@@
doesn't match any of the regular expressions in
(mdw-define-face magit-hash
(((min-colors 64)) :foreground "grey40")
(((class color)) :foreground "blue"))
(mdw-define-face magit-hash
(((min-colors 64)) :foreground "grey40")
(((class color)) :foreground "blue"))
+(mdw-define-face magit-popup-argument
+ (((min-colors 64)) :foreground "SeaGreen1")
+ (((class color)) :foreground "green")
+ (t :weight bold))
(mdw-define-face magit-diff-hunk-heading
(((min-colors 64)) :foreground "grey70" :background "grey25")
(((class color)) :foreground "yellow"))
(mdw-define-face magit-diff-hunk-heading
(((min-colors 64)) :foreground "grey70" :background "grey25")
(((class color)) :foreground "yellow"))
@@
-2249,8
+2255,16
@@
doesn't match any of the regular expressions in
(((min-colors 64)) :background "NavyBlue")
(((class color)) :background "blue"))
(((min-colors 64)) :background "NavyBlue")
(((class color)) :background "blue"))
+(mdw-define-face erc-my-nick-face
+ (t :foreground "yellow" :weight bold))
+(mdw-define-face erc-current-nick-face
+ (t :foreground "yellow" :weight bold))
(mdw-define-face erc-input-face
(mdw-define-face erc-input-face
- (t :foreground "red"))
+ (t :foreground "yellow"))
+(mdw-define-face erc-action-face
+ ())
+(mdw-define-face erc-button
+ (t :foreground "cyan" :underline t :weight semi-bold))
(mdw-define-face woman-bold
(t :weight bold))
(mdw-define-face woman-bold
(t :weight bold))
@@
-3446,6
+3460,7
@@
name, as a symbol."
(modify-syntax-entry ?$ "\\" font-lock-syntax-table)
(modify-syntax-entry ?: "." font-lock-syntax-table)
(mdw-standard-fill-prefix "\\([ \t]*#+[ \t]*\\)")
(modify-syntax-entry ?$ "\\" font-lock-syntax-table)
(modify-syntax-entry ?: "." font-lock-syntax-table)
(mdw-standard-fill-prefix "\\([ \t]*#+[ \t]*\\)")
+ (setq auto-fill-function #'do-auto-fill)
;; Now define fontification things.
(make-local-variable 'font-lock-keywords)
;; Now define fontification things.
(make-local-variable 'font-lock-keywords)