To: vim_dev@googlegroups.com
Subject: Patch 7.4.2293
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.4.2293
Problem:    Modelines in source code are inconsistent.
Solution:   Use the same line in most files.  Add 'noet'.  (Naruhiko Nishino)
Files:      src/alloc.h, src/arabic.c, src/arabic.h, src/ascii.h,
            src/blowfish.c, src/buffer.c, src/channel.c, src/charset.c,
            src/crypt.c, src/crypt_zip.c, src/dict.c, src/diff.c,
            src/digraph.c, src/dosinst.c, src/dosinst.h, src/edit.c,
            src/eval.c, src/evalfunc.c, src/ex_cmds.c, src/ex_cmds.h,
            src/ex_cmds2.c, src/ex_docmd.c, src/ex_eval.c, src/ex_getln.c,
            src/farsi.c, src/farsi.h, src/feature.h, src/fileio.c, src/fold.c,
            src/getchar.c, src/glbl_ime.cpp, src/glbl_ime.h, src/globals.h,
            src/gui.c, src/gui.h, src/gui_at_fs.c, src/gui_at_sb.c,
            src/gui_at_sb.h, src/gui_athena.c, src/gui_beval.c,
            src/gui_beval.h, src/gui_gtk.c, src/gui_gtk_f.c, src/gui_gtk_f.h,
            src/gui_gtk_vms.h, src/gui_gtk_x11.c, src/gui_mac.c,
            src/gui_motif.c, src/gui_photon.c, src/gui_w32.c, src/gui_x11.c,
            src/gui_x11_pm.h, src/gui_xmdlg.c, src/gui_xmebw.c,
            src/gui_xmebw.h, src/gui_xmebwp.h, src/hangulin.c, src/hardcopy.c,
            src/hashtab.c, src/if_cscope.c, src/if_cscope.h, src/if_mzsch.c,
            src/if_mzsch.h, src/if_ole.cpp, src/if_perl.xs, src/if_perlsfio.c,
            src/if_python3.c, src/if_ruby.c, src/if_tcl.c, src/if_xcmdsrv.c,
            src/integration.c, src/integration.h, src/iscygpty.c, src/json.c,
            src/json_test.c, src/keymap.h, src/list.c, src/macros.h,
            src/main.c, src/mark.c, src/mbyte.c, src/memfile.c,
            src/memfile_test.c, src/memline.c, src/menu.c, src/message.c,
            src/message_test.c, src/misc1.c, src/misc2.c, src/move.c,
            src/nbdebug.c, src/nbdebug.h, src/netbeans.c, src/normal.c,
            src/ops.c, src/option.c, src/option.h, src/os_amiga.c,
            src/os_amiga.h, src/os_beos.c, src/os_beos.h, src/os_dos.h,
            src/os_mac.h, src/os_mac_conv.c, src/os_macosx.m, src/os_mint.h,
            src/os_mswin.c, src/os_qnx.c, src/os_qnx.h, src/os_unix.c,
            src/os_unix.h, src/os_unixx.h, src/os_vms.c, src/os_w32dll.c,
            src/os_w32exe.c, src/os_win32.c, src/os_win32.h, src/popupmnu.c,
            src/proto.h, src/pty.c, src/quickfix.c, src/regexp.c,
            src/regexp.h, src/regexp_nfa.c, src/screen.c, src/search.c,
            src/sha256.c, src/spell.c, src/spell.h, src/spellfile.c,
            src/structs.h, src/syntax.c, src/tag.c, src/term.c, src/term.h,
            src/termlib.c, src/ui.c, src/undo.c, src/uninstal.c,
            src/userfunc.c, src/version.c, src/version.h, src/vim.h,
            src/vim.rc, src/vimio.h, src/vimrun.c, src/winclip.c,
            src/window.c, src/workshop.c, src/workshop.h, src/wsdebug.c,
            src/wsdebug.h, src/xpm_w32.c


