commit fc966c19f85afc6b856a06c00a93c4fe96280d31
author Bram Moolenaar <Bram@vim.org> Sun Jan 01 18:04:33 2023 +0000
committer Bram Moolenaar <Bram@vim.org> Sun Jan 01 18:04:33 2023 +0000
tree d572275a08c5e978e69f1dcd401dd9a23c9b969b
parent ec8b74f7ab37ac83045c9eba723daf3ff8d62fc2

patch 9.0.1126: bracketed paste can be enabled when it is not recognized

Problem:    Bracketed paste can be enabled when pasted text is not recognized.
Solution:   Output t_BE only when t_PS and t_PE are set.

src/edit.c

diff --git a/src/edit.c b/src/edit.c
index 85d59d1..4a89fe1 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -3714,7 +3714,7 @@
 	MAY_WANT_TO_LOG_THIS;
 
 	// Re-enable bracketed paste mode.
-	out_str(T_BE);
+	out_str_t_BE();
 
 	// Re-enable modifyOtherKeys.
 	out_str_t_TI();

src/normal.c

diff --git a/src/normal.c b/src/normal.c
index 4df6b6a..cc4e246 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -454,7 +454,7 @@
 	    MAY_WANT_TO_LOG_THIS;
 
 	    // Re-enable bracketed paste mode and modifyOtherKeys
-	    out_str(T_BE);
+	    out_str_t_BE();
 	    out_str_t_TI();
 	}
 

src/proto/term.pro

diff --git a/src/proto/term.pro b/src/proto/term.pro
index 93edba1..8c8b813 100644
--- a/src/proto/term.pro
+++ b/src/proto/term.pro
@@ -49,6 +49,7 @@
 void set_shellsize(int width, int height, int mustset);
 void out_str_t_TE(void);
 void out_str_t_TI(void);
+void out_str_t_BE(void);
 void may_send_t_RK(void);
 void settmode(tmode_T tmode);
 void starttermcap(void);

src/term.c

diff --git a/src/term.c b/src/term.c
index e7466e6..0bb6d71 100644
--- a/src/term.c
+++ b/src/term.c
@@ -3757,6 +3757,21 @@
 }
 
 /*
+ * Output T_BE, but only when t_PS and t_PE are set.
+ */
+    void
+out_str_t_BE(void)
+{
+    char_u *p;
+
+    if (T_BE == NULL || *T_BE == NUL
+	    || (p = find_termcode((char_u *)"PS")) == NULL || *p == NUL
+	    || (p = find_termcode((char_u *)"PE")) == NULL || *p == NUL)
+	return;
+    out_str(T_BE);
+}
+
+/*
  * If t_TI was recently sent and there is no typeahead or work to do, now send
  * t_RK.  This is postponed to avoid the response arriving in a shell command
  * or after Vim exits.
@@ -3834,7 +3849,7 @@
 		}
 		else
 		{
-		    out_str(T_BE);	// enable bracketed paste mode (should
+		    out_str_t_BE();	// enable bracketed paste mode (should
 					// be before mch_settmode().
 		    out_str_t_TI();	// possibly enables modifyOtherKeys
 		}
@@ -3862,7 +3877,7 @@
 	out_str(T_TI);			// start termcap mode
 	out_str_t_TI();			// start "raw" mode
 	out_str(T_KS);			// start "keypad transmit" mode
-	out_str(T_BE);			// enable bracketed paste mode
+	out_str_t_BE();			// enable bracketed paste mode
 
 #if defined(UNIX) || defined(VMS)
 	// Enable xterm's focus reporting mode when 'esckeys' is set.

src/version.c

diff --git a/src/version.c b/src/version.c
index 5688d0d..389209a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1126,
+/**/
     1125,
 /**/
     1124,