Skip to content
This repository
Browse code

Merge branch 'maint' into 'master'

  • Loading branch information...
commit 47b4632f328b62591525ca95f3cfe711e04543af 2 parents c5a6cdc + d10ab11
Rémi Vanicat authored September 26, 2012
4  CONTRIBUTING.md
Source Rendered
@@ -12,7 +12,7 @@ Magit uses 3 main branches for its lifecyle: `maint`, `master` and `next`.
12 12
 * `master` contains the set of patches that will highly likely make it into the
13 13
   next major release.
14 14
 * `next` contains patches that necessitate some additional checks/improvements
15  
-  before they're integrating into a release.
  15
+  before they're integrated into a release.
16 16
 
17 17
 ## Making changes
18 18
 
@@ -27,7 +27,7 @@ Please make sure your commits are well-organized and "atomic" (hitting a single
27 27
 well-defined target each).
28 28
 
29 29
 Please also make sure you check that byte-compilation completes without errors
30  
-of warnings, and that tests run without failures.
  30
+or warnings, and that tests run without failures.
31 31
 
32 32
 Bonus points if you add tests to cover the feature you're hacking.
33 33
 
10  magit.el
@@ -830,9 +830,12 @@ Does not follow symlinks."
830 830
                      prompt)
831 831
                    choices predicate require-match initial-input hist def))
832 832
 
833  
-(defun magit-completing-read (prompt choices &optional predicate require-match
  833
+(defun magit-completing-read (prompt collection &optional predicate require-match
834 834
                                      initial-input hist def)
835  
-  (funcall magit-completing-read-function prompt choices predicate require-match
  835
+  "Call function in `magit-completing-read-function' to read user input
  836
+
  837
+Read `completing-read' documentation for the meaning of the argument"
  838
+  (funcall magit-completing-read-function prompt collection predicate require-match
836 839
            initial-input hist def))
837 840
 
838 841
 (defun magit-use-region-p ()
@@ -3634,7 +3637,6 @@ user input."
3634 3637
                              4))
3635 3638
                        (or (magit-get-top-dir default-directory)
3636 3639
                            (magit-read-top-dir nil)))))
3637  
-  (magit-save-some-buffers)
3638 3640
   (let ((topdir (magit-get-top-dir dir)))
3639 3641
     (unless topdir
3640 3642
       (when (y-or-n-p (format "There is no Git repository in %S.  Create one? "
@@ -3642,6 +3644,8 @@ user input."
3642 3644
         (magit-init dir)
3643 3645
         (setq topdir (magit-get-top-dir dir))))
3644 3646
     (when topdir
  3647
+      (let ((default-directory topdir))
  3648
+        (magit-save-some-buffers))
3645 3649
       (let ((buf (or (magit-find-status-buffer topdir)
3646 3650
                      (generate-new-buffer
3647 3651
                       (concat "*magit: "
4  magit.texi
@@ -11,7 +11,7 @@
11 11
 @end direntry
12 12
 
13 13
 @copying
14  
-Copyright @copyright{} 2008, 2009, 2010, 2011 Magit contributors. (See
  14
+Copyright @copyright{} 2008, 2009, 2010, 2011, 2012 Magit contributors. (See
15 15
 the header of magit.el for the lengthy list of Magit contributors.)
16 16
 
17 17
 @quotation
@@ -569,7 +569,7 @@ Typing  @kbd{b m} will let you rename a branch. Unless a branch with the same
569 569
 name already exists, obviously...
570 570
 
571 571
 
572  
-To create a new branch and switch to it immediately, type @kbd{b n}.
  572
+To create a new branch and switch to it immediately, type @kbd{b c}.
573 573
 
574 574
 
575 575
 To delete a branch, type @kbd{b d}. If you're currently on that

0 notes on commit 47b4632

Please sign in to comment.
Something went wrong with that request. Please try again.