* [PATCH 1/2] git-blame.el: separate git-blame-mode to ease maintenance
@ 2007-03-26 21:00 Xavier Maillard
2007-03-27 8:38 ` David Kågedal
0 siblings, 1 reply; 4+ messages in thread
From: Xavier Maillard @ 2007-03-26 21:00 UTC (permalink / raw)
To: git
git-blame-mode has been splitted into git-blame-mode-on and
git-blame-mode-off; it now conditionnaly calls one of them depending
of how we call it. Code is now easier to maintain and to understand.
Fixed `git-reblame' function: interactive form was at the wrong
place.
String displayed on the mode line is now configurable through
`git-blame-mode-line-string` (default to " blame").
Signed-off-by: Xavier Maillard <zedek@gnu.org>
---
contrib/emacs/git-blame.el | 55 +++++++++++++++++++++++++++++--------------
1 files changed, 37 insertions(+), 18 deletions(-)
diff --git a/contrib/emacs/git-blame.el b/contrib/emacs/git-blame.el
index 64ad50b..bd87a86 100644
--- a/contrib/emacs/git-blame.el
+++ b/contrib/emacs/git-blame.el
@@ -127,39 +127,58 @@
(defvar git-blame-mode nil)
(make-variable-buffer-local 'git-blame-mode)
-(unless (assq 'git-blame-mode minor-mode-alist)
- (setq minor-mode-alist
- (cons (list 'git-blame-mode " blame")
- minor-mode-alist)))
+
+(defvar git-blame-mode-line-string " blame"
+ "String to display on the mode line when git-blame is active.")
+
+(or (assq 'git-blame-mode minor-mode-alist)
+ (setq minor-mode-alist
+ (cons '(git-blame-mode git-blame-mode-line-string) minor-mode-alist)))
;;;###autoload
(defun git-blame-mode (&optional arg)
- "Minor mode for displaying Git blame"
+ "Toggle minor mode for displaying Git blame
+
+With prefix ARG, turn the mode on if ARG is positive."
(interactive "P")
- (if arg
- (setq git-blame-mode (eq arg 1))
- (setq git-blame-mode (not git-blame-mode)))
+ (cond
+ ((null arg)
+ (if git-blame-mode (git-blame-mode-off) (git-blame-mode-on)))
+ ((> (prefix-numeric-value arg) 0) (git-blame-mode-on))
+ (t (git-blame-mode-off))))
+
+(defun git-blame-mode-on ()
+ "Turn on git-blame mode.
+
+See also function `git-blame-mode'."
(make-local-variable 'git-blame-colors)
(if git-blame-autoupdate
(add-hook 'after-change-functions 'git-blame-after-change nil t)
(remove-hook 'after-change-functions 'git-blame-after-change t))
(git-blame-cleanup)
- (if git-blame-mode
- (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))
- (cancel-timer git-blame-idle-timer)))
+ (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))
+ (setq git-blame-mode t)
+ (git-blame-run))
+
+(defun git-blame-mode-off ()
+ "Turn off git-blame mode.
+
+See also function `git-blame-mode'."
+ (git-blame-cleanup)
+ (if git-blame-idle-timer (cancel-timer git-blame-idle-timer))
+ (setq git-blame-mode nil))
;;;###autoload
(defun git-reblame ()
"Recalculate all blame information in the current buffer"
+ (interactive)
(unless git-blame-mode
(error "git-blame is not active"))
- (interactive)
+
(git-blame-cleanup)
(git-blame-run))
--
1.5.0.5
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 1/2] git-blame.el: separate git-blame-mode to ease maintenance
2007-03-26 21:00 [PATCH 1/2] git-blame.el: separate git-blame-mode to ease maintenance Xavier Maillard
@ 2007-03-27 8:38 ` David Kågedal
2007-03-27 14:56 ` Xavier Maillard
0 siblings, 1 reply; 4+ messages in thread
From: David Kågedal @ 2007-03-27 8:38 UTC (permalink / raw)
To: git
Xavier Maillard <zedek@gnu.org> writes:
> git-blame-mode has been splitted into git-blame-mode-on and
> git-blame-mode-off; it now conditionnaly calls one of them depending
> of how we call it. Code is now easier to maintain and to understand.
>
> Fixed `git-reblame' function: interactive form was at the wrong
> place.
>
> String displayed on the mode line is now configurable through
> `git-blame-mode-line-string` (default to " blame").
Why do you feel the need for this? I don't remember seeing any other
minor mode that does this.
Other than that, I think it is an improvement.
> Signed-off-by: Xavier Maillard <zedek@gnu.org>
> ---
> contrib/emacs/git-blame.el | 55 +++++++++++++++++++++++++++++--------------
> 1 files changed, 37 insertions(+), 18 deletions(-)
>
> diff --git a/contrib/emacs/git-blame.el b/contrib/emacs/git-blame.el
> index 64ad50b..bd87a86 100644
> --- a/contrib/emacs/git-blame.el
> +++ b/contrib/emacs/git-blame.el
> @@ -127,39 +127,58 @@
>
> (defvar git-blame-mode nil)
> (make-variable-buffer-local 'git-blame-mode)
> -(unless (assq 'git-blame-mode minor-mode-alist)
> - (setq minor-mode-alist
> - (cons (list 'git-blame-mode " blame")
> - minor-mode-alist)))
> +
> +(defvar git-blame-mode-line-string " blame"
> + "String to display on the mode line when git-blame is active.")
> +
> +(or (assq 'git-blame-mode minor-mode-alist)
> + (setq minor-mode-alist
> + (cons '(git-blame-mode git-blame-mode-line-string) minor-mode-alist)))
>
> ;;;###autoload
> (defun git-blame-mode (&optional arg)
> - "Minor mode for displaying Git blame"
> + "Toggle minor mode for displaying Git blame
> +
> +With prefix ARG, turn the mode on if ARG is positive."
> (interactive "P")
> - (if arg
> - (setq git-blame-mode (eq arg 1))
> - (setq git-blame-mode (not git-blame-mode)))
> + (cond
> + ((null arg)
> + (if git-blame-mode (git-blame-mode-off) (git-blame-mode-on)))
> + ((> (prefix-numeric-value arg) 0) (git-blame-mode-on))
> + (t (git-blame-mode-off))))
> +
> +(defun git-blame-mode-on ()
> + "Turn on git-blame mode.
> +
> +See also function `git-blame-mode'."
> (make-local-variable 'git-blame-colors)
> (if git-blame-autoupdate
> (add-hook 'after-change-functions 'git-blame-after-change nil t)
> (remove-hook 'after-change-functions 'git-blame-after-change t))
> (git-blame-cleanup)
> - (if git-blame-mode
> - (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))
> - (cancel-timer git-blame-idle-timer)))
> + (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))
> + (setq git-blame-mode t)
> + (git-blame-run))
> +
> +(defun git-blame-mode-off ()
> + "Turn off git-blame mode.
> +
> +See also function `git-blame-mode'."
> + (git-blame-cleanup)
> + (if git-blame-idle-timer (cancel-timer git-blame-idle-timer))
> + (setq git-blame-mode nil))
>
> ;;;###autoload
> (defun git-reblame ()
> "Recalculate all blame information in the current buffer"
> + (interactive)
> (unless git-blame-mode
> (error "git-blame is not active"))
> - (interactive)
> +
> (git-blame-cleanup)
> (git-blame-run))
--
David Kågedal
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] git-blame.el: separate git-blame-mode to ease maintenance
2007-03-27 8:38 ` David Kågedal
@ 2007-03-27 14:56 ` Xavier Maillard
2007-03-28 8:47 ` David Kågedal
0 siblings, 1 reply; 4+ messages in thread
From: Xavier Maillard @ 2007-03-27 14:56 UTC (permalink / raw)
To: David Kågedal; +Cc: git
Hi,
> String displayed on the mode line is now configurable through
> `git-blame-mode-line-string` (default to " blame").
Why do you feel the need for this? I don't remember seeing any other
minor mode that does this.
Because, I like when I can hide mode line strings for certains
minor modes or even just shorten it. Here for example, I do not
feel the need to display "Blame" in the mode line since
git-blame.el is easily identifiable.
Xavier
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] git-blame.el: separate git-blame-mode to ease maintenance
2007-03-27 14:56 ` Xavier Maillard
@ 2007-03-28 8:47 ` David Kågedal
0 siblings, 0 replies; 4+ messages in thread
From: David Kågedal @ 2007-03-28 8:47 UTC (permalink / raw)
To: Xavier Maillard; +Cc: git
Xavier Maillard <zedek@gnu.org> writes:
> Hi,
>
> > String displayed on the mode line is now configurable through
> > `git-blame-mode-line-string` (default to " blame").
>
> Why do you feel the need for this? I don't remember seeing any other
> minor mode that does this.
>
> Because, I like when I can hide mode line strings for certains
> minor modes or even just shorten it. Here for example, I do not
> feel the need to display "Blame" in the mode line since
> git-blame.el is easily identifiable.
Ok. I guess it won't do any harm :-)
--
David Kågedal
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2007-03-28 9:11 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-03-26 21:00 [PATCH 1/2] git-blame.el: separate git-blame-mode to ease maintenance Xavier Maillard
2007-03-27 8:38 ` David Kågedal
2007-03-27 14:56 ` Xavier Maillard
2007-03-28 8:47 ` David Kågedal
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.