Commit Graph

106 Commits

Author SHA1 Message Date
Kazuki Sakamoto 2bde19bbe5 Merge with Vim 7.4.854 from master branch at git@github.com:vim/vim.git 2015-09-02 12:20:05 -07:00
Bjorn Winckler 1b6fabf417 Merge branch 'vim'
Conflicts:
	src/option.c
2014-07-26 19:20:00 +02:00
Bram Moolenaar 822ff866bd Update runtime files. 2014-06-12 21:46:14 +02:00
Bram Moolenaar 999af5d7c2 Update runtime files. 2014-06-12 21:46:14 +02:00
Bjorn Winckler 11b2e90995 Merge branch 'vim'
Conflicts:
	runtime/syntax/vim.vim
	src/auto/configure
	src/eval.c
	src/if_ruby.c
	src/misc1.c
	src/normal.c
2013-05-18 16:18:54 +02:00
Bram Moolenaar ad3b366c82 Update runtime files. 2013-05-17 18:14:19 +02:00
Bram Moolenaar 78e9d3f7e2 Update runtime files. 2013-05-17 18:14:19 +02:00
Bjorn Winckler 1ba220ad3d Merge branch 'vim'
Conflicts:
	runtime/doc/tags
	src/gui.c
	src/option.c
2013-02-07 20:09:24 +01:00
Bram Moolenaar a3e6bc93d1 Update runtime files. 2013-01-30 14:18:00 +01:00
Bram Moolenaar 8888c8cce4 Update runtime files. 2013-01-30 14:18:00 +01:00
Bjorn Winckler 29343568f9 Merge branch 'vim'
Conflicts:
	src/auto/configure
	src/buffer.c
	src/configure.in
	src/if_python.c
	src/option.c
2012-11-04 10:32:28 +01:00
Bram Moolenaar 3a0d8090b1 Updated runtime files. 2012-10-21 03:02:54 +02:00
Bram Moolenaar 354e9e93d2 Updated runtime files. 2012-10-21 03:02:54 +02:00
Bram Moolenaar f3408e76fb updated for version 7.3.696
Problem:    Message about added spell language can be wrong.
Solution:   Give correct message. Add g:menutrans_set_lang_to to allow for
            translation. (Jiri Sedlak)
2012-10-21 01:21:59 +02:00
Bram Moolenaar 48f1743060 updated for version 7.3.696
Problem:    Message about added spell language can be wrong.
Solution:   Give correct message. Add g:menutrans_set_lang_to to allow for
	    translation. (Jiri Sedlak)
2012-10-21 01:21:59 +02:00
Bjorn Winckler 47e83bcd2e Use native Lion full screen functionality
On Lion use the full screen functionality built into the OS.  Also
change the shortcut to toggle full screen to Cmd-Ctrl-f.
2011-07-20 15:04:42 +02:00
Bjorn Winckler a761f7959f Revert "Fix Cmd-v pasting in insert mode"
This patch causes re-indentation of pasted text, sometimes causing
nicely formatted text to "staircase" when pasted.  Ugh.

This reverts commit 3b33bfb6d1.
2011-05-11 18:36:13 +02:00
Bjorn Winckler 3b33bfb6d1 Fix Cmd-v pasting in insert mode
Hitting Cmd-v in insert mode will paste at cursor (not line above) even
if pasteboard contains "linewise" text.  Also fixes problems with
pasting after typing I in block-wise visual mode.
2011-05-10 12:36:24 +02:00
Bjorn Winckler 557788dc9e Merge branch 'vim'
Conflicts:
	runtime/menu.vim
2011-03-22 22:09:37 +01:00
Bram Moolenaar cab49dff91 Updated runtime file. Fix Italian translations. 2011-03-22 17:40:10 +01:00
Bram Moolenaar c370d9ee31 Updated runtime file. Fix Italian translations. 2011-03-22 17:40:10 +01:00
Bjorn Winckler 12e6a57d52 Merge branch 'vim73' into macvim73
Conflicts:
	src/auto/configure
	src/configure.in
	src/eval.c
