# HG changeset patch
# User Bram Moolenaar <bram@vim.org>
# Date 1282295517 -7200
# Node ID 073ff46fe397220b4c3946a8f4b349e8d8578a65
# Parent  2a8bf2ba504f422d53dac30da8b58d76e54b4428# Parent  b619655b31db9469f6fe41932daff7a566079097
Fold Vim 7.2 default branch back to trunk to avoid two heads. (Tony
Mechelynck)

diff --git a/Contents b/Contents
diff --git a/Filelist b/Filelist
diff --git a/Makefile b/Makefile
diff --git a/README.txt b/README.txt
diff --git a/README_ami.txt b/README_ami.txt
diff --git a/README_amibin.txt b/README_amibin.txt
diff --git a/README_amisrc.txt b/README_amisrc.txt
diff --git a/README_bindos.txt b/README_bindos.txt
diff --git a/README_dos.txt b/README_dos.txt
diff --git a/README_extra.txt b/README_extra.txt
diff --git a/README_mac.txt b/README_mac.txt
diff --git a/README_ole.txt b/README_ole.txt
diff --git a/README_os2.txt b/README_os2.txt
diff --git a/README_os390.txt b/README_os390.txt
diff --git a/README_src.txt b/README_src.txt
diff --git a/README_srcdos.txt b/README_srcdos.txt
diff --git a/README_unix.txt b/README_unix.txt
diff --git a/README_vms.txt b/README_vms.txt
diff --git a/README_w32s.txt b/README_w32s.txt
diff --git a/nsis/gvim.nsi b/nsis/gvim.nsi
diff --git a/runtime/doc/arabic.txt b/runtime/doc/arabic.txt
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt
diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt
diff --git a/runtime/doc/debug.txt b/runtime/doc/debug.txt
diff --git a/runtime/doc/debugger.txt b/runtime/doc/debugger.txt
diff --git a/runtime/doc/develop.txt b/runtime/doc/develop.txt
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt
diff --git a/runtime/doc/digraph.txt b/runtime/doc/digraph.txt
diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
diff --git a/runtime/doc/farsi.txt b/runtime/doc/farsi.txt
diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt
diff --git a/runtime/doc/fold.txt b/runtime/doc/fold.txt
diff --git a/runtime/doc/ft_ada.txt b/runtime/doc/ft_ada.txt
diff --git a/runtime/doc/ft_sql.txt b/runtime/doc/ft_sql.txt
diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt
diff --git a/runtime/doc/gui_w16.txt b/runtime/doc/gui_w16.txt
diff --git a/runtime/doc/gui_w32.txt b/runtime/doc/gui_w32.txt
diff --git a/runtime/doc/gui_x11.txt b/runtime/doc/gui_x11.txt
diff --git a/runtime/doc/hangulin.txt b/runtime/doc/hangulin.txt
diff --git a/runtime/doc/hebrew.txt b/runtime/doc/hebrew.txt
diff --git a/runtime/doc/help.txt b/runtime/doc/help.txt
diff --git a/runtime/doc/howto.txt b/runtime/doc/howto.txt
diff --git a/runtime/doc/if_cscop.txt b/runtime/doc/if_cscop.txt
diff --git a/runtime/doc/if_mzsch.txt b/runtime/doc/if_mzsch.txt
diff --git a/runtime/doc/if_ole.txt b/runtime/doc/if_ole.txt
diff --git a/runtime/doc/if_perl.txt b/runtime/doc/if_perl.txt
diff --git a/runtime/doc/if_pyth.txt b/runtime/doc/if_pyth.txt
diff --git a/runtime/doc/if_ruby.txt b/runtime/doc/if_ruby.txt
diff --git a/runtime/doc/if_sniff.txt b/runtime/doc/if_sniff.txt
diff --git a/runtime/doc/if_tcl.txt b/runtime/doc/if_tcl.txt
diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt
diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt
diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt
diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
diff --git a/runtime/doc/mbyte.txt b/runtime/doc/mbyte.txt
diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt
diff --git a/runtime/doc/mlang.txt b/runtime/doc/mlang.txt
diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt
diff --git a/runtime/doc/netbeans.txt b/runtime/doc/netbeans.txt
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
diff --git a/runtime/doc/os_390.txt b/runtime/doc/os_390.txt
diff --git a/runtime/doc/os_amiga.txt b/runtime/doc/os_amiga.txt
diff --git a/runtime/doc/os_beos.txt b/runtime/doc/os_beos.txt
diff --git a/runtime/doc/os_dos.txt b/runtime/doc/os_dos.txt
diff --git a/runtime/doc/os_mac.txt b/runtime/doc/os_mac.txt
diff --git a/runtime/doc/os_mint.txt b/runtime/doc/os_mint.txt
diff --git a/runtime/doc/os_msdos.txt b/runtime/doc/os_msdos.txt
diff --git a/runtime/doc/os_os2.txt b/runtime/doc/os_os2.txt
diff --git a/runtime/doc/os_qnx.txt b/runtime/doc/os_qnx.txt
diff --git a/runtime/doc/os_risc.txt b/runtime/doc/os_risc.txt
diff --git a/runtime/doc/os_unix.txt b/runtime/doc/os_unix.txt
diff --git a/runtime/doc/os_vms.txt b/runtime/doc/os_vms.txt
diff --git a/runtime/doc/os_win32.txt b/runtime/doc/os_win32.txt
diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt
diff --git a/runtime/doc/pi_getscript.txt b/runtime/doc/pi_getscript.txt
diff --git a/runtime/doc/pi_gzip.txt b/runtime/doc/pi_gzip.txt
diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt
diff --git a/runtime/doc/pi_paren.txt b/runtime/doc/pi_paren.txt
diff --git a/runtime/doc/pi_spec.txt b/runtime/doc/pi_spec.txt
diff --git a/runtime/doc/pi_tar.txt b/runtime/doc/pi_tar.txt
diff --git a/runtime/doc/pi_vimball.txt b/runtime/doc/pi_vimball.txt
diff --git a/runtime/doc/pi_zip.txt b/runtime/doc/pi_zip.txt
diff --git a/runtime/doc/print.txt b/runtime/doc/print.txt
diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt
diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt
diff --git a/runtime/doc/quotes.txt b/runtime/doc/quotes.txt
diff --git a/runtime/doc/recover.txt b/runtime/doc/recover.txt
diff --git a/runtime/doc/remote.txt b/runtime/doc/remote.txt
diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt
diff --git a/runtime/doc/rileft.txt b/runtime/doc/rileft.txt
diff --git a/runtime/doc/russian.txt b/runtime/doc/russian.txt
diff --git a/runtime/doc/scroll.txt b/runtime/doc/scroll.txt
diff --git a/runtime/doc/sign.txt b/runtime/doc/sign.txt
diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt
diff --git a/runtime/doc/sponsor.txt b/runtime/doc/sponsor.txt
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
diff --git a/runtime/doc/tabpage.txt b/runtime/doc/tabpage.txt
diff --git a/runtime/doc/tags b/runtime/doc/tags
diff --git a/runtime/doc/tagsrch.txt b/runtime/doc/tagsrch.txt
diff --git a/runtime/doc/term.txt b/runtime/doc/term.txt
diff --git a/runtime/doc/tips.txt b/runtime/doc/tips.txt
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
diff --git a/runtime/doc/uganda.txt b/runtime/doc/uganda.txt
diff --git a/runtime/doc/undo.txt b/runtime/doc/undo.txt
diff --git a/runtime/doc/usr_01.txt b/runtime/doc/usr_01.txt
diff --git a/runtime/doc/usr_02.txt b/runtime/doc/usr_02.txt
diff --git a/runtime/doc/usr_03.txt b/runtime/doc/usr_03.txt
diff --git a/runtime/doc/usr_04.txt b/runtime/doc/usr_04.txt
diff --git a/runtime/doc/usr_05.txt b/runtime/doc/usr_05.txt
diff --git a/runtime/doc/usr_06.txt b/runtime/doc/usr_06.txt
diff --git a/runtime/doc/usr_07.txt b/runtime/doc/usr_07.txt
diff --git a/runtime/doc/usr_08.txt b/runtime/doc/usr_08.txt
diff --git a/runtime/doc/usr_09.txt b/runtime/doc/usr_09.txt
diff --git a/runtime/doc/usr_10.txt b/runtime/doc/usr_10.txt
diff --git a/runtime/doc/usr_11.txt b/runtime/doc/usr_11.txt
diff --git a/runtime/doc/usr_12.txt b/runtime/doc/usr_12.txt
diff --git a/runtime/doc/usr_20.txt b/runtime/doc/usr_20.txt
diff --git a/runtime/doc/usr_21.txt b/runtime/doc/usr_21.txt
diff --git a/runtime/doc/usr_22.txt b/runtime/doc/usr_22.txt
diff --git a/runtime/doc/usr_23.txt b/runtime/doc/usr_23.txt
diff --git a/runtime/doc/usr_24.txt b/runtime/doc/usr_24.txt
diff --git a/runtime/doc/usr_25.txt b/runtime/doc/usr_25.txt
diff --git a/runtime/doc/usr_26.txt b/runtime/doc/usr_26.txt
diff --git a/runtime/doc/usr_27.txt b/runtime/doc/usr_27.txt
diff --git a/runtime/doc/usr_28.txt b/runtime/doc/usr_28.txt
diff --git a/runtime/doc/usr_29.txt b/runtime/doc/usr_29.txt
diff --git a/runtime/doc/usr_30.txt b/runtime/doc/usr_30.txt
diff --git a/runtime/doc/usr_31.txt b/runtime/doc/usr_31.txt
diff --git a/runtime/doc/usr_32.txt b/runtime/doc/usr_32.txt
diff --git a/runtime/doc/usr_40.txt b/runtime/doc/usr_40.txt
diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
diff --git a/runtime/doc/usr_42.txt b/runtime/doc/usr_42.txt
diff --git a/runtime/doc/usr_43.txt b/runtime/doc/usr_43.txt
diff --git a/runtime/doc/usr_44.txt b/runtime/doc/usr_44.txt
diff --git a/runtime/doc/usr_45.txt b/runtime/doc/usr_45.txt
diff --git a/runtime/doc/usr_90.txt b/runtime/doc/usr_90.txt
diff --git a/runtime/doc/usr_toc.txt b/runtime/doc/usr_toc.txt
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
diff --git a/runtime/doc/version4.txt b/runtime/doc/version4.txt
diff --git a/runtime/doc/version5.txt b/runtime/doc/version5.txt
diff --git a/runtime/doc/version6.txt b/runtime/doc/version6.txt
diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt
diff --git a/runtime/doc/vi_diff.txt b/runtime/doc/vi_diff.txt
diff --git a/runtime/doc/visual.txt b/runtime/doc/visual.txt
diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt
diff --git a/runtime/doc/workshop.txt b/runtime/doc/workshop.txt
diff --git a/runtime/doc/xxd-it.UTF-8.1 b/runtime/doc/xxd-it.UTF-8.1
diff --git a/src/GvimExt/GvimExt.reg b/src/GvimExt/GvimExt.reg
diff --git a/src/INSTALLx.txt b/src/INSTALLx.txt
diff --git a/src/Makefile b/src/Makefile
diff --git a/src/README.txt b/src/README.txt
diff --git a/src/auto/configure b/src/auto/configure
diff --git a/src/dosinst.c b/src/dosinst.c
diff --git a/src/edit.c b/src/edit.c
diff --git a/src/eval.c b/src/eval.c
diff --git a/src/globals.h b/src/globals.h
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
diff --git a/src/if_sniff.c b/src/if_sniff.c
diff --git a/src/if_sniff.h b/src/if_sniff.h
diff --git a/src/integration.h b/src/integration.h
diff --git a/src/main.aap b/src/main.aap
diff --git a/src/mbyte.c b/src/mbyte.c
diff --git a/src/memline.c b/src/memline.c
diff --git a/src/misc1.c b/src/misc1.c
diff --git a/src/move.c b/src/move.c
diff --git a/src/netbeans.c b/src/netbeans.c
diff --git a/src/option.c b/src/option.c
diff --git a/src/po/ga.po b/src/po/ga.po
diff --git a/src/proto/misc1.pro b/src/proto/misc1.pro
diff --git a/src/pty.c b/src/pty.c
diff --git a/src/undo.c b/src/undo.c
diff --git a/src/version.c b/src/version.c
diff --git a/src/version.h b/src/version.h
diff --git a/src/vim.def b/src/vim.def
diff --git a/src/vim16.def b/src/vim16.def
diff --git a/src/window.c b/src/window.c