| changeset 1385 | 5f96b8d649ba |
| parent 1384 | a952b43af57f |
| child 1386 | e9b455ea0327 |
| 1384:a952b43af57f | 1385:5f96b8d649ba |
|---|---|
2297 (set-face-background 'diff-refine-change "LightBlue1"))) |
2297 (set-face-background 'diff-refine-change "LightBlue1"))) |
2298 |
2298 |
2299 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
2299 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
2300 (message "vc-mode, VCS, version control, cvs, svn, mercurial, hg, bazaar, bzr, git, fossil") |
2300 (message "vc-mode, VCS, version control, cvs, svn, mercurial, hg, bazaar, bzr, git, fossil") |
2301 |
2301 |
2302 (eval-when 'compile (require 'vc-svn)) |
2302 (eval-when 'compile |
2303 (require 'vc-annotate) |
|
2304 (require 'vc-svn)) |
|
2303 |
2305 |
2304 ;; `-b' switch to ignore changes in whitespaces. |
2306 ;; `-b' switch to ignore changes in whitespaces. |
2305 ;; (setq vc-git-diff-switches "-b") |
2307 ;; (setq vc-git-diff-switches "-b") |
2306 ;; (setq vc-diff-switches "-b") |
2308 ;; (setq vc-diff-switches "-b") |
2307 |
2309 |
2322 ((equal prefix '(16)) |
2324 ((equal prefix '(16)) |
2323 (vc-diff-internal t (list 'Hg (list rootdir)) "qparent" nil)) )))) |
2325 (vc-diff-internal t (list 'Hg (list rootdir)) "qparent" nil)) )))) |
2324 (call-interactively 'vc-root-diff nil) )) |
2326 (call-interactively 'vc-root-diff nil) )) |
2325 |
2327 |
2326 (global-set-key (kbd "C-x v D") 'my-vc-root-diff) |
2328 (global-set-key (kbd "C-x v D") 'my-vc-root-diff) |
2327 |
|
2328 (when (equal window-system 'w32) |
|
2329 (modify-coding-system-alist 'process "cvs" '(cp1251-dos . cp1251-dos)) |
|
2330 (modify-coding-system-alist 'process "svn" '(cp1251 . cp1251)) |
|
2331 (setq vc-svn-checkin-switches '("--encoding" "UTF-8")) |
|
2332 ) |
|
2333 |
2329 |
2334 (when window-system |
2330 (when window-system |
2335 (setq |
2331 (setq |
2336 vc-annotate-very-old-color "#0b5b20" |
2332 vc-annotate-very-old-color "#0b5b20" |
2337 vc-annotate-background "white" |
2333 vc-annotate-background "white" |