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

Merge remote branch 'refs/remotes/sigma/t/int/extensions' into extensions

Browse source
This commit is contained in:
Phil Jackson 2010-07-07 13:21:54 +01:00
commit aab7bc85f6
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
magit.el
View file

@ -1356,8 +1356,7 @@ FUNC should leave point at the end of the modified region"
,doc ,doc
,inter ,inter
(or (run-hook-with-args-until-success (or (run-hook-with-args-until-success
',hook ,@(remove-if (lambda (x) (member x '(&optional &rest))) ',hook ,@(remq '&optional (remq '&rest arglist)))
arglist))
,@instr)))) ,@instr))))
;;; Running commands ;;; Running commands
@ -2598,7 +2597,6 @@ insert a line to tell how to insert more of them"
(magit-git-exit-code "update-index" "--refresh") (magit-git-exit-code "update-index" "--refresh")
(magit-insert-untracked-files) (magit-insert-untracked-files)
(magit-insert-stashes) (magit-insert-stashes)
(magit-insert-topics)
(magit-insert-pending-changes) (magit-insert-pending-changes)
(magit-insert-pending-commits) (magit-insert-pending-commits)
(magit-insert-unpulled-commits remote remote-branch) (magit-insert-unpulled-commits remote remote-branch)