vim/patches/vim-7.3.523.patch0

   1 To: vim_dev@googlegroups.com
   2 Subject: Patch 7.3.523
   3 Fcc: outbox
   4 From: Bram Moolenaar <Bram@moolenaar.net>
   5 Mime-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8 ------------
   9
  10 Patch 7.3.523
  11 Problem:    ":diffupdate" doesn't check for files changed elsewhere.
  12 Solution:   Add the ! flag. (Christian Brabandt)
  13 Files:      runtime/doc/diff.txt, src/diff.c, src/ex_cmds.h
  14
  15
  16 *** ../vim-7.3.522/runtime/doc/diff.txt 2010-08-15 21:57:16.000000000 +0200
  17 --- runtime/doc/diff.txt        2012-05-18 18:41:49.000000000 +0200
  18 ***************
  19 *** 178,184 ****
  20   nodiff" before hiding it.
  21
  22                                                         *:diffu* *:diffupdate*
  23 ! :diffu[pdate]                 Update the diff highlighting and folds.
  24
  25   Vim attempts to keep the differences updated when you make changes to the
  26   text.  This mostly takes care of inserted and deleted lines.  Changes within a
  27 --- 178,184 ----
  28   nodiff" before hiding it.
  29
  30                                                         *:diffu* *:diffupdate*
  31 ! :diffu[pdate][!]              Update the diff highlighting and folds.
  32
  33   Vim attempts to keep the differences updated when you make changes to the
  34   text.  This mostly takes care of inserted and deleted lines.  Changes within a
  35 ***************
  36 *** 187,192 ****
  37 --- 187,195 ----
  38
  39         :diffupdate
  40
  41 + If the ! is included Vim will check if the file was changed externally and
  42 + needs to be reloaded.  It will prompt for each changed file, like `:checktime`
  43 + was used.
  44
  45   Vim will show filler lines for lines that are missing in one window but are
  46   present in another.  These lines were inserted in another file or deleted in
  47 *** ../vim-7.3.522/src/diff.c   2010-09-21 16:56:29.000000000 +0200
  48 --- src/diff.c  2012-05-18 18:45:09.000000000 +0200
  49 ***************
  50 *** 783,788 ****
  51 --- 783,797 ----
  52         goto theend;
  53       }
  54
  55 +     /* :diffupdate! */
  56 +     if (eap != NULL && eap->forceit)
  57 +       for (idx_new = idx_orig; idx_new < DB_COUNT; ++idx_new)
  58 +       {
  59 +           buf = curtab->tp_diffbuf[idx_new];
  60 +           if (buf_valid(buf))
  61 +               buf_check_timestamp(buf, FALSE);
  62 +       }
  63 +
  64       /* Write the first buffer to a tempfile. */
  65       buf = curtab->tp_diffbuf[idx_orig];
  66       if (diff_write(buf, tmp_orig) == FAIL)
  67 *** ../vim-7.3.522/src/ex_cmds.h        2012-02-13 00:01:38.000000000 +0100
  68 --- src/ex_cmds.h       2012-05-18 18:37:56.000000000 +0200
  69 ***************
  70 *** 304,310 ****
  71   EX(CMD_display,               "display",      ex_display,
  72                         EXTRA|NOTRLCOM|TRLBAR|SBOXOK|CMDWIN),
  73   EX(CMD_diffupdate,    "diffupdate",   ex_diffupdate,
  74 !                       TRLBAR),
  75   EX(CMD_diffget,               "diffget",      ex_diffgetput,
  76                         RANGE|EXTRA|TRLBAR|MODIFY),
  77   EX(CMD_diffoff,               "diffoff",      ex_diffoff,
  78 --- 304,310 ----
  79   EX(CMD_display,               "display",      ex_display,
  80                         EXTRA|NOTRLCOM|TRLBAR|SBOXOK|CMDWIN),
  81   EX(CMD_diffupdate,    "diffupdate",   ex_diffupdate,
  82 !                       BANG|TRLBAR),
  83   EX(CMD_diffget,               "diffget",      ex_diffgetput,
  84                         RANGE|EXTRA|TRLBAR|MODIFY),
  85   EX(CMD_diffoff,               "diffoff",      ex_diffoff,
  86 *** ../vim-7.3.522/src/version.c        2012-05-18 18:34:15.000000000 +0200
  87 --- src/version.c       2012-05-18 18:39:13.000000000 +0200
  88 ***************
  89 *** 716,717 ****
  90 --- 716,719 ----
  91   {   /* Add new patch number below this line */
  92 + /**/
  93 +     523
  94   /**/
  95
  96 --
  97 "The future's already arrived - it's just not evenly distributed yet."
  98                 -- William Gibson
  99
 100  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
 101 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
 102 \\\  an exciting new programming language -- http://www.Zimbu.org        ///
 103  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///