diff options
| author |  David Kågedal <davidk@lysator.liu.se> | 2007-02-09 09:21:03 +0100 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2007-02-09 00:52:52 -0800 |
| commit | fa882116006e0403bb1b74973bb5f3f34f1cf523 (patch) | |
| tree | 05a8d87308d06b559d80a55304da259e9c31ca3e /contrib | |
| parent | Handle uncommitted changes and cache descriptions (diff) | |
| download | tgif-fa882116006e0403bb1b74973bb5f3f34f1cf523.tar.xz | |
git-blame.el: improve color handling
Signed-off-by: David Kågedal <davidk@lysator.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/emacs/git-blame.el | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/contrib/emacs/git-blame.el b/contrib/emacs/git-blame.el index c99437e5e5..7ffc153bda 100644 --- a/contrib/emacs/git-blame.el +++ b/contrib/emacs/git-blame.el @@ -95,16 +95,10 @@ colors)) (defvar git-blame-dark-colors - (color-scale '("00" "04" "08" "0c" - "10" "14" "18" "1c" - "20" "24" "28" "2c" - "30" "34" "38" "3c"))) + (color-scale '("0c" "04" "24" "1c" "2c" "34" "14" "3c"))) (defvar git-blame-light-colors - (color-scale '("c0" "c4" "c8" "cc" - "d0" "d4" "d8" "dc" - "e0" "e4" "e8" "ec" - "f0" "f4" "f8" "fc"))) + (color-scale '("c4" "d4" "cc" "dc" "f4" "e4" "fc" "ec"))) (defvar git-blame-ancient-color "dark green") @@ -127,13 +121,15 @@ (make-local-variable 'git-blame-overlays) (make-local-variable 'git-blame-colors) (make-local-variable 'git-blame-cache) - (let ((bgmode (cdr (assoc 'background-mode (frame-parameters))))) - (if (eq bgmode 'dark) - (setq git-blame-colors git-blame-dark-colors) - (setq git-blame-colors git-blame-light-colors))) + (git-blame-cleanup) (if git-blame-mode - (git-blame-run) - (git-blame-cleanup))) + (progn + (let ((bgmode (cdr (assoc 'background-mode (frame-parameters))))) + (if (eq bgmode 'dark) + (setq git-blame-colors git-blame-dark-colors) + (setq git-blame-colors git-blame-light-colors))) + (setq git-blame-cache (make-hash-table :test 'equal)) + (git-blame-run)))) (defun git-blame-run () (let* ((display-buf (current-buffer)) |