gwh/slackbuilds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into dev

Browse source
This commit is contained in:
Marius Vollmer 2008-08-11 05:42:43 +03:00
commit ff353152c6
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
magit.el
View file

@ -161,7 +161,7 @@
(or (not magit-process) (or (not magit-process)
(error "Git is already running.")) (error "Git is already running."))
(let ((dir default-directory) (let ((dir default-directory)
(buf (get-buffer-create "*git-process*"))) (buf (get-buffer-create "*magit-process*")))
(save-excursion (save-excursion
(set-buffer buf) (set-buffer buf)
(setq default-directory dir) (setq default-directory dir)
@ -198,7 +198,7 @@
(defun magit-display-process () (defun magit-display-process ()
(interactive) (interactive)
(display-buffer "*git-process*")) (display-buffer "*magit-process*"))
;;; Mode ;;; Mode
@ -724,9 +724,11 @@ pushed.
(display-buffer buf) (display-buffer buf)
(save-excursion (save-excursion
(set-buffer buf) (set-buffer buf)
(erase-buffer) (setq buffer-read-only t)
(magit-insert-section 'commit nil nil (let ((inhibit-read-only t))
"git" "log" "--max-count=1" "-p" commit)))) (erase-buffer)
(magit-insert-section 'commit nil 'magit-wash-diff
"git" "log" "--max-count=1" "-p" commit)))))
(defun magit-quit () (defun magit-quit ()
(interactive) (interactive)
@ -755,7 +757,7 @@ pushed.
(erase-buffer) (erase-buffer)
(magit-insert-section 'history "History" 'magit-wash-log (magit-insert-section 'history "History" 'magit-wash-log
"git" "log" "--max-count=100" "git" "log" "--max-count=100"
"--pretty=oneline"))))) "--pretty=oneline" head)))))
(defun magit-browse-branch-log () (defun magit-browse-branch-log ()
(interactive) (interactive)