branch: elpa/git-commit
commit 630ada42cbabf4b437519b9dc5086ea1d6b61b8d
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
magit-extras.el: Rearrange a bit
---
lisp/magit-extras.el | 41 ++++++++++++++++++++++-------------------
1 file changed, 22 insertions(+), 19 deletions(-)
diff --git a/lisp/magit-extras.el b/lisp/magit-extras.el
index 95aaf966b9..18f99da3cf 100644
--- a/lisp/magit-extras.el
+++ b/lisp/magit-extras.el
@@ -47,25 +47,8 @@
"Additional functionality for Magit."
:group 'magit-extensions)
-;;; External Tools
-
-(defcustom magit-gitk-executable
- (or (and (eq system-type 'windows-nt)
- (let ((exe (magit-git-string
- "-c" "alias.X=!x() { which \"$1\" | cygpath -mf -; }; x"
- "X" "gitk.exe")))
- (and exe (file-executable-p exe) exe)))
- (executable-find "gitk") "gitk")
- "The Gitk executable."
- :group 'magit-extras
- :set-after '(magit-git-executable)
- :type 'string)
-
-;;;###autoload
-(defun magit-run-git-gui ()
- "Run `git gui' for the current git repository."
- (interactive)
- (magit-with-toplevel (magit-process-git 0 "gui")))
+;;; Git Tools
+;;;; Git-Gui
;;;###autoload
(defun magit-run-git-gui-blame (commit filename &optional linenum)
@@ -92,6 +75,26 @@ blame to center around the line point is on."
commit
filename)))
+;;;; Gitk
+
+(defcustom magit-gitk-executable
+ (or (and (eq system-type 'windows-nt)
+ (let ((exe (magit-git-string
+ "-c" "alias.X=!x() { which \"$1\" | cygpath -mf -; }; x"
+ "X" "gitk.exe")))
+ (and exe (file-executable-p exe) exe)))
+ (executable-find "gitk") "gitk")
+ "The Gitk executable."
+ :group 'magit-extras
+ :set-after '(magit-git-executable)
+ :type 'string)
+
+;;;###autoload
+(defun magit-run-git-gui ()
+ "Run `git gui' for the current git repository."
+ (interactive)
+ (magit-with-toplevel (magit-process-git 0 "gui")))
+
;;;###autoload
(defun magit-run-gitk ()
"Run `gitk' in the current repository."