summaryrefslogtreecommitdiffstats
path: root/patches/source/vim/patches/7.4.104
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2018-05-25 23:29:36 +0000
committer Eric Hameleers <alien@slackware.com>2018-05-31 15:18:32 -0700
commit8ff4f2f51a6cf07fc33742ce3bee81328896e49b (patch)
tree4a166b8389404be98a6c098babaa444e2dec8f48 /patches/source/vim/patches/7.4.104
parent76fc4757ac91ac7947a01fb7b53dddf9a78a01d1 (diff)
downloadcurrent-14.1.tar.gz
current-14.1.tar.xz
Fri May 25 23:29:36 UTC 201814.1
patches/packages/glibc-zoneinfo-2018e-noarch-2_slack14.1.txz: Rebuilt. Handle removal of US/Pacific-New timezone. If we see that the machine is using this, it will be automatically switched to US/Pacific.
Diffstat (limited to 'patches/source/vim/patches/7.4.104')
-rw-r--r--patches/source/vim/patches/7.4.104107
1 files changed, 107 insertions, 0 deletions
diff --git a/patches/source/vim/patches/7.4.104 b/patches/source/vim/patches/7.4.104
new file mode 100644
index 00000000..6e51568a
--- /dev/null
+++ b/patches/source/vim/patches/7.4.104
@@ -0,0 +1,107 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.4.104
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.4.104
+Problem: ":help s/\_" reports an internal error. (John Beckett)
+Solution: Check for NUL and invalid character classes.
+Files: src/regexp_nfa.c
+
+
+*** ../vim-7.4.103/src/regexp_nfa.c 2013-11-21 16:03:35.000000000 +0100
+--- src/regexp_nfa.c 2013-11-28 14:05:34.000000000 +0100
+***************
+*** 239,245 ****
+--- 239,247 ----
+ NFA_UPPER, NFA_NUPPER
+ };
+
++ static char_u e_nul_found[] = N_("E865: (NFA) Regexp end encountered prematurely");
+ static char_u e_misplaced[] = N_("E866: (NFA regexp) Misplaced %c");
++ static char_u e_ill_char_class[] = N_("E877: (NFA regexp) Invalid character class: %ld");
+
+ /* NFA regexp \ze operator encountered. */
+ static int nfa_has_zend;
+***************
+*** 1137,1143 ****
+ switch (c)
+ {
+ case NUL:
+! EMSG_RET_FAIL(_("E865: (NFA) Regexp end encountered prematurely"));
+
+ case Magic('^'):
+ EMIT(NFA_BOL);
+--- 1139,1145 ----
+ switch (c)
+ {
+ case NUL:
+! EMSG_RET_FAIL(_(e_nul_found));
+
+ case Magic('^'):
+ EMIT(NFA_BOL);
+***************
+*** 1160,1165 ****
+--- 1162,1170 ----
+
+ case Magic('_'):
+ c = no_Magic(getchr());
++ if (c == NUL)
++ EMSG_RET_FAIL(_(e_nul_found));
++
+ if (c == '^') /* "\_^" is start-of-line */
+ {
+ EMIT(NFA_BOL);
+***************
+*** 1216,1221 ****
+--- 1221,1232 ----
+ p = vim_strchr(classchars, no_Magic(c));
+ if (p == NULL)
+ {
++ if (extra == NFA_ADD_NL)
++ {
++ EMSGN(_(e_ill_char_class), c);
++ rc_did_emsg = TRUE;
++ return FAIL;
++ }
+ EMSGN("INTERNAL: Unknown character class char: %ld", c);
+ return FAIL;
+ }
+***************
+*** 4733,4739 ****
+
+ default:
+ /* should not be here :P */
+! EMSGN("E877: (NFA regexp) Invalid character class: %ld", class);
+ return FAIL;
+ }
+ return FAIL;
+--- 4744,4750 ----
+
+ default:
+ /* should not be here :P */
+! EMSGN(_(e_ill_char_class), class);
+ return FAIL;
+ }
+ return FAIL;
+*** ../vim-7.4.103/src/version.c 2013-11-21 18:13:26.000000000 +0100
+--- src/version.c 2013-11-28 14:06:59.000000000 +0100
+***************
+*** 740,741 ****
+--- 740,743 ----
+ { /* Add new patch number below this line */
++ /**/
++ 104,
+ /**/
+
+--
+Everybody wants to go to heaven, but nobody wants to die.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ an exciting new programming language -- http://www.Zimbu.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///