Commit 19572262 authored by Juri Linkov's avatar Juri Linkov

diff/ediff/vc fixes

parent bed08283
......@@ -271,6 +271,8 @@
'(cvs-marked ((t (:foreground "DarkRed"))))
'(cvs-need-action ((((class color) (background light)) (:foreground "darkgreen"))))
'(diary ((((class color)) (:foreground "blue"))))
'(diff-refine-added ((t (:inherit diff-refine-changed :background "#ccffcc"))))
'(diff-refine-removed ((t (:inherit diff-refine-changed :background "#ffdddd"))))
'(dired-directory ((t (:inherit link :underline nil))))
'(eshell-prompt ((t (:foreground "DarkRed" :underline t :weight normal))))
'(font-lock-builtin-face ((((class color) (background light)) (:foreground "Sienna")) (((class color) (background dark)) (:foreground "Sienna"))))
......
......@@ -5,7 +5,7 @@
;; Author: Juri Linkov <juri@linkov.net>
;; Keywords: dotemacs, init
;; URL: <http://www.linkov.net/emacs>
;; Version: 2019-01-27 for GNU Emacs 27.0.50 (x86_64-pc-linux-gnu)
;; Version: 2019-01-28 for GNU Emacs 27.0.50 (x86_64-pc-linux-gnu)
;; This file is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
......@@ -2450,6 +2450,24 @@ Otherwise, call `indent-for-tab-command' that indents line or region."
;; (setenv "PAGER") (getenv "PAGER")
;;; ediff
(eval-after-load "ediff-ptch"
'(progn
;; Date-based backup extension with tilde omitted in dired-x
(setq ediff-default-backup-extension (format-time-string ".~ediff-%Y-%m-%d~" (current-time)))
(custom-reevaluate-setting 'ediff-backup-extension)
(custom-reevaluate-setting 'ediff-backup-specs)))
;;; vc
(eval-after-load "vc-hooks"
'(progn
;; Because ‘C-x v =’ is easily mistyped as ‘C-x v +’
(define-key vc-prefix-map "+" 'vc-diff)))
;;; text
(add-hook 'text-mode-hook 'turn-on-auto-fill)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment