To: vim_dev@googlegroups.com Subject: Patch 8.1.2226 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.1.2226 Problem: Cannot use system copy/paste in non-xterm terminals. Solution: Instead of setting 'mouse' to "a" set it to "nvi" in defaults.vim. Files: runtime/defaults.vim, runtime/doc/term.txt, runtime/doc/options.txt *** ../vim-8.1.2225/runtime/defaults.vim 2019-02-18 21:31:58.224542949 +0100 --- runtime/defaults.vim 2019-10-27 18:41:21.544060260 +0100 *************** *** 75,82 **** " In many terminal emulators the mouse works just fine. By enabling it you " can position the cursor, Visually select and scroll with the mouse. if has('mouse') ! set mouse=a endif " Switch syntax highlighting on when the terminal has colors or when using the --- 75,88 ---- " In many terminal emulators the mouse works just fine. By enabling it you " can position the cursor, Visually select and scroll with the mouse. + " Only xterm can grab the mouse events when using the shift key, for other + " terminals use ":", select text and press Esc. if has('mouse') ! if &term =~ 'xterm' ! set mouse=a ! else ! set mouse=nvi ! endif endif " Switch syntax highlighting on when the terminal has colors or when using the *** ../vim-8.1.2225/runtime/doc/term.txt 2019-10-12 21:08:37.002660427 +0200 --- runtime/doc/term.txt 2019-10-27 18:31:06.334311963 +0100 *************** *** 746,757 **** Whether the selection that is started with the mouse is in Visual mode or Select mode depends on whether "mouse" is included in the 'selectmode' option. ! In an xterm, with the currently active mode included in the 'mouse' option, normal mouse clicks are used by Vim, mouse clicks with the shift or ctrl key pressed go to the xterm. With the currently active mode not included in 'mouse' all mouse clicks go to the xterm. *xterm-clipboard* In the Athena and Motif GUI versions, when running in a terminal and there is access to the X-server (DISPLAY is set), the copy and paste will behave like --- 746,766 ---- Whether the selection that is started with the mouse is in Visual mode or Select mode depends on whether "mouse" is included in the 'selectmode' option. ! *terminal-mouse* In an xterm, with the currently active mode included in the 'mouse' option, normal mouse clicks are used by Vim, mouse clicks with the shift or ctrl key pressed go to the xterm. With the currently active mode not included in 'mouse' all mouse clicks go to the xterm. + For terminals where it is not possible to have the mouse events be used by the + terminal itself by using a modifier, a workaround is to not use mouse events + for Vim in command-line mode: > + :set mouse=nvi + Then to select text with the terminal, use ":" to go to command-line mode, + select and copy the text to the system, then press Esc. + + Another way is to temporarily use ":sh" to run a shell, copy the text, then + exit the shell. 'mouse' can remain set to "a" then. *xterm-clipboard* In the Athena and Motif GUI versions, when running in a terminal and there is access to the X-server (DISPLAY is set), the copy and paste will behave like *** ../vim-8.1.2225/runtime/doc/options.txt 2019-10-27 05:12:38.280773740 +0100 --- runtime/doc/options.txt 2019-10-27 18:37:59.472843478 +0100 *************** *** 5192,5203 **** *'mouse'* *E538* 'mouse' string (default "", "a" for GUI, MS-DOS and Win32, ! set to "a" in |defaults.vim|) global ! Enable the use of the mouse. Only works for certain terminals ! (xterm, MS-DOS, Win32 |win32-mouse|, QNX pterm, *BSD console with ! sysmouse and Linux console with gpm). For using the mouse in the ! GUI, see |gui-mouse|. The mouse can be enabled for different modes: n Normal mode and Terminal modes v Visual mode --- 5191,5201 ---- *'mouse'* *E538* 'mouse' string (default "", "a" for GUI, MS-DOS and Win32, ! set to "a" or "nvi" in |defaults.vim|) global ! Enable the use of the mouse. Works for most terminals (xterm, MS-DOS, ! Win32 |win32-mouse|, QNX pterm, *BSD console with sysmouse and Linux ! console with gpm). For using the mouse in the GUI, see |gui-mouse|. The mouse can be enabled for different modes: n Normal mode and Terminal modes v Visual mode *************** *** 5208,5214 **** r for |hit-enter| and |more-prompt| prompt Normally you would enable the mouse in all five modes with: > :set mouse=a ! < When the mouse is not enabled, the GUI will still use the mouse for modeless selection. This doesn't move the text cursor. See |mouse-using|. Also see |'clipboard'|. --- 5206,5220 ---- r for |hit-enter| and |more-prompt| prompt Normally you would enable the mouse in all five modes with: > :set mouse=a ! < If your terminal can't overrule the mouse events going to the ! application, use: > ! :set mouse=nvi ! < The you can press ":", select text for the system, and press Esc to go ! back to Vim using the mouse events. ! In |defaults.vim| "nvi" is used if the 'term' option is not matching ! "xterm". ! ! When the mouse is not enabled, the GUI will still use the mouse for modeless selection. This doesn't move the text cursor. See |mouse-using|. Also see |'clipboard'|. *** ../vim-8.1.2225/src/version.c 2019-10-27 05:12:38.288773701 +0100 --- src/version.c 2019-10-27 18:33:11.813891541 +0100 *************** *** 743,744 **** --- 743,746 ---- { /* Add new patch number below this line */ + /**/ + 2226, /**/