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.0.207 < prev    next >
Encoding:
Internet Message Format  |  2002-02-09  |  6.6 KB
  1. To: vim-dev@vim.org
  2. Subject: Patch 6.0.207 (extra)
  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.0.207 (extra)
  11. Problem:    Win32: The shortcuts and start menu entries let Vim startup in the
  12.         desktop directory, which is not very useful.
  13. Solution:   Let shortcuts start Vim in $HOME or $HOMEDIR$HOMEPATH.
  14. Files:        src/dosinst.c
  15.  
  16.  
  17. *** ../vim60.206/src/dosinst.c    Sun Feb 10 12:57:34 2002
  18. --- src/dosinst.c    Sun Feb 10 16:28:26 2002
  19. ***************
  20. *** 32,37 ****
  21. --- 32,38 ----
  22.                        directory to write .bat files in */
  23.   char    *default_vim_dir = NULL;  /* when not NULL, use this as the default
  24.                        install dir for NSIS */
  25. + char    homedir[BUFSIZE];    /* home directory or "" */
  26.   
  27.   /*
  28.    * Structure used for each choice the user can make.
  29. ***************
  30. *** 677,682 ****
  31. --- 678,714 ----
  32.       fclose(fd);
  33.       else
  34.       *oldvimrc = NUL;
  35. + 
  36. +     /*
  37. +      * Get default home directory.
  38. +      * Prefer $HOME if it's set.  For Win NT use $HOMEDRIVE and $HOMEPATH.
  39. +      * Otherwise, if there is a "c:" drive use that.
  40. +      */
  41. +     p = getenv("HOME");
  42. +     if (p != NULL && *p != NUL && strlen(p) < BUFSIZE)
  43. +     strcpy(homedir, p);
  44. +     else
  45. +     {
  46. +     p = getenv("HOMEDRIVE");
  47. +     if (p != NULL && *p != NUL && strlen(p) + 2 < BUFSIZE)
  48. +     {
  49. +         strcpy(homedir, p);
  50. +         p = getenv("HOMEPATH");
  51. +         if (p != NULL && *p != NUL && strlen(homedir) + strlen(p) < BUFSIZE)
  52. +         strcat(homedir, p);
  53. +         else
  54. +         strcat(homedir, "\\");
  55. +     }
  56. +     else
  57. +     {
  58. +         struct stat st;
  59. + 
  60. +         if (stat("c:\\", &st) == 0)
  61. +         strcpy(homedir, "c:\\");
  62. +         else
  63. +         *homedir = NUL;
  64. +     }
  65. +     }
  66.   }
  67.   
  68.   /*
  69. ***************
  70. *** 1519,1558 ****
  71.       printf("Creating start menu\n");
  72.       if (has_vim)
  73.       {
  74. !     if (build_shortcut("Vim", "vim.exe", "", VIM_STARTMENU, "") == FAIL)
  75.           return;
  76. !     if (build_shortcut("Vim Read-only", "vim.exe", "-R", VIM_STARTMENU, "")
  77. !                                       == FAIL)
  78.           return;
  79. !     if (build_shortcut("Vim Diff", "vim.exe", "-d", VIM_STARTMENU, "")
  80. !                                       == FAIL)
  81.           return;
  82.       }
  83.       if (has_gvim)
  84.       {
  85. !     if (build_shortcut("gVim", "gvim.exe", "", VIM_STARTMENU, "") == FAIL)
  86.           return;
  87.       if (build_shortcut("gVim Easy", "gvim.exe", "-y",
  88. !                            VIM_STARTMENU, "") == FAIL)
  89.           return;
  90.       if (build_shortcut("gVim Read-only", "gvim.exe", "-R",
  91. !                            VIM_STARTMENU, "") == FAIL)
  92.           return;
  93.       if (build_shortcut("gVim Diff", "gvim.exe", "-d",
  94. !                            VIM_STARTMENU, "") == FAIL)
  95.           return;
  96.       }
  97.       if (build_shortcut("Uninstall",
  98. !         interactive ? "uninstal.exe" : "uninstall-gui.exe",
  99. !                            "", VIM_STARTMENU, "") == FAIL)
  100.       return;
  101.       /* For Windows NT the working dir of the vimtutor.bat must be right,
  102.        * otherwise gvim.exe won't be found and using gvimbat doesn't work. */
  103. !     if (build_shortcut("Vim tutor", "vimtutor.bat", "", VIM_STARTMENU,
  104. !                               installdir) == FAIL)
  105.       return;
  106.       if (build_shortcut("Help", has_gvim ? "gvim.exe" : "vim.exe", "-c h",
  107. !                            VIM_STARTMENU, "") == FAIL)
  108.       return;
  109.       {
  110.       char    shell_folder_path[BUFSIZE];
  111. --- 1551,1592 ----
  112.       printf("Creating start menu\n");
  113.       if (has_vim)
  114.       {
  115. !     if (build_shortcut("Vim", "vim.exe", "",
  116. !                           VIM_STARTMENU, homedir) == FAIL)
  117.           return;
  118. !     if (build_shortcut("Vim Read-only", "vim.exe", "-R",
  119. !                           VIM_STARTMENU, homedir) == FAIL)
  120.           return;
  121. !     if (build_shortcut("Vim Diff", "vim.exe", "-d",
  122. !                           VIM_STARTMENU, homedir) == FAIL)
  123.           return;
  124.       }
  125.       if (has_gvim)
  126.       {
  127. !     if (build_shortcut("gVim", "gvim.exe", "",
  128. !                           VIM_STARTMENU, homedir) == FAIL)
  129.           return;
  130.       if (build_shortcut("gVim Easy", "gvim.exe", "-y",
  131. !                           VIM_STARTMENU, homedir) == FAIL)
  132.           return;
  133.       if (build_shortcut("gVim Read-only", "gvim.exe", "-R",
  134. !                           VIM_STARTMENU, homedir) == FAIL)
  135.           return;
  136.       if (build_shortcut("gVim Diff", "gvim.exe", "-d",
  137. !                           VIM_STARTMENU, homedir) == FAIL)
  138.           return;
  139.       }
  140.       if (build_shortcut("Uninstall",
  141. !         interactive ? "uninstal.exe" : "uninstall-gui.exe", "",
  142. !                        VIM_STARTMENU, installdir) == FAIL)
  143.       return;
  144.       /* For Windows NT the working dir of the vimtutor.bat must be right,
  145.        * otherwise gvim.exe won't be found and using gvimbat doesn't work. */
  146. !     if (build_shortcut("Vim tutor", "vimtutor.bat", "",
  147. !                        VIM_STARTMENU, installdir) == FAIL)
  148.       return;
  149.       if (build_shortcut("Help", has_gvim ? "gvim.exe" : "vim.exe", "-c h",
  150. !                           VIM_STARTMENU, homedir) == FAIL)
  151.       return;
  152.       {
  153.       char    shell_folder_path[BUFSIZE];
  154. ***************
  155. *** 1604,1610 ****
  156.       /* Create shortcut(s) on the desktop */
  157.       if (choices[idx].arg)
  158.       {
  159. !     (void)build_shortcut(icon_names[0], "gvim.exe", "", "desktop", "");
  160.       need_uninstall_entry = 1;
  161.       }
  162.   }
  163. --- 1638,1645 ----
  164.       /* Create shortcut(s) on the desktop */
  165.       if (choices[idx].arg)
  166.       {
  167. !     (void)build_shortcut(icon_names[0], "gvim.exe",
  168. !                               "", "desktop", homedir);
  169.       need_uninstall_entry = 1;
  170.       }
  171.   }
  172. ***************
  173. *** 1614,1620 ****
  174.   {
  175.       if (choices[idx].arg)
  176.       {
  177. !     (void)build_shortcut(icon_names[1], "gvim.exe", "-y", "desktop", "");
  178.       need_uninstall_entry = 1;
  179.       }
  180.   }
  181. --- 1649,1656 ----
  182.   {
  183.       if (choices[idx].arg)
  184.       {
  185. !     (void)build_shortcut(icon_names[1], "gvim.exe",
  186. !                             "-y", "desktop", homedir);
  187.       need_uninstall_entry = 1;
  188.       }
  189.   }
  190. ***************
  191. *** 1624,1630 ****
  192.   {
  193.       if (choices[idx].arg)
  194.       {
  195. !     (void)build_shortcut(icon_names[2], "gvim.exe", "-R", "desktop", "");
  196.       need_uninstall_entry = 1;
  197.       }
  198.   }
  199. --- 1660,1667 ----
  200.   {
  201.       if (choices[idx].arg)
  202.       {
  203. !     (void)build_shortcut(icon_names[2], "gvim.exe",
  204. !                             "-R", "desktop", homedir);
  205.       need_uninstall_entry = 1;
  206.       }
  207.   }
  208. *** ../vim60.206/src/version.c    Sun Feb 10 14:27:03 2002
  209. --- src/version.c    Sun Feb 10 16:31:14 2002
  210. ***************
  211. *** 608,609 ****
  212. --- 608,611 ----
  213.   {   /* Add new patch number below this line */
  214. + /**/
  215. +     207,
  216.   /**/
  217.  
  218. -- 
  219. ARTHUR:    Well, it doesn't matter.  Will you go and tell your master that
  220.            Arthur from the Court of Camelot is here.
  221. GUARD #1:  Listen, in order to maintain air-speed velocity, a swallow
  222.            needs to beat its wings 43 times every second, right?
  223. ARTHUR:    Please!
  224.                                   The Quest for the Holy Grail (Monty Python)
  225.  
  226.  ///  Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net  \\\
  227. (((   Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim   )))
  228.  \\\  Help me helping AIDS orphans in Uganda - http://iccf-holland.org  ///
  229.