*** ../vim-7.4.2292/src/alloc.h	2016-02-27 15:21:28.404383974 +0100
--- src/alloc.h	2016-08-29 22:42:14.940190496 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/arabic.c	2016-07-02 20:27:29.953436359 +0200
--- src/arabic.c	2016-08-29 22:39:44.245496743 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved    by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved    by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/arabic.h	2010-05-15 13:04:07.000000000 +0200
--- src/arabic.h	2016-08-29 22:42:20.940138507 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved    by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved    by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/ascii.h	2015-07-10 14:05:03.930436893 +0200
--- src/ascii.h	2016-08-29 22:42:20.940138507 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/blowfish.c	2016-02-23 14:52:31.865232378 +0100
--- src/blowfish.c	2016-08-29 22:42:20.940138507 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/buffer.c	2016-08-24 00:12:08.864171037 +0200
--- src/buffer.c	2016-08-29 22:42:20.944138473 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/channel.c	2016-08-28 19:26:39.620111923 +0200
--- src/channel.c	2016-08-29 22:42:20.944138473 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/charset.c	2016-07-02 18:25:15.724879148 +0200
--- src/charset.c	2016-08-29 22:42:20.944138473 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/crypt.c	2016-01-30 15:14:02.535448954 +0100
--- src/crypt.c	2016-08-29 22:42:20.948138438 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/crypt_zip.c	2016-01-30 15:14:02.535448954 +0100
--- src/crypt_zip.c	2016-08-29 22:42:20.948138438 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/dict.c	2016-08-12 22:22:01.168781950 +0200
--- src/dict.c	2016-08-29 22:42:20.948138438 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/diff.c	2016-08-28 15:39:53.469320921 +0200
--- src/diff.c	2016-08-29 22:42:20.948138438 +0200
***************
*** 1,4 ****
! /* vim:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/digraph.c	2016-07-31 14:17:22.903502231 +0200
--- src/digraph.c	2016-08-29 22:42:20.948138438 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/dosinst.c	2016-07-29 18:33:34.860824431 +0200
--- src/dosinst.c	2016-08-29 22:42:20.952138404 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/dosinst.h	2016-02-23 14:52:31.869232337 +0100
--- src/dosinst.h	2016-08-29 22:42:20.952138404 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/edit.c	2016-08-12 18:29:36.610738320 +0200
--- src/edit.c	2016-08-29 22:42:20.956138368 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/eval.c	2016-08-27 21:25:22.698047706 +0200
--- src/eval.c	2016-08-29 22:42:20.956138368 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
***************
*** 4167,4173 ****
      rettv->v_type = VAR_UNKNOWN;
  
      /*
!      * Skip '!' and '-' characters.  They are handled later.
       */
      start_leader = *arg;
      while (**arg == '!' || **arg == '-' || **arg == '+')
--- 4167,4173 ----
      rettv->v_type = VAR_UNKNOWN;
  
      /*
!      * Skip '!', '-' and '+' characters.  They are handled later.
       */
      start_leader = *arg;
      while (**arg == '!' || **arg == '-' || **arg == '+')
