From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 19 Jun 2015 10:43:07 +0000 (+0200)
Subject: patch 7.4.740
X-Git-Tag: v7.4.740
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c7a0d32c834ff321491d8fd7bc68bf6cabd11e44;p=vim

patch 7.4.740
Problem:    ":1quit" works like ":.quit". (Bohr Shaw)
Solution:   Don't exit Vim when a range is specified. (Christian Brabandt)
---

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 9ae8fff2a..971a2022b 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -7092,7 +7092,14 @@ ex_quit(eap)
     else
     {
 #ifdef FEAT_WINDOWS
-	if (only_one_window())	    /* quit last window */
+	/* quit last window
+	 * Note: only_one_window() returns true, even so a help window is
+	 * still open. In that case only quit, if no address has been
+	 * specified. Example:
+	 * :h|wincmd w|1q     - don't quit
+	 * :h|wincmd w|q      - quit
+	 */
+	if (only_one_window() && (firstwin == lastwin || eap->addr_count == 0))
 #endif
 	    getout(0);
 #ifdef FEAT_WINDOWS
diff --git a/src/testdir/test13.in b/src/testdir/test13.in
index cb8a6fff8..cbf78c736 100644
--- a/src/testdir/test13.in
+++ b/src/testdir/test13.in
@@ -48,6 +48,12 @@ otestje3
 :au BufWipeout Xtestje1 buf Xtestje1
 :bwipe
 :w >>test.out
+:only
+:help
+:wincmd w
+:1quit
+:$put ='Final line'
+:$w >>test.out
 :qa!
 ENDTEST
 
diff --git a/src/testdir/test13.ok b/src/testdir/test13.ok
index 0f1fc347a..66ebce63f 100644
--- a/src/testdir/test13.ok
+++ b/src/testdir/test13.ok
@@ -28,3 +28,4 @@ testje1
 	contents
 	contents
 end of testfile
+Final line
diff --git a/src/version.c b/src/version.c
index 03352a7aa..df9b506a0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    740,
 /**/
     739,
 /**/