7.3.080

   1 To: vim_dev@googlegroups.com
   2 Subject: Patch 7.3.080
   3 Fcc: outbox
   4 From: Bram Moolenaar <Bram@moolenaar.net>
   5 Mime-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8 ------------
   9
  10 Patch 7.3.080
  11 Problem:    Spell doesn't work on VMS.
  12 Solution:   Use different file names. (Zoltan Bartos, Zoltan Arpadffy)
  13 Files:      src/spell.c
  14
  15
  16 *** ../vim-7.3.079/src/spell.c  2010-12-08 13:11:15.000000000 +0100
  17 --- src/spell.c 2010-12-08 17:01:13.000000000 +0100
  18 ***************
  19 *** 327,332 ****
  20 --- 327,342 ----
  21   typedef long idx_T;
  22   #endif
  23
  24 + #ifdef VMS
  25 + # define SPL_FNAME_TMPL  "%s_%s.spl"
  26 + # define SPL_FNAME_ADD   "_add."
  27 + # define SPL_FNAME_ASCII "_ascii."
  28 + #else
  29 + # define SPL_FNAME_TMPL  "%s.%s.spl"
  30 + # define SPL_FNAME_ADD   ".add."
  31 + # define SPL_FNAME_ASCII ".ascii."
  32 + #endif
  33 +
  34   /* Flags used for a word.  Only the lowest byte can be used, the region byte
  35    * comes above it. */
  36   #define WF_REGION   0x01      /* region byte follows */
  37 ***************
  38 *** 2471,2484 ****
  39          * Find the first spell file for "lang" in 'runtimepath' and load it.
  40          */
  41         vim_snprintf((char *)fname_enc, sizeof(fname_enc) - 5,
  42 !                                       "spell/%s.%s.spl", lang, spell_enc());
  43         r = do_in_runtimepath(fname_enc, FALSE, spell_load_cb, &sl);
  44
  45         if (r == FAIL && *sl.sl_lang != NUL)
  46         {
  47             /* Try loading the ASCII version. */
  48             vim_snprintf((char *)fname_enc, sizeof(fname_enc) - 5,
  49 !                                                 "spell/%s.ascii.spl", lang);
  50             r = do_in_runtimepath(fname_enc, FALSE, spell_load_cb, &sl);
  51
  52   #ifdef FEAT_AUTOCMD
  53 --- 2481,2504 ----
  54          * Find the first spell file for "lang" in 'runtimepath' and load it.
  55          */
  56         vim_snprintf((char *)fname_enc, sizeof(fname_enc) - 5,
  57 ! #ifdef VMS
  58 !                                       "spell/%s_%s.spl",
  59 ! #else
  60 !                                       "spell/%s.%s.spl",
  61 ! #endif
  62 !                                                          lang, spell_enc());
  63         r = do_in_runtimepath(fname_enc, FALSE, spell_load_cb, &sl);
  64
  65         if (r == FAIL && *sl.sl_lang != NUL)
  66         {
  67             /* Try loading the ASCII version. */
  68             vim_snprintf((char *)fname_enc, sizeof(fname_enc) - 5,
  69 ! #ifdef VMS
  70 !                                                 "spell/%s_ascii.spl",
  71 ! #else
  72 !                                                 "spell/%s.ascii.spl",
  73 ! #endif
  74 !                                                                       lang);
  75             r = do_in_runtimepath(fname_enc, FALSE, spell_load_cb, &sl);
  76
  77   #ifdef FEAT_AUTOCMD
  78 ***************
  79 *** 2496,2502 ****
  80
  81       if (r == FAIL)
  82       {
  83 !       smsg((char_u *)_("Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""),
  84                                                      lang, spell_enc(), lang);
  85       }
  86       else if (sl.sl_slang != NULL)
  87 --- 2516,2527 ----
  88
  89       if (r == FAIL)
  90       {
  91 !       smsg((char_u *)
  92 ! #ifdef VMS
  93 !       _("Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""),
  94 ! #else
  95 !       _("Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""),
  96 ! #endif
  97                                                      lang, spell_enc(), lang);
  98       }
  99       else if (sl.sl_slang != NULL)
 100 ***************
 101 *** 2530,2536 ****
 102   int_wordlist_spl(fname)
 103       char_u        *fname;
 104   {
 105 !     vim_snprintf((char *)fname, MAXPATHL, "%s.%s.spl",
 106                                                   int_wordlist, spell_enc());
 107   }
 108
 109 --- 2555,2561 ----
 110   int_wordlist_spl(fname)
 111       char_u        *fname;
 112   {
 113 !     vim_snprintf((char *)fname, MAXPATHL, SPL_FNAME_TMPL,
 114                                                   int_wordlist, spell_enc());
 115   }
 116
 117 ***************
 118 *** 2785,2792 ****
 119         if (lp->sl_fname == NULL)
 120             goto endFAIL;
 121
 122 !       /* Check for .add.spl. */
 123 !       lp->sl_add = strstr((char *)gettail(fname), ".add.") != NULL;
 124       }
 125       else
 126         lp = old_lp;
 127 --- 2810,2817 ----
 128         if (lp->sl_fname == NULL)
 129             goto endFAIL;
 130
 131 !       /* Check for .add.spl (_add.spl for VMS). */
 132 !       lp->sl_add = strstr((char *)gettail(fname), SPL_FNAME_ADD) != NULL;
 133       }
 134       else
 135         lp = old_lp;
 136 ***************
 137 *** 9109,9116 ****
 138             /* For ":mkspell path/vim" output file is "path/vim.latin1.spl". */
 139             innames = &fnames[0];
 140             incount = 1;
 141 !           vim_snprintf((char *)wfname, sizeof(wfname), "%s.%s.spl", fnames[0],
 142 !                            spin.si_ascii ? (char_u *)"ascii" : spell_enc());
 143         }
 144         else if (len > 4 && STRCMP(fnames[0] + len - 4, ".spl") == 0)
 145         {
 146 --- 9134,9141 ----
 147             /* For ":mkspell path/vim" output file is "path/vim.latin1.spl". */
 148             innames = &fnames[0];
 149             incount = 1;
 150 !           vim_snprintf((char *)wfname, sizeof(wfname), SPL_FNAME_TMPL,
 151 !                 fnames[0], spin.si_ascii ? (char_u *)"ascii" : spell_enc());
 152         }
 153         else if (len > 4 && STRCMP(fnames[0] + len - 4, ".spl") == 0)
 154         {
 155 ***************
 156 *** 9119,9133 ****
 157         }
 158         else
 159             /* Name should be language, make the file name from it. */
 160 !           vim_snprintf((char *)wfname, sizeof(wfname), "%s.%s.spl", fnames[0],
 161 !                            spin.si_ascii ? (char_u *)"ascii" : spell_enc());
 162
 163         /* Check for .ascii.spl. */
 164 !       if (strstr((char *)gettail(wfname), ".ascii.") != NULL)
 165             spin.si_ascii = TRUE;
 166
 167         /* Check for .add.spl. */
 168 !       if (strstr((char *)gettail(wfname), ".add.") != NULL)
 169             spin.si_add = TRUE;
 170       }
 171
 172 --- 9144,9158 ----
 173         }
 174         else
 175             /* Name should be language, make the file name from it. */
 176 !           vim_snprintf((char *)wfname, sizeof(wfname), SPL_FNAME_TMPL,
 177 !                 fnames[0], spin.si_ascii ? (char_u *)"ascii" : spell_enc());
 178
 179         /* Check for .ascii.spl. */
 180 !       if (strstr((char *)gettail(wfname), SPL_FNAME_ASCII) != NULL)
 181             spin.si_ascii = TRUE;
 182
 183         /* Check for .add.spl. */
 184 !       if (strstr((char *)gettail(wfname), SPL_FNAME_ADD) != NULL)
 185             spin.si_add = TRUE;
 186       }
 187
 188 *** ../vim-7.3.079/src/version.c        2010-12-08 14:54:58.000000000 +0100
 189 --- src/version.c       2010-12-08 16:58:03.000000000 +0100
 190 ***************
 191 *** 716,717 ****
 192 --- 716,719 ----
 193   {   /* Add new patch number below this line */
 194 + /**/
 195 +     80,
 196   /**/
 197
 198 --
 199 hundred-and-one symptoms of being an internet addict:
 200 5. You find yourself brainstorming for new subjects to search.
 201
 202  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
 203 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
 204 \\\  an exciting new programming language -- http://www.Zimbu.org        ///
 205  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///