*** ../vim-7.4.2292/src/evalfunc.c	2016-08-28 14:11:20.238534825 +0200
--- src/evalfunc.c	2016-08-29 22:42:20.956138368 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/ex_cmds.c	2016-08-28 17:08:13.663418598 +0200
--- src/ex_cmds.c	2016-08-29 22:42:20.960138334 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/ex_cmds.h	2016-08-26 22:29:06.079185186 +0200
--- src/ex_cmds.h	2016-08-29 22:42:20.960138334 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/ex_cmds2.c	2016-08-07 20:20:46.582584213 +0200
--- src/ex_cmds2.c	2016-08-29 22:42:20.960138334 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/ex_docmd.c	2016-08-26 22:29:06.083185153 +0200
--- src/ex_docmd.c	2016-08-29 22:42:20.960138334 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/ex_eval.c	2016-03-06 14:58:24.041667964 +0100
--- src/ex_eval.c	2016-08-29 22:42:20.960138334 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/ex_getln.c	2016-08-27 16:26:32.715931024 +0200
--- src/ex_getln.c	2016-08-29 22:42:20.960138334 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/farsi.c	2016-07-02 20:27:29.953436359 +0200
--- src/farsi.c	2016-08-29 22:42:20.960138334 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/farsi.h	2010-05-15 13:04:08.000000000 +0200
--- src/farsi.h	2016-08-29 22:42:20.960138334 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/feature.h	2016-07-28 22:22:39.978236440 +0200
--- src/feature.h	2016-08-29 22:42:20.960138334 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/fileio.c	2016-08-20 15:05:35.562703140 +0200
--- src/fileio.c	2016-08-29 22:42:20.964138299 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/fold.c	2016-08-03 22:08:41.743652143 +0200
--- src/fold.c	2016-08-29 22:42:20.964138299 +0200
***************
*** 1,4 ****
! /* vim:set ts=8 sts=4 sw=4:
   * vim600:fdm=marker fdl=1 fdc=3:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   * vim600:fdm=marker fdl=1 fdc=3:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
*** ../vim-7.4.2292/src/getchar.c	2016-08-26 22:29:06.079185186 +0200
--- src/getchar.c	2016-08-29 22:42:20.964138299 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/glbl_ime.cpp	2013-05-06 04:06:04.000000000 +0200
--- src/glbl_ime.cpp	2016-08-29 22:42:20.964138299 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/glbl_ime.h	2010-05-15 13:04:07.000000000 +0200
--- src/glbl_ime.h	2016-08-29 22:42:20.964138299 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/globals.h	2016-08-22 23:04:29.206161702 +0200
--- src/globals.h	2016-08-29 22:42:20.964138299 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/gui.c	2016-08-22 23:04:29.218161596 +0200
--- src/gui.c	2016-08-29 22:42:20.964138299 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *				GUI/Motif support by Robert Webb
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *				GUI/Motif support by Robert Webb
*** ../vim-7.4.2292/src/gui.h	2016-08-10 20:53:01.675116208 +0200
--- src/gui.h	2016-08-29 22:42:20.964138299 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *				Motif support by Robert Webb
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *				Motif support by Robert Webb
*** ../vim-7.4.2292/src/gui_at_fs.c	2016-07-01 17:17:13.286266820 +0200
--- src/gui_at_fs.c	2016-08-29 22:42:20.964138299 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4: */
  
  /*
   * Copyright 1989 Software Research Associates, Inc., Tokyo, Japan
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet: */
  
  /*
   * Copyright 1989 Software Research Associates, Inc., Tokyo, Japan
*** ../vim-7.4.2292/src/gui_at_sb.c	2016-01-30 18:13:48.559479453 +0100
--- src/gui_at_sb.c	2016-08-29 22:42:20.964138299 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4: */
  /*
   * MODIFIED ATHENA SCROLLBAR (USING ARROWHEADS AT ENDS OF TRAVEL)
   * Modifications Copyright 1992 by Mitch Trachtenberg
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet: */
  /*
   * MODIFIED ATHENA SCROLLBAR (USING ARROWHEADS AT ENDS OF TRAVEL)
   * Modifications Copyright 1992 by Mitch Trachtenberg
*** ../vim-7.4.2292/src/gui_at_sb.h	2016-01-29 23:20:35.313308119 +0100
--- src/gui_at_sb.h	2016-08-29 22:42:20.964138299 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4: */
  /* MODIFIED ATHENA SCROLLBAR (USING ARROWHEADS AT ENDS OF TRAVEL) */
  /* Modifications Copyright 1992 by Mitch Trachtenberg		  */
  /* Rights, permissions, and disclaimer of warranty are as in the  */
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet: */
  /* MODIFIED ATHENA SCROLLBAR (USING ARROWHEADS AT ENDS OF TRAVEL) */
  /* Modifications Copyright 1992 by Mitch Trachtenberg		  */
  /* Rights, permissions, and disclaimer of warranty are as in the  */
