~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
stgit.el: Fix some indentation
[stgit]
/
contrib
/
stgit.el
diff --git
a/contrib/stgit.el
b/contrib/stgit.el
index
4d957c3
..
eb50213
100644
(file)
--- a/
contrib/stgit.el
+++ b/
contrib/stgit.el
@@
-161,7
+161,8
@@
Argument DIR is the repository path."
(mapc (lambda (arg) (define-key stgit-mode-map (car arg) (cdr arg)))
'((" " . stgit-mark)
("m" . stgit-mark)
(mapc (lambda (arg) (define-key stgit-mode-map (car arg) (cdr arg)))
'((" " . stgit-mark)
("m" . stgit-mark)
- ("\d" . stgit-unmark)
+ ("\d" . stgit-unmark-up)
+ ("u" . stgit-unmark-down)
("?" . stgit-help)
("h" . stgit-help)
("p" . previous-line)
("?" . stgit-help)
("h" . stgit-help)
("p" . previous-line)
@@
-246,7
+247,7
@@
Commands:
"Run stg init"
(interactive)
(stgit-capture-output nil
"Run stg init"
(interactive)
(stgit-capture-output nil
- (stgit-run "init"))
+
(stgit-run "init"))
(stgit-reload))
(defun stgit-mark ()
(stgit-reload))
(defun stgit-mark ()
@@
-257,13
+258,19
@@
Commands:
(stgit-reload))
(next-line))
(stgit-reload))
(next-line))
-(defun stgit-unmark ()
- "
Mark
the patch on the previous line"
+(defun stgit-unmark
-up
()
+ "
Remove mark from
the patch on the previous line"
(interactive)
(forward-line -1)
(interactive)
(forward-line -1)
- (let ((patch (stgit-patch-at-point)))
- (stgit-remove-mark patch)
- (stgit-reload)))
+ (stgit-remove-mark (stgit-patch-at-point))
+ (stgit-reload))
+
+(defun stgit-unmark-down ()
+ "Remove mark from the patch on the current line"
+ (interactive)
+ (stgit-remove-mark (stgit-patch-at-point))
+ (forward-line)
+ (stgit-reload))
(defun stgit-rename (name)
"Rename the patch under point"
(defun stgit-rename (name)
"Rename the patch under point"
@@
-280,7
+287,7
@@
Commands:
"Run stg repair"
(interactive)
(stgit-capture-output nil
"Run stg repair"
(interactive)
(stgit-capture-output nil
- (stgit-run "repair"))
+
(stgit-run "repair"))
(stgit-reload))
(defun stgit-commit ()
(stgit-reload))
(defun stgit-commit ()
@@
-322,7
+329,7
@@
With numeric prefix argument, pop that many patches."
(let ((patch (stgit-patch-at-point))
(applied (stgit-applied-at-point)))
(stgit-capture-output nil
(let ((patch (stgit-patch-at-point))
(applied (stgit-applied-at-point)))
(stgit-capture-output nil
-
(stgit-run (if applied "pop" "push") patch))
+ (stgit-run (if applied "pop" "push") patch))
(stgit-reload)))
(defun stgit-goto ()
(stgit-reload)))
(defun stgit-goto ()
@@
-330,7
+337,7
@@
With numeric prefix argument, pop that many patches."
(interactive)
(let ((patch (stgit-patch-at-point)))
(stgit-capture-output nil
(interactive)
(let ((patch (stgit-patch-at-point)))
(stgit-capture-output nil
-
(stgit-run "goto" patch))
+ (stgit-run "goto" patch))
(stgit-reload)))
(defun stgit-show ()
(stgit-reload)))
(defun stgit-show ()
@@
-454,14
+461,14
@@
With prefix argument, run it with the --hard flag."
With prefix argument, refresh the patch under point."
(interactive "P")
(let ((patchargs (if arg
With prefix argument, refresh the patch under point."
(interactive "P")
(let ((patchargs (if arg
- (let ((patches (stgit-patches-marked-or-at-point)))
- (cond ((null patches)
- (error "no patch to update"))
- ((> (length patches) 1)
- (error "too many patches selected"))
- (t
- (cons "-p" patches))))
- nil)))
+
(let ((patches (stgit-patches-marked-or-at-point)))
+
(cond ((null patches)
+
(error "no patch to update"))
+
((> (length patches) 1)
+
(error "too many patches selected"))
+
(t
+
(cons "-p" patches))))
+
nil)))
(stgit-capture-output nil
(apply 'stgit-run "refresh" patchargs)))
(stgit-reload))
(stgit-capture-output nil
(apply 'stgit-run "refresh" patchargs)))
(stgit-reload))