home *** CD-ROM | disk | FTP | other *** search
/ vim.ftp.fu-berlin.de / 2015-02-03.vim.ftp.fu-berlin.de.tar / vim.ftp.fu-berlin.de / patches / 6.1.348 < prev    next >
Encoding:
Internet Message Format  |  2003-02-19  |  3.7 KB
  1. To: vim-dev@vim.org
  2. Subject: Patch 6.1.348
  3. Fcc: outbox
  4. From: Bram Moolenaar <Bram@moolenaar.net>
  5. Mime-Version: 1.0
  6. Content-Type: text/plain; charset=ISO-8859-1
  7. Content-Transfer-Encoding: 8bit
  8. ------------
  9.  
  10. Patch 6.1.348
  11. Problem:    Wildmode with wildmenu: ":set wildmode=list,full", ":colorscheme
  12.         <tab>" results in "zellner" instead of the first entry. (Anand
  13.         Hariharan)
  14. Solution:   Don't call ExpandOne() from globpath(). (Flemming Madsen)
  15. Files:        src/ex_getln.c
  16.  
  17.  
  18. *** ../vim61.347/src/ex_getln.c    Thu Jan  2 21:11:08 2003
  19. --- src/ex_getln.c    Mon Feb 17 21:12:21 2003
  20. ***************
  21. *** 3454,3473 ****
  22.       expand_T    xpc;
  23.       char_u    *buf;
  24.       garray_T    ga;
  25.       int        len;
  26. !     char_u    *p;
  27. !     char_u    **save_cmd_files = cmd_files;
  28. !     int        save_cmd_numfiles = cmd_numfiles;
  29.   
  30.       buf = alloc(MAXPATHL);
  31.       if (buf == NULL)
  32.       return NULL;
  33.   
  34. -     /* ExpandOne() uses cmd_files and cmd_numfiles, need to save and restore
  35. -      * them. */
  36. -     cmd_files = NULL;
  37. -     cmd_numfiles = -1;
  38. - 
  39.       xpc.xp_context = EXPAND_FILES;
  40.       xpc.xp_backslash = XP_BS_NONE;
  41.       ga_init2(&ga, 1, 100);
  42. --- 3454,3469 ----
  43.       expand_T    xpc;
  44.       char_u    *buf;
  45.       garray_T    ga;
  46. +     int        i;
  47.       int        len;
  48. !     int        num_p;
  49. !     char_u    **p;
  50. !     char_u    *cur = NULL;
  51.   
  52.       buf = alloc(MAXPATHL);
  53.       if (buf == NULL)
  54.       return NULL;
  55.   
  56.       xpc.xp_context = EXPAND_FILES;
  57.       xpc.xp_backslash = XP_BS_NONE;
  58.       ga_init2(&ga, 1, 100);
  59. ***************
  60. *** 3481,3520 ****
  61.       {
  62.           add_pathsep(buf);
  63.           STRCAT(buf, file);
  64. !         p = ExpandOne(&xpc, buf, NULL, WILD_USE_NL|WILD_SILENT, WILD_ALL);
  65. !         if (p != NULL)
  66.           {
  67. !         len = (int)STRLEN(p);
  68. !         if (ga.ga_data == NULL)
  69. !         {
  70. !             ga.ga_data = p;
  71. !             ga.ga_room = 0;
  72. !             ga.ga_len = len + 1;
  73. !         }
  74. !         else
  75.           {
  76. !             /* Concatenate new results to previous ones.  Insert a NL
  77. !              * and keep room for the trailing NUL. */
  78. !             ++len;
  79. !             if (ga_grow(&ga, len + 1) == OK)
  80.               {
  81. !             STRCAT(ga.ga_data, "\n");
  82. !             STRCAT(ga.ga_data, p);
  83. !             ga.ga_len += len;
  84. !             ga.ga_room -= len;
  85.               }
  86. !             vim_free(p);
  87.           }
  88.           }
  89.       }
  90.       }
  91. !     vim_free(buf);
  92.   
  93. !     FreeWild(cmd_numfiles, cmd_files);
  94. !     cmd_files = save_cmd_files;
  95. !     cmd_numfiles = save_cmd_numfiles;
  96. ! 
  97. !     return ga.ga_data;
  98.   }
  99.   
  100.   #endif
  101. --- 3477,3510 ----
  102.       {
  103.           add_pathsep(buf);
  104.           STRCAT(buf, file);
  105. !         if (ExpandFromContext(&xpc, buf, &num_p, &p, WILD_SILENT) != FAIL
  106. !                                  && num_p > 0)
  107.           {
  108. !         ExpandEscape(&xpc, buf, num_p, p, WILD_SILENT);
  109. !         for (len = 0, i = 0; i < num_p; ++i)
  110. !             len += (long_u)STRLEN(p[i]) + 1;
  111. ! 
  112. !         /* Concatenate new results to previous ones. */
  113. !         if (ga_grow(&ga, len) == OK)
  114.           {
  115. !             cur = (char_u *)ga.ga_data + ga.ga_len;
  116. !             for (i = 0; i < num_p; ++i)
  117.               {
  118. !             STRCPY(cur, p[i]);
  119. !             cur += STRLEN(p[i]);
  120. !             *cur++ = '\n';
  121.               }
  122. !             ga.ga_len += len;
  123. !             ga.ga_room -= len;
  124.           }
  125.           }
  126.       }
  127.       }
  128. !     if (cur != NULL)
  129. !     *--cur = 0; /* Replace trailing newline with NUL */
  130.   
  131. !     vim_free(buf);
  132. !     return (char_u *)ga.ga_data;
  133.   }
  134.   
  135.   #endif
  136. *** ../vim61.347/src/version.c    Thu Feb 20 21:40:42 2003
  137. --- src/version.c    Thu Feb 20 21:42:35 2003
  138. ***************
  139. *** 608,609 ****
  140. --- 612,615 ----
  141.   {   /* Add new patch number below this line */
  142. + /**/
  143. +     348,
  144.   /**/
  145.  
  146. -- 
  147. Q: How does a UNIX Guru do Sex ?
  148. A: unzip;strip;touch;finger;mount;fsck;more;yes;umount;sleep
  149.  
  150.  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  151. ///          Creator of Vim - Vi IMproved -- http://www.Vim.org          \\\
  152. \\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
  153.  \\\     Help AIDS victims, buy at Amazon -- http://ICCF.nl/click1.html ///
  154.