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

Merge remote branch 'refs/remotes/nex3/log-edit'

Browse source
This commit is contained in:
Phil Jackson 2010-08-02 15:02:49 +01:00
commit 5281824586
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
magit.el
View file

@ -3157,7 +3157,7 @@ Prefix arg means justify as well."
(let ((buf (get-buffer-create magit-log-edit-buffer-name))) (let ((buf (get-buffer-create magit-log-edit-buffer-name)))
(with-current-buffer buf (with-current-buffer buf
(goto-char (point-min)) (goto-char (point-min))
(if (search-forward-regexp (format "^\\([A-Za-z0-9-_]+:.*\n\\)+%s" (if (search-forward-regexp (format "^\\([A-Za-z0-9-_]+:.*\n\\)*%s"
(regexp-quote magit-log-header-end)) (regexp-quote magit-log-header-end))
nil t) nil t)
(delete-region (match-beginning 0) (match-end 0))) (delete-region (match-beginning 0) (match-end 0)))
@ -3511,7 +3511,7 @@ With prefix argument, changes in staging area are kept.
,@(if (not docommit) (list "--no-commit")) ,@(if (not docommit) (list "--no-commit"))
,commit) ,commit)
nil noerase))) nil noerase)))
(when (or (not docommit) success) (when (and (not docommit) success)
(cond (revert (cond (revert
(magit-log-edit-append (magit-log-edit-append
(magit-format-commit commit "Reverting \"%s\""))) (magit-format-commit commit "Reverting \"%s\"")))