Karsten Hopp 5e2d48
To: vim_dev@googlegroups.com
Karsten Hopp 5e2d48
Subject: Patch 7.4.776
Karsten Hopp 5e2d48
Fcc: outbox
Karsten Hopp 5e2d48
From: Bram Moolenaar <Bram@moolenaar.net>
Karsten Hopp 5e2d48
Mime-Version: 1.0
Karsten Hopp 5e2d48
Content-Type: text/plain; charset=UTF-8
Karsten Hopp 5e2d48
Content-Transfer-Encoding: 8bit
Karsten Hopp 5e2d48
------------
Karsten Hopp 5e2d48
Karsten Hopp 5e2d48
Patch 7.4.776
Karsten Hopp 5e2d48
Problem:    Equivalence class for 'd' does not work correctly.
Karsten Hopp 5e2d48
Solution:   Fix 0x1e0f and 0x1d0b. (Dominique Pelle)
Karsten Hopp 5e2d48
Files:      src/regexp.c, src/regexp_nfa.c
Karsten Hopp 5e2d48
Karsten Hopp 5e2d48
Karsten Hopp 5e2d48
*** ../vim-7.4.775/src/regexp.c	2015-06-09 20:39:04.322545425 +0200
Karsten Hopp 5e2d48
--- src/regexp.c	2015-07-10 18:53:07.391711695 +0200
Karsten Hopp 5e2d48
***************
Karsten Hopp 5e2d48
*** 1011,1020 ****
Karsten Hopp 5e2d48
  		      REGMBC(0x107) REGMBC(0x109) REGMBC(0x10b)
Karsten Hopp 5e2d48
  		      REGMBC(0x10d)
Karsten Hopp 5e2d48
  		      return;
Karsten Hopp 5e2d48
! 	    case 'd': CASEMBC(0x10f) CASEMBC(0x111) CASEMBC(0x1d0b)
Karsten Hopp 5e2d48
! 	    CASEMBC(0x1e11)
Karsten Hopp 5e2d48
  		      regmbc('d'); REGMBC(0x10f) REGMBC(0x111)
Karsten Hopp 5e2d48
! 		      REGMBC(0x1e0b) REGMBC(0x01e0f) REGMBC(0x1e11)
Karsten Hopp 5e2d48
  		      return;
Karsten Hopp 5e2d48
  	    case 'e': case 0xe8: case 0xe9: case 0xea: case 0xeb:
Karsten Hopp 5e2d48
  	    CASEMBC(0x113) CASEMBC(0x115) CASEMBC(0x117) CASEMBC(0x119)
Karsten Hopp 5e2d48
--- 1011,1020 ----
Karsten Hopp 5e2d48
  		      REGMBC(0x107) REGMBC(0x109) REGMBC(0x10b)
Karsten Hopp 5e2d48
  		      REGMBC(0x10d)
Karsten Hopp 5e2d48
  		      return;
Karsten Hopp 5e2d48
! 	    case 'd': CASEMBC(0x10f) CASEMBC(0x111) CASEMBC(0x1e0b)
Karsten Hopp 5e2d48
! 	    CASEMBC(0x1e0f) CASEMBC(0x1e11)
Karsten Hopp 5e2d48
  		      regmbc('d'); REGMBC(0x10f) REGMBC(0x111)
Karsten Hopp 5e2d48
! 		      REGMBC(0x1e0b) REGMBC(0x1e0f) REGMBC(0x1e11)
Karsten Hopp 5e2d48
  		      return;
Karsten Hopp 5e2d48
  	    case 'e': case 0xe8: case 0xe9: case 0xea: case 0xeb:
Karsten Hopp 5e2d48
  	    CASEMBC(0x113) CASEMBC(0x115) CASEMBC(0x117) CASEMBC(0x119)