*** ../vim-7.4.2292/src/gui_athena.c	2016-01-30 18:13:48.555479495 +0100
--- src/gui_athena.c	2016-08-29 22:42:20.964138299 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *				GUI/Motif support by Robert Webb
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *				GUI/Motif support by Robert Webb
*** ../vim-7.4.2292/src/gui_beval.c	2016-07-22 22:26:48.141225215 +0200
--- src/gui_beval.c	2016-08-29 22:42:20.968138265 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *			Visual Workshop integration by Gordon Prieur
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *			Visual Workshop integration by Gordon Prieur
*** ../vim-7.4.2292/src/gui_beval.h	2016-02-23 17:13:56.881032289 +0100
--- src/gui_beval.h	2016-08-29 22:42:20.968138265 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *			Visual Workshop integration by Gordon Prieur
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *			Visual Workshop integration by Gordon Prieur
*** ../vim-7.4.2292/src/gui_gtk.c	2016-04-30 13:26:10.266720263 +0200
--- src/gui_gtk.c	2016-08-29 22:42:20.968138265 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/gui_gtk_f.c	2016-02-23 17:13:56.881032289 +0100
--- src/gui_gtk_f.c	2016-08-29 22:42:20.968138265 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/gui_gtk_f.h	2016-02-23 17:13:56.881032289 +0100
--- src/gui_gtk_f.h	2016-08-29 22:42:20.968138265 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/gui_gtk_vms.h	2010-05-15 13:04:09.000000000 +0200
--- src/gui_gtk_vms.h	2016-08-29 22:42:20.968138265 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved    by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved    by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/gui_gtk_x11.c	2016-08-22 23:04:29.214161631 +0200
--- src/gui_gtk_x11.c	2016-08-29 22:42:20.968138265 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/gui_mac.c	2016-08-22 23:04:29.218161596 +0200
--- src/gui_mac.c	2016-08-29 22:42:20.968138265 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *				GUI/Motif support by Robert Webb
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *				GUI/Motif support by Robert Webb
*** ../vim-7.4.2292/src/gui_motif.c	2016-01-30 19:45:44.054087595 +0100
--- src/gui_motif.c	2016-08-29 22:42:20.968138265 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *				GUI/Motif support by Robert Webb
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *				GUI/Motif support by Robert Webb
*** ../vim-7.4.2292/src/gui_photon.c	2016-08-22 23:04:29.218161596 +0200
--- src/gui_photon.c	2016-08-29 22:42:20.968138265 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sw=4 sts=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *			Photon GUI support by Julian Kinraid
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *			Photon GUI support by Julian Kinraid
*** ../vim-7.4.2292/src/gui_w32.c	2016-08-25 23:19:25.663805302 +0200
--- src/gui_w32.c	2016-08-29 22:42:20.972138230 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *				GUI support by Robert Webb
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *				GUI support by Robert Webb
*** ../vim-7.4.2292/src/gui_x11.c	2016-08-22 23:04:29.218161596 +0200
--- src/gui_x11.c	2016-08-29 22:42:20.972138230 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *				GUI/Motif support by Robert Webb
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *				GUI/Motif support by Robert Webb
*** ../vim-7.4.2292/src/gui_x11_pm.h	2010-05-15 13:04:10.000000000 +0200
--- src/gui_x11_pm.h	2016-08-29 22:42:20.972138230 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *				GUI/Motif support by Robert Webb
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *				GUI/Motif support by Robert Webb
*** ../vim-7.4.2292/src/gui_xmdlg.c	2011-01-16 00:15:33.000000000 +0100
--- src/gui_xmdlg.c	2016-08-29 22:42:20.972138230 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/gui_xmebw.c	2013-05-06 04:06:04.000000000 +0200
--- src/gui_xmebw.c	2016-08-29 22:42:20.972138230 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/gui_xmebw.h	2010-05-15 13:04:10.000000000 +0200
--- src/gui_xmebw.h	2016-08-29 22:42:20.972138230 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/gui_xmebwp.h	2013-05-06 04:06:04.000000000 +0200
--- src/gui_xmebwp.h	2016-08-29 22:42:20.972138230 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/hangulin.c	2016-01-30 17:24:01.794502490 +0100
--- src/hangulin.c	2016-08-29 22:42:20.972138230 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/hardcopy.c	2016-04-29 22:58:25.618876680 +0200
--- src/hardcopy.c	2016-08-29 22:42:20.972138230 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/hashtab.c	2016-07-14 22:34:13.246016558 +0200
--- src/hashtab.c	2016-08-29 22:42:20.972138230 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/if_cscope.c	2016-07-05 22:28:36.697675059 +0200
--- src/if_cscope.c	2016-08-29 22:42:20.972138230 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * CSCOPE support for Vim added by Andy Kahn <kahn@zk3.dec.com>
   * Ported to Win32 by Sergey Khorev <sergey.khorev@gmail.com>
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * CSCOPE support for Vim added by Andy Kahn <kahn@zk3.dec.com>
   * Ported to Win32 by Sergey Khorev <sergey.khorev@gmail.com>
*** ../vim-7.4.2292/src/if_cscope.h	2016-08-28 17:15:21.887689299 +0200
--- src/if_cscope.h	2016-08-29 22:42:20.972138230 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * CSCOPE support for Vim added by Andy Kahn <kahn@zk3.dec.com>
   * Ported to Win32 by Sergey Khorev <sergey.khorev@gmail.com>
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * CSCOPE support for Vim added by Andy Kahn <kahn@zk3.dec.com>
   * Ported to Win32 by Sergey Khorev <sergey.khorev@gmail.com>
*** ../vim-7.4.2292/src/if_mzsch.c	2016-08-26 12:54:49.083190234 +0200
--- src/if_mzsch.c	2016-08-29 22:42:20.972138230 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * MzScheme interface by Sergey Khorev <sergey.khorev@gmail.com>
   * Based on work by Brent Fulgham <bfulgham@debian.org>
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * MzScheme interface by Sergey Khorev <sergey.khorev@gmail.com>
   * Based on work by Brent Fulgham <bfulgham@debian.org>
*** ../vim-7.4.2292/src/if_mzsch.h	2016-08-28 18:10:28.335286000 +0200
--- src/if_mzsch.h	2016-08-29 22:42:20.972138230 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * MzScheme interface for Vim, wrapper around scheme.h
   */
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * MzScheme interface for Vim, wrapper around scheme.h
   */
*** ../vim-7.4.2292/src/if_ole.cpp	2016-03-19 20:51:30.707550109 +0100
--- src/if_ole.cpp	2016-08-29 22:42:20.972138230 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/if_perl.xs	2016-07-24 21:58:39.704057634 +0200
--- src/if_perl.xs	2016-08-29 22:42:20.972138230 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/if_perlsfio.c	2016-01-30 17:24:01.798502450 +0100
--- src/if_perlsfio.c	2016-08-29 22:42:20.972138230 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/if_python3.c	2016-04-21 20:00:47.918966506 +0200
--- src/if_python3.c	2016-08-29 22:42:20.972138230 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved    by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved    by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/if_ruby.c	2016-07-24 21:58:39.704057634 +0200
--- src/if_ruby.c	2016-08-29 22:42:20.972138230 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/if_tcl.c	2016-07-24 21:58:39.708057598 +0200
--- src/if_tcl.c	2016-08-29 22:42:20.972138230 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/if_xcmdsrv.c	2016-03-25 19:02:57.096939431 +0100
--- src/if_xcmdsrv.c	2016-08-29 22:42:20.976138195 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   * X command server by Flemming Madsen
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   * X command server by Flemming Madsen
*** ../vim-7.4.2292/src/integration.c	2016-02-25 15:24:59.696624342 +0100
--- src/integration.c	2016-08-29 22:42:20.976138195 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sw=8:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *			Visual Workshop integration by Gordon Prieur
--- 1,4 ----
! /* vi:set ts=8 sw=8 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *			Visual Workshop integration by Gordon Prieur
*** ../vim-7.4.2292/src/integration.h	2010-08-08 15:08:42.000000000 +0200
--- src/integration.h	2016-08-29 22:42:20.976138195 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *			Visual Workshop integration by Gordon Prieur
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *			Visual Workshop integration by Gordon Prieur
*** ../vim-7.4.2292/src/iscygpty.c	2016-06-26 20:37:24.567968951 +0200
--- src/iscygpty.c	2016-08-29 22:42:20.976138195 +0200
***************
*** 178,181 ****
  	return ret;
  }
  
! /* vim: set ts=4 sw=4: */
--- 178,181 ----
  	return ret;
  }
  
! /* vi:set ts=8 sts=4 sw=4 noet: */
*** ../vim-7.4.2292/src/json.c	2016-08-26 17:58:33.582124452 +0200
--- src/json.c	2016-08-29 22:42:20.976138195 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/json_test.c	2016-02-07 19:16:24.234303776 +0100
--- src/json_test.c	2016-08-29 22:42:20.976138195 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/keymap.h	2016-02-27 18:13:05.240593068 +0100
--- src/keymap.h	2016-08-29 22:42:20.976138195 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/list.c	2016-07-22 21:49:36.666031534 +0200
--- src/list.c	2016-08-29 22:42:20.976138195 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/macros.h	2016-08-21 17:44:57.440487201 +0200
--- src/macros.h	2016-08-29 22:42:20.976138195 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/main.c	2016-08-10 20:45:04.375456367 +0200
--- src/main.c	2016-08-29 22:42:20.976138195 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/mark.c	2016-07-24 21:58:39.708057598 +0200
--- src/mark.c	2016-08-29 22:42:20.976138195 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/mbyte.c	2016-07-11 23:19:01.518779538 +0200
--- src/mbyte.c	2016-08-29 22:42:20.976138195 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   * Multibyte extensions partly by Sung-Hoon Baek
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   * Multibyte extensions partly by Sung-Hoon Baek
*** ../vim-7.4.2292/src/memfile.c	2016-07-24 21:58:39.708057598 +0200
--- src/memfile.c	2016-08-29 22:42:20.976138195 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/memfile_test.c	2016-02-02 18:19:52.798743887 +0100
--- src/memfile_test.c	2016-08-29 22:42:20.976138195 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/memline.c	2016-07-24 21:58:39.708057598 +0200
--- src/memline.c	2016-08-29 22:42:20.976138195 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/menu.c	2016-06-10 21:52:38.390787678 +0200
--- src/menu.c	2016-08-29 22:42:20.976138195 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *				GUI/Motif support by Robert Webb
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *				GUI/Motif support by Robert Webb
***************
*** 1818,1824 ****
   * defined.  This is done once here.  add_menu_path() may have already been
   * called to define these menus, and may be called again.  This function calls
   * itself recursively.	Should be called at the top level with:
!  * gui_create_initial_menus(root_menu, NULL);
   */
      void
  gui_create_initial_menus(vimmenu_T *menu)
--- 1818,1824 ----
   * defined.  This is done once here.  add_menu_path() may have already been
   * called to define these menus, and may be called again.  This function calls
   * itself recursively.	Should be called at the top level with:
!  * gui_create_initial_menus(root_menu);
   */
      void
  gui_create_initial_menus(vimmenu_T *menu)
