aboutsummaryrefslogtreecommitdiff
path: root/contrib/emacs
diff options
context:
space:
mode:
authorAlexandre Julliard <julliard@winehq.org>2006-11-03 17:41:23 +0100
committerJunio C Hamano <junkio@cox.net>2006-11-04 01:50:13 -0800
commit8a078c3f72002af9bf79dc884fe321e3e48930fc (patch)
tree0915b69c780fd9b20212d95d0982d495258fb635 /contrib/emacs
parent6255ef08ae746bdad34851297a989ad6f36f6a21 (diff)
downloadgit-8a078c3f72002af9bf79dc884fe321e3e48930fc.tar.gz
git-8a078c3f72002af9bf79dc884fe321e3e48930fc.tar.xz
git.el: Added functions for moving to the next/prev unmerged file.
This is useful when doing a merge that changes many files with only a few conflicts here and there. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'contrib/emacs')
-rw-r--r--contrib/emacs/git.el28
1 files changed, 28 insertions, 0 deletions
diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el
index 5354cd67b..e283df2fd 100644
--- a/contrib/emacs/git.el
+++ b/contrib/emacs/git.el
@@ -670,6 +670,32 @@ and returns the process output as a string."
(unless git-status (error "Not in git-status buffer."))
(ewoc-goto-prev git-status n))
+(defun git-next-unmerged-file (&optional n)
+ "Move the selection down N unmerged files."
+ (interactive "p")
+ (unless git-status (error "Not in git-status buffer."))
+ (let* ((last (ewoc-locate git-status))
+ (node (ewoc-next git-status last)))
+ (while (and node (> n 0))
+ (when (eq 'unmerged (git-fileinfo->state (ewoc-data node)))
+ (setq n (1- n))
+ (setq last node))
+ (setq node (ewoc-next git-status node)))
+ (ewoc-goto-node git-status last)))
+
+(defun git-prev-unmerged-file (&optional n)
+ "Move the selection up N unmerged files."
+ (interactive "p")
+ (unless git-status (error "Not in git-status buffer."))
+ (let* ((last (ewoc-locate git-status))
+ (node (ewoc-prev git-status last)))
+ (while (and node (> n 0))
+ (when (eq 'unmerged (git-fileinfo->state (ewoc-data node)))
+ (setq n (1- n))
+ (setq last node))
+ (setq node (ewoc-prev git-status node)))
+ (ewoc-goto-node git-status last)))
+
(defun git-add-file ()
"Add marked file(s) to the index cache."
(interactive)
@@ -967,7 +993,9 @@ and returns the process output as a string."
(define-key map "m" 'git-mark-file)
(define-key map "M" 'git-mark-all)
(define-key map "n" 'git-next-file)
+ (define-key map "N" 'git-next-unmerged-file)
(define-key map "p" 'git-prev-file)
+ (define-key map "P" 'git-prev-unmerged-file)
(define-key map "q" 'git-status-quit)
(define-key map "r" 'git-remove-file)
(define-key map "R" 'git-resolve-file)