Karsten Hopp 5e2d48
*** ../vim-7.4.775/src/regexp_nfa.c	2015-05-04 10:33:09.633193707 +0200
Karsten Hopp 5e2d48
--- src/regexp_nfa.c	2015-07-10 18:53:07.391711695 +0200
Karsten Hopp 5e2d48
***************
Karsten Hopp 5e2d48
*** 542,548 ****
Karsten Hopp 5e2d48
      ret = alloc(len);
Karsten Hopp 5e2d48
      if (ret != NULL)
Karsten Hopp 5e2d48
      {
Karsten Hopp 5e2d48
- 	len = 0;
Karsten Hopp 5e2d48
  	p = start->out->out; /* skip first char, it goes into regstart */
Karsten Hopp 5e2d48
  	s = ret;
Karsten Hopp 5e2d48
  	while (p->c > 0)
Karsten Hopp 5e2d48
--- 542,547 ----
Karsten Hopp 5e2d48
***************
Karsten Hopp 5e2d48
*** 946,955 ****
Karsten Hopp 5e2d48
  		    EMITMBC(0x10b) EMITMBC(0x10d)
Karsten Hopp 5e2d48
  		    return OK;
Karsten Hopp 5e2d48
  
Karsten Hopp 5e2d48
! 	    case 'd': CASEMBC(0x10f) CASEMBC(0x111) CASEMBC(0x1d0b)
Karsten Hopp 5e2d48
! 	    CASEMBC(0x1e11)
Karsten Hopp 5e2d48
! 		    EMIT2('d'); EMITMBC(0x10f) EMITMBC(0x111) EMITMBC(0x1e0b)
Karsten Hopp 5e2d48
! 		    EMITMBC(0x01e0f) EMITMBC(0x1e11)
Karsten Hopp 5e2d48
  		    return OK;
Karsten Hopp 5e2d48
  
Karsten Hopp 5e2d48
  	    case 'e': case 0350: case 0351: case 0352: case 0353:
Karsten Hopp 5e2d48
--- 945,954 ----
Karsten Hopp 5e2d48
  		    EMITMBC(0x10b) EMITMBC(0x10d)
Karsten Hopp 5e2d48
  		    return OK;
Karsten Hopp 5e2d48
  
Karsten Hopp 5e2d48
! 	    case 'd': CASEMBC(0x10f) CASEMBC(0x111) CASEMBC(0x1e0b)
Karsten Hopp 5e2d48
! 	    CASEMBC(0x1e0f) CASEMBC(0x1e11)
Karsten Hopp 5e2d48
! 		    EMIT2('d'); EMITMBC(0x10f) EMITMBC(0x111)
Karsten Hopp 5e2d48
! 		    EMITMBC(0x1e0b) EMITMBC(0x1e0f) EMITMBC(0x1e11)
Karsten Hopp 5e2d48
  		    return OK;
Karsten Hopp 5e2d48
  
Karsten Hopp 5e2d48
  	    case 'e': case 0350: case 0351: case 0352: case 0353:
Karsten Hopp 5e2d48
*** ../vim-7.4.775/src/version.c	2015-07-10 18:18:35.579206260 +0200
Karsten Hopp 5e2d48
--- src/version.c	2015-07-10 18:55:20.974449842 +0200
Karsten Hopp 5e2d48
***************
Karsten Hopp 5e2d48
*** 743,744 ****
Karsten Hopp 5e2d48
--- 743,746 ----
Karsten Hopp 5e2d48
  {   /* Add new patch number below this line */
Karsten Hopp 5e2d48
+ /**/
Karsten Hopp 5e2d48
+     776,
Karsten Hopp 5e2d48
  /**/
Karsten Hopp 5e2d48
Karsten Hopp 5e2d48
-- 
Karsten Hopp 5e2d48
$ echo pizza > /dev/oven
Karsten Hopp 5e2d48
Karsten Hopp 5e2d48
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
Karsten Hopp 5e2d48
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
Karsten Hopp 5e2d48
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
Karsten Hopp 5e2d48
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///