updated for version 7.0078

diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index dc748ab501cdcb730d268bb8a87c141ccb675b68..1f10a86956251339f6580ba2c70dc71053678c84 100644 (file)
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.0aa.  Last change: 2005 May 31
+*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Jun 01
 
 
                  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -30,10 +30,22 @@ be worked on, but only if you sponsor Vim development.  See |sponsor|.
                                                        *known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-":qtag" command: make list of matching tags and use like quickfix list.
-This changes the stack of quickfix lists.  Make another list and use ":qnext",
-":qprev", etc.?  Do allow other commands for quickfix list, such as quickfix
-window.
+Add extra list of file locations.  Can be used with:
+    :ltag            list of matching tags, like :tselect
+
+    :lnext           next location
+    :lprevious :lNext previous location
+    :lnfile          location in next file
+    :lNfile :lpfile   location in previous file
+    :lrewind :lfirst  first location
+    :llast           last location
+    :lq [N]          go to location N (current one if N omitted)
+    :lwindow         open window with locations (separate from quickfix window)
+    :lopen           open window with locations
+    :lclose          close window with locations
+    :llist           list locations
+    :lfile           read locations from file using 'errorformat'
+    :lgetfile        idem, don't jump to first one
 
 Win32: Balloon text can't contain line break.
     Hints for multiline tooltips from Alexei Alexandrov (2005 Mar 26)
@@ -51,6 +63,9 @@ bytes?  Avoids problems with sprintf() on MS-Windows. (Yongwei)
 Problem noticed: tooltips are messed up.  Depends on the moment 'encoding' is
 changed.
 
+Include new PHP indent script from John Wellesz?
+    http://www.vim.org/scripts/download_script.php?src_id=4330
+
 autoload:
 - Add a Vim script in $VIMRUNTIME/tools that takes a file with a list of
   script names and a help file and produces a script that can be sourced to

diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index cdb9bd9524c05b25993d7b290fece256c68704cf..02ffa63353c9e740ca624b4997487d5aad86436c 100644 (file)
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -399,15 +399,20 @@ N  *+X11*         Unix only: can restore window title |X11|
 :redi[r] >> {file}     Redirect messages to file {file}.  Append if {file}
                        already exists.  {not in Vi}
 
-:redi[r] @{a-zA-Z}     Redirect messages to register {a-z}.  Append to the
+:redi[r] @{a-zA-Z}>    Redirect messages to register {a-z}.  Append to the
                        contents of the register if its name is given
-                       uppercase {A-Z}.  {not in Vi}
+                       uppercase {A-Z}.  For backward compatibility, the ">"
+                       after the register name can be omitted. {not in Vi}
 :redi[r] @{a-z}>>      Append messages to register {a-z}. {not in Vi}
 
-:redi[r] @*            Redirect messages to the clipboard. {not in Vi}
+:redi[r] @*>           Redirect messages to the clipboard. For backward
+                       compatibility, the ">" after the register name can be
+                       omitted. {not in Vi}
 :redi[r] @*>>          Append messages to the clipboard. {not in Vi}
 
-:redi[r] @"            Redirect messages to the unnamed register. {not in Vi}
+:redi[r] @">           Redirect messages to the unnamed register. For
+                       backward compatibility, the ">" after the register
+                       name can be omitted. {not in Vi}
 :redi[r] @">>          Append messages to the unnamed register. {not in Vi}
 
 :redi[r] => {var}      Redirect messages to a variable.  If the variable

diff --git a/src/digraph.c b/src/digraph.c
index 06b227ae19616171c885814d86598f6f92e3468d..93a80a8b119eeb05e2d43127a6809792969134b5 100644 (file)
--- a/src/digraph.c
+++ b/src/digraph.c
@@ -38,11 +38,11 @@ static garray_T     user_digraphs = {0, 0, sizeof(digr_T), 10, NULL};
  * Note: Characters marked with XX are not included literally, because some
  * compilers cannot handle them (Amiga SAS/C is the most picky one).
  */
+static digr_T digraphdefault[] =
 #if defined(MSDOS) || defined(OS2)
        /*
         * MSDOS digraphs.
         */