*** ../vim-7.4.2292/src/message.c	2016-08-29 22:31:19.729877340 +0200
--- src/message.c	2016-08-29 22:42:20.980138161 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/message_test.c	2016-07-19 12:33:39.938005838 +0200
--- src/message_test.c	2016-08-29 22:42:20.980138161 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/misc1.c	2016-08-27 21:55:09.787084275 +0200
--- src/misc1.c	2016-08-29 22:42:20.980138161 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/misc2.c	2016-08-14 16:07:44.717705432 +0200
--- src/misc2.c	2016-08-29 22:42:20.980138161 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/move.c	2016-08-12 18:29:36.610738320 +0200
--- src/move.c	2016-08-29 22:42:20.980138161 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/nbdebug.c	2013-05-06 04:06:04.000000000 +0200
--- src/nbdebug.c	2016-08-29 22:42:20.980138161 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=8 sw=8:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *			Visual Workshop integration by Gordon Prieur
--- 1,4 ----
! /* vi:set ts=8 sw=8 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *			Visual Workshop integration by Gordon Prieur
*** ../vim-7.4.2292/src/nbdebug.h	2016-01-29 23:20:35.313308119 +0100
--- src/nbdebug.h	2016-08-29 22:42:20.980138161 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=8 sw=8:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *			Visual Workshop integration by Gordon Prieur
--- 1,4 ----
! /* vi:set ts=8 sw=8 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *			Visual Workshop integration by Gordon Prieur
*** ../vim-7.4.2292/src/netbeans.c	2016-07-24 21:58:39.712057561 +0200
--- src/netbeans.c	2016-08-29 22:42:20.980138161 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *			Netbeans integration by David Weatherford
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *			Netbeans integration by David Weatherford
*** ../vim-7.4.2292/src/normal.c	2016-07-24 21:58:39.712057561 +0200
--- src/normal.c	2016-08-29 22:42:20.980138161 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/ops.c	2016-08-10 20:53:01.679116172 +0200
--- src/ops.c	2016-08-29 22:42:20.984138126 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/option.c	2016-08-25 23:19:25.671805229 +0200
--- src/option.c	2016-08-29 22:42:20.984138126 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/option.h	2016-08-28 18:10:28.339285965 +0200
--- src/option.h	2016-08-29 22:42:20.984138126 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/os_amiga.c	2016-08-28 18:10:28.339285965 +0200
--- src/os_amiga.c	2016-08-29 22:42:20.984138126 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/os_amiga.h	2016-07-28 22:22:39.978236440 +0200
--- src/os_amiga.h	2016-08-29 22:42:20.984138126 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/os_beos.c	2012-11-20 16:22:17.000000000 +0100
--- src/os_beos.c	2016-08-29 22:42:20.984138126 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *		 BeBox port Copyright 1997 by Olaf Seibert.
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *		 BeBox port Copyright 1997 by Olaf Seibert.
*** ../vim-7.4.2292/src/os_beos.h	2012-11-20 16:22:48.000000000 +0100
--- src/os_beos.h	2016-08-29 22:42:20.984138126 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *		 BeBox port by Olaf Seibert
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *		 BeBox port by Olaf Seibert
*** ../vim-7.4.2292/src/os_dos.h	2016-07-28 22:22:39.978236440 +0200
--- src/os_dos.h	2016-08-29 22:42:20.984138126 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/os_mac.h	2016-07-28 22:22:39.978236440 +0200
--- src/os_mac.h	2016-08-29 22:42:20.984138126 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/os_mac_conv.c	2016-08-28 18:10:28.339285965 +0200
--- src/os_mac_conv.c	2016-08-29 22:42:20.984138126 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/os_macosx.m	2016-01-31 18:08:30.279202960 +0100
--- src/os_macosx.m	2016-08-29 22:42:20.984138126 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/os_mint.h	2010-05-15 13:04:10.000000000 +0200
--- src/os_mint.h	2016-08-29 22:42:20.984138126 +0200
***************
*** 1,4 ****
! /* vim:ts=8 sts=4:sw=4
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/os_mswin.c	2016-07-01 17:17:13.290266761 +0200
--- src/os_mswin.c	2016-08-29 22:42:20.984138126 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/os_qnx.c	2016-01-30 20:31:21.241607996 +0100
--- src/os_qnx.c	2016-08-29 22:42:20.984138126 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/os_qnx.h	2010-05-15 13:04:12.000000000 +0200
--- src/os_qnx.h	2016-08-29 22:42:20.984138126 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/os_unix.c	2016-08-28 16:53:06.499314885 +0200
--- src/os_unix.c	2016-08-29 22:42:20.988138091 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *	      OS/2 port by Paul Slootman
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *	      OS/2 port by Paul Slootman
*** ../vim-7.4.2292/src/os_unix.h	2016-07-28 22:22:39.978236440 +0200
--- src/os_unix.h	2016-08-29 22:42:20.988138091 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/os_unixx.h	2010-05-15 13:04:07.000000000 +0200
--- src/os_unixx.h	2016-08-29 22:42:20.988138091 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/os_vms.c	2016-01-30 20:31:21.249607913 +0100
--- src/os_vms.c	2016-08-29 22:42:20.988138091 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   * VMS port			by Henk Elbers
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   * VMS port			by Henk Elbers
*** ../vim-7.4.2292/src/os_w32dll.c	2010-05-15 13:04:10.000000000 +0200
--- src/os_w32dll.c	2016-08-29 22:42:20.988138091 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *				GUI support by Robert Webb
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *				GUI support by Robert Webb
*** ../vim-7.4.2292/src/os_w32exe.c	2016-01-29 22:46:58.962534859 +0100
--- src/os_w32exe.c	2016-08-29 22:42:20.988138091 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *				GUI support by Robert Webb
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *				GUI support by Robert Webb
*** ../vim-7.4.2292/src/os_win32.c	2016-08-28 18:10:28.343285931 +0200
--- src/os_win32.c	2016-08-29 22:42:20.988138091 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/os_win32.h	2016-01-30 21:48:44.329034406 +0100
--- src/os_win32.h	2016-08-29 22:42:20.988138091 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/popupmnu.c	2016-02-23 18:55:38.033647023 +0100
--- src/popupmnu.c	2016-08-29 22:42:20.988138091 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/proto.h	2016-07-19 16:38:45.507086996 +0200
--- src/proto.h	2016-08-29 22:42:20.988138091 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/pty.c	2016-07-01 17:17:13.294266702 +0200
--- src/pty.c	2016-08-29 22:42:20.988138091 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/quickfix.c	2016-08-27 13:35:31.068014989 +0200
--- src/quickfix.c	2016-08-29 22:42:20.988138091 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/regexp.c	2016-08-01 15:40:24.183878405 +0200
--- src/regexp.c	2016-08-29 22:42:20.988138091 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * Handling of regular expressions: vim_regcomp(), vim_regexec(), vim_regsub()
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * Handling of regular expressions: vim_regcomp(), vim_regexec(), vim_regsub()
   *
*** ../vim-7.4.2292/src/regexp.h	2014-11-05 14:26:30.764758363 +0100
--- src/regexp.h	2016-08-29 22:42:20.988138091 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE
   *
*** ../vim-7.4.2292/src/regexp_nfa.c	2016-06-28 22:39:12.140467451 +0200
--- src/regexp_nfa.c	2016-08-29 22:42:20.992138057 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * NFA regular expression implementation.
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * NFA regular expression implementation.
   *
*** ../vim-7.4.2292/src/screen.c	2016-08-27 18:34:25.562350755 +0200
--- src/screen.c	2016-08-29 22:42:20.992138057 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/search.c	2016-08-20 16:56:48.254624304 +0200
--- src/search.c	2016-08-29 22:42:20.992138057 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/sha256.c	2016-01-30 21:10:04.997342621 +0100
--- src/sha256.c	2016-08-29 22:42:20.992138057 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/spell.c	2016-08-24 22:11:52.337277956 +0200
--- src/spell.c	2016-08-29 22:42:20.992138057 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/spell.h	2016-07-19 16:38:45.503087037 +0200
--- src/spell.h	2016-08-29 22:42:20.992138057 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/spellfile.c	2016-07-19 16:38:45.503087037 +0200
--- src/spellfile.c	2016-08-29 22:42:20.992138057 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/structs.h	2016-08-28 18:10:28.339285965 +0200
--- src/structs.h	2016-08-29 22:42:20.996138022 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/syntax.c	2016-08-22 23:04:29.214161631 +0200
--- src/syntax.c	2016-08-29 22:42:20.996138022 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/tag.c	2016-08-24 21:21:22.572601394 +0200
--- src/tag.c	2016-08-29 22:42:20.996138022 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/term.c	2016-08-22 23:04:29.214161631 +0200
--- src/term.c	2016-08-29 22:42:20.996138022 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/term.h	2016-04-21 21:08:11.797948928 +0200
--- src/term.h	2016-08-29 22:42:20.996138022 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/termlib.c	2016-02-29 21:20:43.118003801 +0100
--- src/termlib.c	2016-08-29 22:42:20.996138022 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4: */
  /*
   * The following software is (C) 1984 Peter da Silva, the Mad Australian, in
   * the public domain. It may be re-distributed for any purpose with the
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet: */
  /*
   * The following software is (C) 1984 Peter da Silva, the Mad Australian, in
   * the public domain. It may be re-distributed for any purpose with the
*** ../vim-7.4.2292/src/ui.c	2016-03-19 22:11:47.436674835 +0100
--- src/ui.c	2016-08-29 22:42:20.996138022 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/undo.c	2016-07-29 16:15:13.038677979 +0200
--- src/undo.c	2016-08-29 22:42:20.996138022 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/uninstal.c	2016-02-23 14:52:31.901232005 +0100
--- src/uninstal.c	2016-08-29 22:42:20.996138022 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/userfunc.c	2016-08-24 22:06:34.930093873 +0200
--- src/userfunc.c	2016-08-29 22:42:21.000137987 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/version.c	2016-08-29 22:31:19.733877306 +0200
--- src/version.c	2016-08-29 22:45:37.222438564 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/version.h	2013-08-10 13:26:38.000000000 +0200
--- src/version.h	2016-08-29 22:42:21.000137987 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/vim.h	2016-08-28 18:10:28.339285965 +0200
--- src/vim.h	2016-08-29 22:42:21.000137987 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/vim.rc	2013-07-08 20:38:16.000000000 +0200
--- src/vim.rc	2016-08-29 22:42:21.000137987 +0200
***************
*** 1,4 ****
! // vim:ts=8:sw=4:sts=4:
  //
  // VIM - Vi IMproved	by Bram Moolenaar
  //
--- 1,4 ----
! // vi:set ts=8 sts=4 sw=4 noet:
  //
  // VIM - Vi IMproved	by Bram Moolenaar
  //
*** ../vim-7.4.2292/src/vimio.h	2012-11-20 15:57:19.000000000 +0100
--- src/vimio.h	2016-08-29 22:42:21.000137987 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/vimrun.c	2016-08-10 21:54:50.916614470 +0200
--- src/vimrun.c	2016-08-29 22:42:21.000137987 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *			this file by Vince Negri
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *			this file by Vince Negri
*** ../vim-7.4.2292/src/winclip.c	2016-02-20 13:54:39.149146991 +0100
--- src/winclip.c	2016-08-29 22:42:21.000137987 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/window.c	2016-08-28 15:39:53.473320888 +0200
--- src/window.c	2016-08-29 22:42:21.000137987 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *
*** ../vim-7.4.2292/src/workshop.c	2016-07-24 21:58:39.720057487 +0200
--- src/workshop.c	2016-08-29 22:42:21.000137987 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *			Visual Workshop integration by Gordon Prieur
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *			Visual Workshop integration by Gordon Prieur
*** ../vim-7.4.2292/src/workshop.h	2010-05-15 13:04:08.000000000 +0200
--- src/workshop.h	2016-08-29 22:42:21.000137987 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *			Visual Workshop integration by Gordon Prieur
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *			Visual Workshop integration by Gordon Prieur
*** ../vim-7.4.2292/src/wsdebug.c	2010-05-15 13:04:10.000000000 +0200
--- src/wsdebug.c	2016-08-29 22:42:21.000137987 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=8 sw=8:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *			Visual Workshop integration by Gordon Prieur
--- 1,4 ----
! /* vi:set ts=8 sw=8 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *			Visual Workshop integration by Gordon Prieur
*** ../vim-7.4.2292/src/wsdebug.h	2010-05-15 13:04:10.000000000 +0200
--- src/wsdebug.h	2016-08-29 22:42:21.000137987 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=8 sw=8:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *			Visual Workshop integration by Gordon Prieur
--- 1,4 ----
! /* vi:set ts=8 sw=8 noet:
   *
   * VIM - Vi IMproved	by Bram Moolenaar
   *			Visual Workshop integration by Gordon Prieur
*** ../vim-7.4.2292/src/xpm_w32.c	2016-01-30 21:29:52.232928463 +0100
--- src/xpm_w32.c	2016-08-29 22:42:21.000137987 +0200
***************
*** 1,4 ****
! /* vi:set ts=8 sts=4 sw=4:
   *
   * Load XPM image.
   *
--- 1,4 ----
! /* vi:set ts=8 sts=4 sw=4 noet:
   *
   * Load XPM image.
   *
*** ../vim-7.4.2292/src/version.c	2016-08-29 22:31:19.733877306 +0200
--- src/version.c	2016-08-29 22:45:37.222438564 +0200
***************
*** 765,766 ****
--- 765,768 ----
  {   /* Add new patch number below this line */
+ /**/
+     2293,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
108. While reading a magazine, you look for the Zoom icon for a better
     look at a photograph.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- 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    ///