2010-07-18 18:03:55 +02:00
Bram Moolenaar c5604bc165 Better implementation of creating the Color Scheme menu. (Juergen Kraemer) 2010-07-17 15:20:30 +02:00
Bram Moolenaar f5c3efd38e Better implementation of creating the Color Scheme menu. (Juergen Kraemer)
--HG--
branch : vim73
2010-07-17 15:20:30 +02:00
Bjorn Winckler 14422b553e Merge branch 'vim73' into macvim73
Conflicts:
	runtime/doc/options.txt
	runtime/doc/tags
	src/auto/configure
	src/configure.in
	src/eval.c
	src/main.c
	src/option.c
	src/os_mac.h
	src/os_macosx.c
	src/proto.h
	src/vim.h
2010-07-15 23:27:46 +02:00
Bram Moolenaar 622925875c Fix bug: spell menu moved cursor, causing Copy not to work. Spell replacement
didn't work in 'compatible' mode.
2010-07-10 16:36:59 +02:00
Bram Moolenaar e104e73228 Fix bug: spell menu moved cursor, causing Copy not to work. Spell replacement
didn't work in 'compatible' mode.

--HG--
branch : vim73
2010-07-10 16:36:59 +02:00
Bjorn Winckler e8125bcdff Merge upstream/hg/vim73 into macvim73
Conflicts:
	runtime/doc/eval.txt
	runtime/syntax/vim.vim
	src/Makefile
	src/auto/configure
	src/feature.h
	src/netbeans.c
	src/proto/netbeans.pro
	src/structs.h
2010-05-30 18:33:05 +02:00
Bram Moolenaar 14290793f2 Add 'relativenumber' patch from Markus Heidelberg.
--HG--
branch : vim73
2010-05-16 15:46:46 +02:00
Bram Moolenaar 64486671c3 Add 'relativenumber' patch from Markus Heidelberg. 2010-05-16 15:46:46 +02:00
Bjorn Winckler 37bf40d260 Merge upstream
Conflicts:
	runtime/doc/options.txt
	src/auto/configure
	src/eval.c
	src/if_ruby.c
	src/vim.h
2010-02-24 17:23:00 +01:00
Bram Moolenaar 4895774ca7 Update runtime files. 2010-01-06 20:54:52 +01:00
Bram Moolenaar 5c73622a90 Update runtime files. 2010-01-06 20:54:52 +01:00
Bjorn Winckler 16caec3a2b Move menus to menu.vim 2009-08-29 18:30:35 +02:00
Bjorn Winckler abfce2ceb7 Merge upstream
Conflicts:
	runtime/doc/eval.txt
	runtime/doc/os_mac.txt
	runtime/doc/various.txt
	runtime/syntax/vim.vim
2008-07-05 12:00:00 +02:00
Bram Moolenaar e30de2d1dc updated for version 7.2a-011 2008-07-01 19:56:57 +00:00
vimboss 7332de00a2 updated for version 7.2a-011 2008-07-01 19:56:57 +00:00
Bram Moolenaar aba8857aa3 updated for version 7.2a-00 2008-06-25 20:13:35 +00:00
vimboss a74b78844d updated for version 7.2a-00 2008-06-25 20:13:35 +00:00
Bjorn Winckler c4222c6ebb Don't delay loading "Buffers" menu
This avoids a flickering menu each time a new editor window is opened.
2008-06-07 12:42:47 +02:00
Bjorn Winckler ab38b8a17d Merge upstream 2008-01-26 21:16:00 +01:00
Bram Moolenaar 9273c73e36 updated for version 7.1-163 2007-11-29 16:46:44 +00:00
vimboss 4e2c26c5c4 updated for version 7.1-163 2007-11-29 16:46:44 +00:00
Bjorn Winckler 724ad5ca29 Applied MacVim r320 patch 2007-10-18 12:46:52 +02:00
Bram Moolenaar 024678745b updated for version 7.1a 2007-05-06 13:22:01 +00:00
vimboss 75f1bbc472 updated for version 7.1a 2007-05-06 13:22:01 +00:00
Bram Moolenaar d675e2c513 updated for version 7.0-180 2007-01-09 14:09:25 +00:00
vimboss 9fd754ffb4 updated for version 7.0-180 2007-01-09 14:09:25 +00:00
Bram Moolenaar b38dea217f updated for version 7.0-106 2006-09-14 11:35:25 +00:00
vimboss 3097f10c43 updated for version 7.0-106 2006-09-14 11:35:25 +00:00