-digr_T digraphdefault[] =
        {{'C', ',', 128},       /* ~@ XX */
        {'u', '"', 129},        /* \81 */
        {'e', '\'', 130},       /* \82 */
@@ -111,7 +111,6 @@ digr_T      digraphdefault[] =
        /*
         * ATARI digraphs
         */
-digr_T digraphdefault[] =
        {{'C', ',', 128},       /* ~@ XX */
        {'u', '"', 129},        /* \81 */
        {'e', '\'', 130},       /* \82 */
@@ -178,7 +177,6 @@ digr_T      digraphdefault[] =
        /*
         * different HPUX digraphs
         */
-digr_T digraphdefault[] =
        {{'A', '`', 161},       /* ¡ */
        {'A', '^', 162},        /* ¢ */
        {'E', '`', 163},        /* £ */
@@ -285,7 +283,6 @@ digr_T      digraphdefault[] =
         * EBCDIC - ISO digraphs
         * TODO: EBCDIC Table is Code-Page 1047
         */
-digr_T digraphdefault[] =
        {{'a', '^',    66},     /* â */
        {'a', '"',    67},      /* ä */
        {'a', '`',    68},      /* à */
@@ -395,7 +392,6 @@ digr_T      digraphdefault[] =
        /*
         * Macintosh digraphs
         */
-digr_T digraphdefault[] =
        {{'a', 't', 64},                /* @ */
        {'A', '"', 128},        /* ~@ XX */
        {'A', 'o', 129},        /* Å */
@@ -526,7 +522,6 @@ digr_T      digraphdefault[] =
        /*
         * digraphs compatible with Vim 5.x
         */
-digr_T digraphdefault[] =
        {{'~', '!', 161},       /* ¡ */
        {'c', '|', 162},        /* ¢ */
        {'$', '$', 163},        /* £ */
@@ -635,7 +630,6 @@ digr_T      digraphdefault[] =
         * digraphs for Unicode from RFC1345
         * (also work for ISO-8859-1 aka latin1)
         */
-digr_T digraphdefault[] =
        {
        {'N', 'U', 0x0a},       /* LF for NUL */
        {'S', 'H', 0x01},

diff --git a/src/edit.c b/src/edit.c
index bce0d83afce22cfdaea0cc49a31b64ac3ae7d2e2..f4682c0833011c78dc5b5b594e02d8ba0da38bb8 100644 (file)
--- a/src/edit.c
+++ b/src/edit.c
@@ -198,10 +198,10 @@ static int        can_cindent;            /* may do cindenting on this line */
 static int     old_indent = 0;         /* for ^^D command in insert mode */
 
 #ifdef FEAT_RIGHTLEFT
-int            revins_on;              /* reverse insert mode on */
-int            revins_chars;           /* how much to skip after edit */
-int            revins_legal;           /* was the last char 'legal'? */
-int            revins_scol;            /* start column of revins session */
+static int     revins_on;              /* reverse insert mode on */
+static int     revins_chars;           /* how much to skip after edit */
+static int     revins_legal;           /* was the last char 'legal'? */
+static int     revins_scol;            /* start column of revins session */
 #endif
 
 #if defined(FEAT_MBYTE) && defined(MACOS_CLASSIC)
@@ -5432,9 +5432,9 @@ echeck_abbr(c)
  * characters will be left on the stack above the newly inserted character.
  */
 
-char_u *replace_stack = NULL;
-long   replace_stack_nr = 0;       /* next entry in replace stack */
-long   replace_stack_len = 0;      /* max. number of entries */
+static char_u  *replace_stack = NULL;
+static long    replace_stack_nr = 0;       /* next entry in replace stack */
+static long    replace_stack_len = 0;      /* max. number of entries */
 
     void
 replace_push(c)

diff --git a/src/syntax.c b/src/syntax.c
index 595befc4f3919c9b2554e5a13ecf21d71365f089..fc2710ab052b655c06f59ac29f247b4f4ff562db 100644 (file)
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -7432,16 +7432,16 @@ hl_do_font(idx, arg, do_normal, do_menu, do_tooltip)
  * Note that this table is used by ALL buffers.  This is required because the
  * GUI can redraw at any time for any buffer.
  */
-garray_T       term_attr_table = {0, 0, 0, 0, NULL};
+static garray_T        term_attr_table = {0, 0, 0, 0, NULL};
 
 #define TERM_ATTR_ENTRY(idx) ((attrentry_T *)term_attr_table.ga_data)[idx]
 
-garray_T       cterm_attr_table = {0, 0, 0, 0, NULL};
+static garray_T        cterm_attr_table = {0, 0, 0, 0, NULL};
 
 #define CTERM_ATTR_ENTRY(idx) ((attrentry_T *)cterm_attr_table.ga_data)[idx]
 
 #ifdef FEAT_GUI
-garray_T       gui_attr_table = {0, 0, 0, 0, NULL};
+static garray_T        gui_attr_table = {0, 0, 0, 0, NULL};
 
 #define GUI_ATTR_ENTRY(idx) ((attrentry_T *)gui_attr_table.ga_data)[idx]
 #endif

diff --git a/src/term.c b/src/term.c
index 20203b5cf834e8b74c1189881950ce4e46a68ae9..9ff29382ee50a7039f0d015c2b71ce2496d35a42 100644 (file)
--- a/src/term.c
+++ b/src/term.c
@@ -144,7 +144,7 @@ static char_u *vim_tgetstr __ARGS((char *s, char_u **pp));
 
 static int  detected_8bit = FALSE;     /* detected 8-bit terminal */
 
-struct builtin_term builtin_termcaps[] =
+static struct builtin_term builtin_termcaps[] =
 {
 
 #if defined(FEAT_GUI)
@@ -2418,9 +2418,9 @@ tltoa(i)
  * minimal tgoto() implementation.
  * no padding and we only parse for %i %d and %+char
  */
-char *tgoto __ARGS((char *, int, int));
+static char *tgoto __ARGS((char *, int, int));
 
-    char *
+    static char *
 tgoto(cm, x, y)
     char *cm;
     int x, y;
@@ -3491,7 +3491,7 @@ scroll_region_reset()
  * List of terminal codes that are currently recognized.
  */
 
-struct termcode
+static struct termcode
 {
     char_u  name[2];       /* termcap name of entry */
     char_u  *code;         /* terminal code (in allocated memory) */