Loading ...
Sorry, an error occurred while loading the content.
 

Patch 7.3.1252

Expand Messages
  • Bram Moolenaar
    Patch 7.3.1252 Problem: Gvim does not find the toolbar bitmap files in ~/vimfiles/bitmaps if the corresponding menu command contains additional characters
    Message 1 of 3 , Jun 27, 2013
      Patch 7.3.1252
      Problem: Gvim does not find the toolbar bitmap files in ~/vimfiles/bitmaps
      if the corresponding menu command contains additional characters
      like the shortcut marker '&' or if you use a non-english locale.
      Solution: Use menu->en_dname or menu->dname. (Martin Gieseking)
      Files: src/gui_w32.c


      *** ../vim-7.3.1251/src/gui_w32.c 2013-06-26 13:16:13.000000000 +0200
      --- src/gui_w32.c 2013-06-27 22:01:03.000000000 +0200
      ***************
      *** 4163,4169 ****
      * didn't exist or wasn't specified, try the menu name
      */
      if (hbitmap == NULL
      ! && (gui_find_bitmap(menu->name, fname, "bmp") == OK))
      hbitmap = LoadImage(
      NULL,
      fname,
      --- 4163,4171 ----
      * didn't exist or wasn't specified, try the menu name
      */
      if (hbitmap == NULL
      ! && (gui_find_bitmap(menu->en_dname != NULL
      ! ? menu->en_dname
      ! : menu->dname, fname, "bmp") == OK))
      hbitmap = LoadImage(
      NULL,
      fname,
      *** ../vim-7.3.1251/src/version.c 2013-06-26 21:56:33.000000000 +0200
      --- src/version.c 2013-06-27 20:33:18.000000000 +0200
      ***************
      *** 730,731 ****
      --- 730,733 ----
      { /* Add new patch number below this line */
      + /**/
      + 1252,
      /**/

      --
      Why doesn't Tarzan have a beard?

      /// Bram Moolenaar -- Bram@... -- http://www.Moolenaar.net \\\
      /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
      \\\ an exciting new programming language -- http://www.Zimbu.org ///
      \\\ help me help AIDS victims -- http://ICCF-Holland.org ///

      --
      --
      You received this message from the "vim_dev" maillist.
      Do not top-post! Type your reply below the text you are replying to.
      For more information, visit http://www.vim.org/maillist.php

      ---
      You received this message because you are subscribed to the Google Groups "vim_dev" group.
      To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscribe@....
      For more options, visit https://groups.google.com/groups/opt_out.
    • John Marriott
      ... This patch fails to build on Win 7 x64 with mingw x64 if FEAT_MUTLI_LANG is not defined: make: Entering directory
      Message 2 of 3 , Jun 27, 2013
        On 28-Jun-2013 6:02 AM, Bram Moolenaar wrote:
        >
        > Patch 7.3.1252
        > Problem: Gvim does not find the toolbar bitmap files in ~/vimfiles/bitmaps
        > if the corresponding menu command contains additional characters
        > like the shortcut marker '&' or if you use a non-english locale.
        > Solution: Use menu->en_dname or menu->dname. (Martin Gieseking)
        > Files: src/gui_w32.c
        >
        >
        > *** ../vim-7.3.1251/src/gui_w32.c 2013-06-26 13:16:13.000000000 +0200
        > --- src/gui_w32.c 2013-06-27 22:01:03.000000000 +0200
        > ***************
        > *** 4163,4169 ****
        > * didn't exist or wasn't specified, try the menu name
        > */
        > if (hbitmap == NULL
        > ! && (gui_find_bitmap(menu->name, fname, "bmp") == OK))
        > hbitmap = LoadImage(
        > NULL,
        > fname,
        > --- 4163,4171 ----
        > * didn't exist or wasn't specified, try the menu name
        > */
        > if (hbitmap == NULL
        > ! && (gui_find_bitmap(menu->en_dname != NULL
        > ! ? menu->en_dname
        > ! : menu->dname, fname, "bmp") == OK))
        > hbitmap = LoadImage(
        > NULL,
        > fname,
        > *** ../vim-7.3.1251/src/version.c 2013-06-26 21:56:33.000000000 +0200
        > --- src/version.c 2013-06-27 20:33:18.000000000 +0200
        > ***************
        > *** 730,731 ****
        > --- 730,733 ----
        > { /* Add new patch number below this line */
        > + /**/
        > + 1252,
        > /**/
        >

        This patch fails to build on Win 7 x64 with mingw x64 if FEAT_MUTLI_LANG
        is not defined:
        make: Entering directory
        'F:/home/john/Documents/software/Utility/Vim/73/vim73/src'
        gcc -c -Iproto -DWIN32 -DWINVER=0x0601 -D_WIN32_WINNT=0x0601
        -DHAVE_PATHDEF -DFEAT_BIG -DFEAT_GUI_W32 -DFEAT_CLIPBOARD -DFEAT_MBYTE
        -pipe -w -march=native -Wall -O3 -fomit-frame-pointer
        -freg-struct-return -s version.c -o gobjnative/version.o
        windres --preprocessor="gcc -E -xc" -DRC_INVOKED -DWIN32 -DWINVER=0x0601
        -D_WIN32_WINNT=0x0601 -DHAVE_PATHDEF -DFEAT_BIG -DFEAT_GUI_W32
        -DFEAT_CLIPBOARD -DFEAT_MBYTE \
        --input-format=rc --output-format=coff -i vim.rc -o gobjnative/vimrc.o
        gcc -c -Iproto -DWIN32 -DWINVER=0x0601 -D_WIN32_WINNT=0x0601
        -DHAVE_PATHDEF -DFEAT_BIG -DFEAT_GUI_W32 -DFEAT_CLIPBOARD -DFEAT_MBYTE
        -pipe -w -march=native -Wall -O3 -fomit-frame-pointer
        -freg-struct-return -s gui_w32.c -o gobjnative/gui_w32.o
        gui_w32.c: In function 'get_toolbar_bitmap':
        gui_w32.c:4166:27: error: 'vimmenu_T' has no member named 'en_dname'
        && (gui_find_bitmap(menu->en_dname != NULL
        ^
        gui_w32.c:4167:12: error: 'vimmenu_T' has no member named 'en_dname'
        ? menu->en_dname
        ^
        Make_ming.mak:747: recipe for target 'gobjnative/gui_w32.o' failed
        make: *** [gobjnative/gui_w32.o] Error 1
        make: *** Waiting for unfinished jobs....
        make: Leaving directory
        'F:/home/john/Documents/software/Utility/Vim/73/vim73/src'

        Cheers
        John

        --
        --
        You received this message from the "vim_dev" maillist.
        Do not top-post! Type your reply below the text you are replying to.
        For more information, visit http://www.vim.org/maillist.php

        ---
        You received this message because you are subscribed to the Google Groups "vim_dev" group.
        To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscribe@....
        For more options, visit https://groups.google.com/groups/opt_out.
      • Bram Moolenaar
        ... Sorry, missing #ifdef. -- FATHER: Who are you? PRINCE: I m ... your son ... FATHER: Not you. LAUNCELOT: I m ... er ... Sir Launcelot, sir. Monty
        Message 3 of 3 , Jun 27, 2013
          John Marriott wrote:

          > On 28-Jun-2013 6:02 AM, Bram Moolenaar wrote:
          > >
          > > Patch 7.3.1252
          > > Problem: Gvim does not find the toolbar bitmap files in ~/vimfiles/bitmaps
          > > if the corresponding menu command contains additional characters
          > > like the shortcut marker '&' or if you use a non-english locale.
          > > Solution: Use menu->en_dname or menu->dname. (Martin Gieseking)
          > > Files: src/gui_w32.c
          >
          > [...]
          >
          >
          > This patch fails to build on Win 7 x64 with mingw x64 if FEAT_MUTLI_LANG
          > is not defined:
          > make: Entering directory
          > 'F:/home/john/Documents/software/Utility/Vim/73/vim73/src'
          > gcc -c -Iproto -DWIN32 -DWINVER=0x0601 -D_WIN32_WINNT=0x0601
          > -DHAVE_PATHDEF -DFEAT_BIG -DFEAT_GUI_W32 -DFEAT_CLIPBOARD -DFEAT_MBYTE
          > -pipe -w -march=native -Wall -O3 -fomit-frame-pointer
          > -freg-struct-return -s version.c -o gobjnative/version.o
          > windres --preprocessor="gcc -E -xc" -DRC_INVOKED -DWIN32 -DWINVER=0x0601
          > -D_WIN32_WINNT=0x0601 -DHAVE_PATHDEF -DFEAT_BIG -DFEAT_GUI_W32
          > -DFEAT_CLIPBOARD -DFEAT_MBYTE \
          > --input-format=rc --output-format=coff -i vim.rc -o gobjnative/vimrc.o
          > gcc -c -Iproto -DWIN32 -DWINVER=0x0601 -D_WIN32_WINNT=0x0601
          > -DHAVE_PATHDEF -DFEAT_BIG -DFEAT_GUI_W32 -DFEAT_CLIPBOARD -DFEAT_MBYTE
          > -pipe -w -march=native -Wall -O3 -fomit-frame-pointer
          > -freg-struct-return -s gui_w32.c -o gobjnative/gui_w32.o
          > gui_w32.c: In function 'get_toolbar_bitmap':
          > gui_w32.c:4166:27: error: 'vimmenu_T' has no member named 'en_dname'
          > && (gui_find_bitmap(menu->en_dname != NULL
          > ^
          > gui_w32.c:4167:12: error: 'vimmenu_T' has no member named 'en_dname'
          > ? menu->en_dname
          > ^
          > Make_ming.mak:747: recipe for target 'gobjnative/gui_w32.o' failed
          > make: *** [gobjnative/gui_w32.o] Error 1
          > make: *** Waiting for unfinished jobs....
          > make: Leaving directory

          Sorry, missing #ifdef.

          --
          FATHER: Who are you?
          PRINCE: I'm ... your son ...
          FATHER: Not you.
          LAUNCELOT: I'm ... er ... Sir Launcelot, sir.
          "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

          /// Bram Moolenaar -- Bram@... -- http://www.Moolenaar.net \\\
          /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
          \\\ an exciting new programming language -- http://www.Zimbu.org ///
          \\\ help me help AIDS victims -- http://ICCF-Holland.org ///

          --
          --
          You received this message from the "vim_dev" maillist.
          Do not top-post! Type your reply below the text you are replying to.
          For more information, visit http://www.vim.org/maillist.php

          ---
          You received this message because you are subscribed to the Google Groups "vim_dev" group.
          To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscribe@....
          For more options, visit https://groups.google.com/groups/opt_out.
        Your message has been successfully submitted and would be delivered to recipients shortly.