To: [email protected]
Subject: Patch 6.3a.015
Fcc: outbox
From: Bram Moolenaar <[email protected]>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 6.3a.015
Problem:    Using the "select all" menu item when 'insertmode' is set and
           clicking the mouse button doesn't return to Insert mode.  The
           Buffers/Delete menu doesn't offer a choice to abandon a changed
           buffer.  (Jens Paulus)
Solution:   Don't use CTRL-\ CTRL-N.  Add ":confirm" for the Buffers menu
           items.
Files:      runtime/menu.vim


*** ../vim-6.3a.014/runtime/menu.vim    Fri May  7 10:59:34 2004
--- runtime/menu.vim    Sun May  9 11:29:47 2004
***************
*** 2,8 ****
 " You can also use this as a start for your own set of menus.
 "
 " Maintainer: Bram Moolenaar <[email protected]>
! " Last Change:        2004 May 04

 " Note that ":an" (short for ":anoremenu") is often used to make a menu work
 " in all modes and avoid side effects from mappings defined by the user.
--- 2,8 ----
 " You can also use this as a start for your own set of menus.
 "
 " Maintainer: Bram Moolenaar <[email protected]>
! " Last Change:        2004 May 09

 " Note that ":an" (short for ":anoremenu") is often used to make a menu work
 " in all modes and avoid side effects from mappings defined by the user.
***************
*** 161,167 ****
   vnoremap <script> <SID>vPaste       "-c<Esc>gix<Esc><SID>Paste"_x
   inoremap <script> <SID>iPaste       x<Esc><SID>Paste"_s
 endif
! nnoremap <SID>SelectAll       :exe "norm gg" . (&slm == "" ? "VG" : "gH\<C-O>G")<CR>


 " Edit menu
--- 161,170 ----
   vnoremap <script> <SID>vPaste       "-c<Esc>gix<Esc><SID>Paste"_x
   inoremap <script> <SID>iPaste       x<Esc><SID>Paste"_s
 endif
!
! func! <SID>SelectAll()
!   exe "norm gg" . (&slm == "" ? "VG" : "gH\<C-O>G")
! endfunc


 " Edit menu
***************
*** 184,191 ****
 if has("win32") || has("win16")
   vnoremenu 20.390 &Edit.&Delete<Tab>x                x
 endif
! noremenu  <script> <silent> 20.400 &Edit.&Select\ All<Tab>ggVG        <C-\><C-N><SID>SelectAll
! noremenu! <script> <silent> 20.400 &Edit.&Select\ All<Tab>ggVG        <C-\><C-N><SID>SelectAll

 an 20.405      &Edit.-SEP2-                           <Nop>
 if has("win32")  || has("win16") || has("gui_gtk") || has("gui_motif")
--- 187,195 ----
 if has("win32") || has("win16")
   vnoremenu 20.390 &Edit.&Delete<Tab>x                x
 endif
! noremenu  <script> <silent> 20.400 &Edit.&Select\ All<Tab>ggVG        :<C-U>call <SID>SelectAll()<CR>
! inoremenu <script> <silent> 20.400 &Edit.&Select\ All<Tab>ggVG        <C-O>:call <SID>SelectAll()<CR>
! cnoremenu <script> <silent> 20.400 &Edit.&Select\ All<Tab>ggVG        <C-U>call <SID>SelectAll()<CR>

 an 20.405      &Edit.-SEP2-                           <Nop>
 if has("win32")  || has("win16") || has("gui_gtk") || has("gui_motif")
***************
*** 583,592 ****
   let cpo_save = &cpo
   set cpo&vim
   exe 'an <silent> ' . g:bmenu_priority . ".2 &Buffers.&Refresh\\ menu :call <SID>BMShow()<CR>"
!   exe 'an ' . g:bmenu_priority . ".4 &Buffers.&Delete :bd<CR>"
!   exe 'an ' . g:bmenu_priority . ".6 &Buffers.&Alternate :b #<CR>"
!   exe 'an ' . g:bmenu_priority . ".7 &Buffers.&Next :bnext<CR>"
!   exe 'an ' . g:bmenu_priority . ".8 &Buffers.&Previous :bprev<CR>"
   exe 'an ' . g:bmenu_priority . ".9 &Buffers.-SEP- :"
   let &cpo = cpo_save
   unmenu &Buffers.Dummy
--- 587,596 ----
   let cpo_save = &cpo
   set cpo&vim
   exe 'an <silent> ' . g:bmenu_priority . ".2 &Buffers.&Refresh\\ menu :call <SID>BMShow()<CR>"
!   exe 'an ' . g:bmenu_priority . ".4 &Buffers.&Delete :confirm bd<CR>"
!   exe 'an ' . g:bmenu_priority . ".6 &Buffers.&Alternate :confirm b #<CR>"
!   exe 'an ' . g:bmenu_priority . ".7 &Buffers.&Next :confirm bnext<CR>"
!   exe 'an ' . g:bmenu_priority . ".8 &Buffers.&Previous :confirm bprev<CR>"
   exe 'an ' . g:bmenu_priority . ".9 &Buffers.-SEP- :"
   let &cpo = cpo_save
   unmenu &Buffers.Dummy
***************
*** 671,677 ****
   " set 'cpo' to include the <CR>
   let cpo_save = &cpo
   set cpo&vim
!   exe name . ' :b' . a:num . '<CR>'
   let &cpo = cpo_save
 endfunc

--- 675,681 ----
   " set 'cpo' to include the <CR>
   let cpo_save = &cpo
   set cpo&vim
!   exe name . ' :confirm b' . a:num . '<CR>'
   let &cpo = cpo_save
 endfunc

***************
*** 783,790 ****
 an 1.70 PopUp.Select\ &Word           vaw
 an 1.80 PopUp.Select\ &Line           V
 an 1.90 PopUp.Select\ &Block          <C-V>
! noremenu  <script> <silent> 1.100 PopUp.Select\ &All  <C-\><C-N><SID>SelectAll
! noremenu! <script> <silent> 1.100 PopUp.Select\ &All  <C-\><C-N><SID>SelectAll


 " The GUI toolbar (for MS-Windows and GTK)
--- 787,795 ----
 an 1.70 PopUp.Select\ &Word           vaw
 an 1.80 PopUp.Select\ &Line           V
 an 1.90 PopUp.Select\ &Block          <C-V>
! noremenu  <script> <silent> 1.100 PopUp.Select\ &All  :<C-U>call <SID>SelectAll()<CR>
! inoremenu <script> <silent> 1.100 PopUp.Select\ &All  <C-O>:call <SID>SelectAll()<CR>
! cnoremenu <script> <silent> 1.100 PopUp.Select\ &All  <C-U>call <SID>SelectAll()<CR>


 " The GUI toolbar (for MS-Windows and GTK)
*** ../vim-6.3a.014/src/version.c       Wed May 12 17:29:22 2004
--- src/version.c       Wed May 12 17:31:22 2004
***************
*** 643,644 ****
--- 643,646 ----
 {   /* Add new patch number below this line */
+ /**/
+     15,
 /**/

--
ARTHUR: This new learning amazes me, Sir Bedevere.  Explain again how sheep's
       bladders may be employed to prevent earthquakes.
                "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

/// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net   \\\
///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
\\\  Buy at Amazon and help AIDS victims -- http://ICCF.nl/click1.html ///