equal
deleted
inserted
replaced
617 (add-to-list 'load-path my-svn-dir) |
617 (add-to-list 'load-path my-svn-dir) |
618 (require 'vc-svn) |
618 (require 'vc-svn) |
619 ) |
619 ) |
620 ) |
620 ) |
621 |
621 |
622 |
|
623 (if (file-exists-p (concat my-el-dir "/mercurial.el")) |
622 (if (file-exists-p (concat my-el-dir "/mercurial.el")) |
624 (require 'mercurial) |
623 (require 'mercurial) |
625 ) |
624 ) |
626 |
625 |
627 ;; ====================================================================== |
626 ;; ====================================================================== |
646 :group 'basic-faces) |
645 :group 'basic-faces) |
647 |
646 |
648 (defface my-todo-face |
647 (defface my-todo-face |
649 '((t :foreground "red" :weight bold)) |
648 '((t :foreground "red" :weight bold)) |
650 "Font for showing TODO words." |
649 "Font for showing TODO words." |
|
650 :group 'basic-faces) |
|
651 |
|
652 (defface my-conflict-face |
|
653 '((t :background "yellow" :foreground "red" :weight bold)) |
|
654 "Font for showing conflicts." |
651 :group 'basic-faces) |
655 :group 'basic-faces) |
652 |
656 |
653 (add-hook 'font-lock-mode-hook (function (lambda () |
657 (add-hook 'font-lock-mode-hook (function (lambda () |
654 (unless (or (eq 'diff-mode major-mode) (eq 'script-mode major-mode)) |
658 (unless (or (eq 'diff-mode major-mode) (eq 'script-mode major-mode)) |
655 (font-lock-add-keywords nil |
659 (font-lock-add-keywords nil |