← Back to branch summary

~ubuntu-branches/ubuntu/maverick/vim/maverick

« back to all changes in this revision

Viewing changes to src/misc1.c

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2009-01-13 18:39:18 UTC
  • mfrom: (1.1.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20090113183918-kgq1jzdwsbbex4pq
Tags: 2:7.2.079-1ubuntu1
https://launchpad.net/bugs/296324
* Resynchronise with Debian (diversions fix closes LP: #296324). Remaining
  changes:
  - runtime/syntax/debcontrol.vim:
    + Add "metapackages" to the list of valid sections.
  - runtime/syntax/debchangelog.vim:
    + Add "jaunty" to the list of valid suites.
  - Drop vim-lesstif package and lesstif2-dev build-dependency.
  - Enable Python interpreter on basic builds.
  - Create a .pot file for translations.
  - Disable autoindent, line-wrapping, and backup files by default.
  - runtime/syntax/debsources.vim:
    + Add "jaunty" to debsourcesDistrKeyword
  - runtime/syntax/grub.vim:
    + Add Ubuntu-specific 'quiet' keyword.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/misc1.c
3245
3245
 
3246
3246
    /* When using ":silent" assume that <CR> was entered. */
3247
3247
    if (mouse_used != NULL)
3248
 
        MSG_PUTS(_("Type number or click with mouse (<Enter> cancels): "));
 
3248
        MSG_PUTS(_("Type number and <Enter> or click with mouse (empty cancels): "));
3249
3249
    else
3250
 
        MSG_PUTS(_("Choice number (<Enter> cancels): "));
 
3250
        MSG_PUTS(_("Type number and <Enter> (empty cancels): "));
3251
3251
 
3252
3252
    /* Set the state such that text can be selected/copied/pasted and we still
3253
3253
     * get mouse events. */
8728
8728
        /* The active codepage differs from 'encoding'.  Attempt using the
8729
8729
         * wide function.  If it fails because it is not implemented fall back
8730
8730
         * to the non-wide version (for Windows 98) */
8731
 
        wn = enc_to_ucs2(buf, NULL);
 
8731
        wn = enc_to_utf16(buf, NULL);
8732
8732
        if (wn != NULL)
8733
8733
        {
8734
8734
            hFind = FindFirstFileW(wn, &wfb);
8756
8756
#ifdef WIN3264
8757
8757
# ifdef FEAT_MBYTE
8758
8758
        if (wn != NULL)
8759
 
            p = ucs2_to_enc(wfb.cFileName, NULL);   /* p is allocated here */
 
8759
            p = utf16_to_enc(wfb.cFileName, NULL);   /* p is allocated here */
8760
8760
        else
8761
8761
# endif
8762
8762
            p = (char_u *)fb.cFileName;
8830
8830
            if (wn != NULL)
8831
8831
            {
8832
8832
                vim_free(wn);
8833
 
                wn = enc_to_ucs2(buf, NULL);
 
8833
                wn = enc_to_utf16(buf, NULL);
8834
8834
                if (wn != NULL)
8835
8835
                    hFind = FindFirstFileW(wn, &wfb);
8836
8836
            }