Changeset 95f1c95 in clfs-sysroot

Timestamp:

Feb 6, 2007, 12:57:56 PM (18 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

master

Children:

b8f0f75

Parents:

7ea0123

Message:

Update patches.

Location:

patches

Files:

• glibc-2.5-branch_update-3.patch (moved) (moved from patches/glibc-2.5-branch_update-2.patch ) (13 diffs)
• vim-7.0-fixes-22.patch (moved) (moved from patches/vim-7.0-fixes-21.patch ) (168 diffs)

patches/glibc-2.5-branch_update-3.patch

@@ -1 +1 @@
 Submitted By: Jim Gifford <jim at linuxfromscratch dot org>
 Original Submission By: Robert Connolly <robert at linuxfromscratch dot org>
-Date: 2007-01-12
+Date: 2007-01-23
 Initial Package Version: 2.5
 Upstream Status: From Upstream
@@ -13 +13 @@
 diff -Naur glibc-2.5.orig/ChangeLog glibc-2.5/ChangeLog
 --- glibc-2.5.orig/ChangeLog    2006-09-29 11:45:39.000000000 -0700
-+++ glibc-2.5/ChangeLog 2007-01-12 09:20:08.000000000 -0800
-@@ -1,5 +1,283 @@
++++ glibc-2.5/ChangeLog 2007-01-12 10:24:52.000000000 -0800
+@@ -1,5 +1,416 @@
++2007-01-05  Steven Munroe  <sjmunroe@us.ibm.com>
++
++       * stdlib/tst-makecontext.c: Include errno.h.  Change main()
++       to do_test().  Define TEST_FUNCTION. Include test-skeleton.c.
++       (do_test): Check errno and exit(0) if ENOSYS.
++
++2007-01-11  Jakub Jelinek  <jakub@redhat.com>
++
++       * stdlib/strtod_l.c (____STRTOF_INTERNAL): Fix handling of multi-byte
++       thousands separators.
++       * stdlib/Makefile: Add rules to build and run tst-strtod4.
++       * stdlib/tst-strtod4.c: New test.
++
++       [BZ #3855]
++       * stdlib/strtod_l.c (____STRTOF_INTERNAL): 0x. not followed by
++       hexadecimal digit should accept just the initial 0.
++       * stdlib/tst-strtod2.c (tests): New variable.
++       (do_test): Run several tests rather than just one.
++
++2007-01-03  Ulrich Drepper  <drepper@redhat.com>
++
++       * stdlib/Makefile (tst-strtod3-ENV): Define.
++
++2006-12-11  Ulrich Drepper  <drepper@redhat.com>
++
++       * stdlib/strtod_l.c (____STRTOF_INTERNAL): Parse thousand
++       separators also if no non-zero digits found.
++       * stdlib/Makefile (tests): Add tst-strtod3.
++
++2006-12-09  Ulrich Drepper  <drepper@redhat.com>
++
++       [BZ #3664]
++       * stdlib/strtod_l.c (____STRTOF_INTERNAL): Fix test to recognize
++       empty parsed strings.
++       * stdlib/Makefile (tests): Add tst-strtod2.
++       * stdlib/tst-strtod2.c: New file.
++
++       [BZ #3673]
++       * stdlib/strtod_l.c (____STRTOF_INTERNAL): Fix exp_limit
++       computation.
++       * stdlib/Makefile (tests): Add tst-atof2.
++       * stdlib/tst-atof2.c: New file.
++
++       [BZ #3674]
++       * stdlib/strtod_l.c (____STRTOF_INTERNAL): Adjust exponent value
++       correctly if removing trailing zero of hex-float.
++       * stdlib/Makefile (tests): Add tst-atof1.
++       * stdlib/tst-atof1.c: New file.
++
++2007-01-03  Ulrich Drepper  <drepper@redhat.com>
++
++       * string/Makefile (tst-strxfrm2-ENV): Define.
++
++2006-11-10  Jakub Jelinek  <jakub@redhat.com>
++
++       * string/strxfrm_l.c (STRXFRM): Fix trailing \1 optimization
++       if N is one bigger than return value.
++       * string/tst-strxfrm2.c (do_test): Also test strxfrm with l1 + 1
++       and l1 last arguments, if buf is defined, verify the return value
++       equals to strlen (buf) and verify no byte beyond passed length
++       is modified.
++
++2006-11-09  Ulrich Drepper  <drepper@redhat.com>
++
++       * string/Makefile (tests): Add tst-strxfrm2.
++       * string/tst-strxfrm2.c: New file.
++
++2006-11-08  Jakub Jelinek  <jakub@redhat.com>
++
++       * string/strxfrm_l.c (STRXFRM): Do the trailing \1 removal
++       optimization even if needed > n.
++
++2006-12-22  Gavin Romig-Koch  <gavin@redhat.com>
++
++       * nis/nss_compat/compat-grp.c (internal_getgrgid_r): Don't
++       blacklist the group till after we look it up.
++
++2006-12-21  Ulrich Drepper  <drepper@redhat.com>
++
++       * include/atomic.h (atomic_forced_read): New macro.
++
++2006-12-19  Jakub Jelinek  <jakub@redhat.com>
++
++       * nss/getXXbyYY_r.c: Include atomic.h.
++       (INTERNAL (REENTRANT_NAME)): Write startp after start_fct,
++       add atomic_write_barrier () in between.
++
++2006-12-18  Jakub Jelinek  <jakub@redhat.com>
++
++       [BZ #3747]
++       * stdlib/jrand48_r.c (__jrand48_r): Make sure result is in the
++       [-231 .. 231) range.
++       * stdlib/tst-rand48.c (main): Fix expected values for 64-bit
++       targets.
++       * stdlib/tst-rand48-2.c: New test.
++       * stdlib/Makefile (tests): Add tst-rand48-2.
++
++2006-12-14  Jakub Jelinek  <jakub@redhat.com>
++
++       * misc/tst-pselect.c (do_test): Fix sigblock argument.
++
++2006-12-14  Ulrich Drepper  <drepper@redhat.com>
++
++       * misc/tst-pselect.c (do_test): Make sure the helper process is
++       terminating when the test is aborted.
++
++2006-12-13  Ulrich Drepper  <drepper@redhat.com>
++
++       [BZ #2337]
++       * libio/Makefile (tests): Add tst-setvbuf1.
++       * libio/tst-setvbuf1.c: New file.
++
++2006-12-08  Jakub Jelinek  <jakub@redhat.com>
++
++       [BZ #2337]
++       * libio/genops.c (__uflow): Fix a typo.
++       * libio/wfiledoalloc.c (_IO_wfile_doallocate): Don't stat
++       nor set _IO_LINE_BUF bit here.  Size the wide buffer based on
++       the narrow buffer size.
++
++2006-11-24  Jakub Jelinek  <jakub@redhat.com>
++
++       [BZ #2337]
++       * libio/libio.h (_IO_FLAGS2_USER_WBUF): Define.
++       * libio/wgenops.c (_IO_wsetb, _IO_wdefault_finish): Test and set
++       _IO_FLAGS2_USER_WBUF bit in _flags2 instead of _IO_USER_BUF bit
++       in _flags.
++       * libio/wstrops.c (_IO_wstr_overflow, enlarge_userbuf,
++       _IO_wstr_finish): Likewise.
++       * libio/wmemstream.c (open_wmemstream): Likewise.
++       * libio/fileops.c (_IO_new_file_close_it): Call _IO_set[bgp]
++       even for wide streams.
++
 +2006-12-09  Jakub Jelinek  <jakub@redhat.com>
 +
@@ -660 +793 @@
 +  return 0;
 +}
+diff -Naur glibc-2.5.orig/include/atomic.h glibc-2.5/include/atomic.h
+--- glibc-2.5.orig/include/atomic.h     2006-02-17 10:50:09.000000000 -0800
++++ glibc-2.5/include/atomic.h  2007-01-12 09:58:08.000000000 -0800
+@@ -324,6 +324,12 @@
+ #endif
+ 
+ 
++#ifndef atomic_forced_read
++# define atomic_forced_read(x) \
++  ({ __typeof (x) __x; __asm ("" : "=r" (__x) : "0" (x)); __x; })
++#endif
++
++
+ #ifndef atomic_delay
+ # define atomic_delay() do { /* nothing */ } while (0)
+ #endif
 diff -Naur glibc-2.5.orig/include/features.h glibc-2.5/include/features.h
 --- glibc-2.5.orig/include/features.h   2006-04-25 13:34:32.000000000 -0700
@@ -728 +877 @@
  distribute     := ftwtest-sh
  
+diff -Naur glibc-2.5.orig/io/tst-ttyname_r.c glibc-2.5/io/tst-ttyname_r.c
+--- glibc-2.5.orig/io/tst-ttyname_r.c   1969-12-31 16:00:00.000000000 -0800
++++ glibc-2.5/io/tst-ttyname_r.c        2007-01-12 09:27:52.000000000 -0800
+@@ -0,0 +1,42 @@
++#include <errno.h>
++#include <error.h>
++#include <fcntl.h>
++#include <stdio.h>
++#include <unistd.h>
++
++static void do_prepare (void);
++#define PREPARE(argc, argv) do_prepare ()
++static int do_test (void);
++#define TEST_FUNCTION do_test ()
++#include <test-skeleton.c>
++
++static int temp_fd;
++
++static void
++do_prepare (void)
++{
++  char *temp_file;
++  temp_fd = create_temp_file ("tst-ttyname_r.", &temp_file);
++  if (temp_fd == -1)
++    error (1, errno, "cannot create temporary file");
++}
++
++static int
++do_test (void)
++{
++  int ret = 0;
++  char buf[sysconf (_SC_TTY_NAME_MAX) + 1];
++  int res = ttyname_r (-1, buf, sizeof (buf));
++  if (res != EBADF)
++    {
++      printf ("1st ttyname_r returned with res %d\n", res);
++      ret++;
++    }
++  res = ttyname_r (temp_fd, buf, sizeof (buf));
++  if (res != ENOTTY)
++    {
++      printf ("2nd ttyname_r returned with res %d\n", res);
++      ret++;
++    }
++  return ret;
++}
 diff -Naur glibc-2.5.orig/libio/bug-wmemstream1.c glibc-2.5/libio/bug-wmemstream1.c
 --- glibc-2.5.orig/libio/bug-wmemstream1.c      2006-08-14 15:11:34.000000000 -0700
@@ -738 +933 @@
  
  static int
+diff -Naur glibc-2.5.orig/libio/fileops.c glibc-2.5/libio/fileops.c
+--- glibc-2.5.orig/libio/fileops.c      2006-01-18 16:38:35.000000000 -0800
++++ glibc-2.5/libio/fileops.c   2007-01-12 09:25:38.000000000 -0800
+@@ -174,14 +174,8 @@
+   close_status = _IO_SYSCLOSE (fp);
+ 
+   /* Free buffer. */
+-  if (fp->_mode <= 0)
+-    {
+-      INTUSE(_IO_setb) (fp, NULL, NULL, 0);
+-      _IO_setg (fp, NULL, NULL, NULL);
+-      _IO_setp (fp, NULL, NULL);
+-    }
+ #if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T
+-  else
++  if (fp->_mode > 0)
+     {
+       if (_IO_have_wbackup (fp))
+        INTUSE(_IO_free_wbackup_area) (fp);
+@@ -190,6 +184,9 @@
+       _IO_wsetp (fp, NULL, NULL);
+     }
+ #endif
++  INTUSE(_IO_setb) (fp, NULL, NULL, 0);
++  _IO_setg (fp, NULL, NULL, NULL);
++  _IO_setp (fp, NULL, NULL);
+ 
+   INTUSE(_IO_un_link) ((struct _IO_FILE_plus *) fp);
+   fp->_flags = _IO_MAGIC|CLOSED_FILEBUF_FLAGS;
+diff -Naur glibc-2.5.orig/libio/genops.c glibc-2.5/libio/genops.c
+--- glibc-2.5.orig/libio/genops.c       2006-02-28 21:32:48.000000000 -0800
++++ glibc-2.5/libio/genops.c    2007-01-12 09:25:38.000000000 -0800
+@@ -367,7 +367,7 @@
+ #endif
+ 
+   if (fp->_mode == 0)
+-    _IO_fwide (fp, -11);
++    _IO_fwide (fp, -1);
+   if (_IO_in_put_mode (fp))
+     if (INTUSE(_IO_switch_to_get_mode) (fp) == EOF)
+       return EOF;
+diff -Naur glibc-2.5.orig/libio/libio.h glibc-2.5/libio/libio.h
+--- glibc-2.5.orig/libio/libio.h        2006-01-14 04:09:46.000000000 -0800
++++ glibc-2.5/libio/libio.h     2007-01-12 09:25:38.000000000 -0800
+@@ -142,6 +142,7 @@
+ #ifdef _LIBC
+ # define _IO_FLAGS2_FORTIFY 4
+ #endif
++#define _IO_FLAGS2_USER_WBUF 8
+ 
+ /* These are "formatting flags" matching the iostream fmtflags enum values. */
+ #define _IO_SKIPWS 01
+diff -Naur glibc-2.5.orig/libio/Makefile glibc-2.5/libio/Makefile
+--- glibc-2.5.orig/libio/Makefile       2006-08-14 15:12:27.000000000 -0700
++++ glibc-2.5/libio/Makefile    2007-01-12 09:25:38.000000000 -0800
+@@ -57,7 +57,8 @@
+        bug-ungetc2 bug-ftell bug-ungetc3 bug-ungetc4 tst-fopenloc2 \
+        tst-memstream1 tst-memstream2 \
+        tst-wmemstream1 tst-wmemstream2 \
+-       bug-memstream1 bug-wmemstream1
++       bug-memstream1 bug-wmemstream1 \
++       tst-setvbuf1
+ test-srcs = test-freopen
+ 
+ all: # Make this the default target; it will be defined in Rules.
+diff -Naur glibc-2.5.orig/libio/tst-setvbuf1.c glibc-2.5/libio/tst-setvbuf1.c
+--- glibc-2.5.orig/libio/tst-setvbuf1.c 1969-12-31 16:00:00.000000000 -0800
++++ glibc-2.5/libio/tst-setvbuf1.c      2007-01-12 09:25:38.000000000 -0800
+@@ -0,0 +1,39 @@
++/* Dereived from the test case in BZ #2337.  */
++#include <errno.h>
++#include <error.h>
++#include <fcntl.h>
++#include <locale.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <unistd.h>
++#include <wchar.h>
++
++
++static char buf[512] __attribute__ ((aligned (4096)));
++
++
++static int
++do_test (void)
++{
++  setlocale (LC_ALL, "de_DE.UTF-8");
++
++  FILE *fp = fdopen (dup (STDOUT_FILENO), "a");
++  if (fp == NULL)
++    error (EXIT_FAILURE, errno, "fdopen(,\"a\")");
++
++  setvbuf (fp, buf, _IOFBF, sizeof (buf));
++
++  /* fwprintf to unbuffered stream.   */
++  fwprintf (fp, L"hello.\n");
++
++  fclose (fp);
++
++  /* touch my buffer */
++  buf[45] = 'a';
++
++  return 0;
++}
++
++#define TEST_FUNCTION do_test ()
++#include "../test-skeleton.c"
 diff -Naur glibc-2.5.orig/libio/tst-wmemstream1.c glibc-2.5/libio/tst-wmemstream1.c
 --- glibc-2.5.orig/libio/tst-wmemstream1.c      2006-01-11 18:02:27.000000000 -0800
@@ -756 +1059 @@
  #define W(o) L##o
  #define OPEN_MEMSTREAM open_wmemstream
+diff -Naur glibc-2.5.orig/libio/wfiledoalloc.c glibc-2.5/libio/wfiledoalloc.c
+--- glibc-2.5.orig/libio/wfiledoalloc.c 2002-07-05 23:35:54.000000000 -0700
++++ glibc-2.5/libio/wfiledoalloc.c      2007-01-12 09:25:38.000000000 -0800
+@@ -1,4 +1,5 @@
+-/* Copyright (C) 1993, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
++/* Copyright (C) 1993, 1997, 1999, 2000, 2002, 2006
++   Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -85,35 +86,20 @@
+      _IO_FILE *fp;
+ {
+   _IO_size_t size;
+-  int couldbetty;
+   wchar_t *p;
+-  struct _G_stat64 st;
+ 
+   /* Allocate room for the external buffer.  */
+   if (fp->_IO_buf_base == NULL)
+     INTUSE(_IO_file_doallocate) (fp);
+ 
+-  if (fp->_fileno < 0 || _IO_SYSSTAT (fp, &st) < 0)
+-    {
+-      couldbetty = 0;
+-      size = _IO_BUFSIZ;
+-#if 0
+-      /* do not try to optimise fseek() */
+-      fp->_flags |= __SNPT;
+-#endif
+-    }
+-  else
+-    {
+-      couldbetty = S_ISCHR (st.st_mode);
+-#if _IO_HAVE_ST_BLKSIZE
+-      size = st.st_blksize <= 0 ? _IO_BUFSIZ : st.st_blksize;
+-#else
+-      size = _IO_BUFSIZ;
+-#endif
+-    }
++  /* If narrow buffer is user allocated (set by setvbuf etc.),
++     use that size as the size of the wide buffer, when it is
++     allocated by _IO_file_doallocate, multiply that by size
++     of the wide character.  */
++  size = fp->_IO_buf_end - fp->_IO_buf_base;
++  if ((fp->_flags & _IO_USER_BUF))
++    size = (size + sizeof (wchar_t) - 1) / sizeof (wchar_t);
+   ALLOC_WBUF (p, size * sizeof (wchar_t), EOF);
+   INTUSE(_IO_wsetb) (fp, p, p + size, 1);
+-  if (couldbetty && isatty (fp->_fileno))
+-    fp->_flags |= _IO_LINE_BUF;
+   return 1;
+ }
+diff -Naur glibc-2.5.orig/libio/wgenops.c glibc-2.5/libio/wgenops.c
+--- glibc-2.5.orig/libio/wgenops.c      2006-02-12 13:20:57.000000000 -0800
++++ glibc-2.5/libio/wgenops.c   2007-01-12 09:25:38.000000000 -0800
+@@ -115,14 +115,14 @@
+      wchar_t *eb;
+      int a;
+ {
+-  if (f->_wide_data->_IO_buf_base && !(f->_flags & _IO_USER_BUF))
++  if (f->_wide_data->_IO_buf_base && !(f->_flags2 & _IO_FLAGS2_USER_WBUF))
+     FREE_BUF (f->_wide_data->_IO_buf_base, _IO_wblen (f) * sizeof (wchar_t));
+   f->_wide_data->_IO_buf_base = b;
+   f->_wide_data->_IO_buf_end = eb;
+   if (a)
+-    f->_flags &= ~_IO_USER_BUF;
++    f->_flags2 &= ~_IO_FLAGS2_USER_WBUF;
+   else
+-    f->_flags |= _IO_USER_BUF;
++    f->_flags2 |= _IO_FLAGS2_USER_WBUF;
+ }
+ INTDEF(_IO_wsetb)
+ 
+@@ -198,7 +198,7 @@
+      int dummy;
+ {
+   struct _IO_marker *mark;
+-  if (fp->_wide_data->_IO_buf_base && !(fp->_flags & _IO_USER_BUF))
++  if (fp->_wide_data->_IO_buf_base && !(fp->_flags2 & _IO_FLAGS2_USER_WBUF))
+     {
+       FREE_BUF (fp->_wide_data->_IO_buf_base,
+                _IO_wblen (fp) * sizeof (wchar_t));
 diff -Naur glibc-2.5.orig/libio/wmemstream.c glibc-2.5/libio/wmemstream.c
 --- glibc-2.5.orig/libio/wmemstream.c   2006-08-14 15:13:48.000000000 -0700
-+++ glibc-2.5/libio/wmemstream.c        2006-09-29 17:06:33.000000000 -0700
++++ glibc-2.5/libio/wmemstream.c        2007-01-12 09:25:38.000000000 -0800
 @@ -20,6 +20,7 @@
  #include "strfile.h"
@@ -767 +1153 @@
  
  struct _IO_FILE_wmemstream
+@@ -91,7 +92,7 @@
+   _IO_fwide (&new_f->fp._sf._sbf._f, 1);
+   _IO_wstr_init_static (&new_f->fp._sf._sbf._f, buf,
+                        _IO_BUFSIZ / sizeof (wchar_t), buf);
+-  new_f->fp._sf._sbf._f._flags &= ~_IO_USER_BUF;
++  new_f->fp._sf._sbf._f._flags2 &= ~_IO_FLAGS2_USER_WBUF;
+   new_f->fp._sf._s._allocate_buffer = (_IO_alloc_type) malloc;
+   new_f->fp._sf._s._free_buffer = (_IO_free_type) free;
+ 
+diff -Naur glibc-2.5.orig/libio/wstrops.c glibc-2.5/libio/wstrops.c
+--- glibc-2.5.orig/libio/wstrops.c      2006-08-14 15:14:53.000000000 -0700
++++ glibc-2.5/libio/wstrops.c   2007-01-12 09:25:38.000000000 -0800
+@@ -88,7 +88,7 @@
+   pos = fp->_wide_data->_IO_write_ptr - fp->_wide_data->_IO_write_base;
+   if (pos >= (_IO_size_t) (_IO_wblen (fp) + flush_only))
+     {
+-      if (fp->_flags & _IO_USER_BUF) /* not allowed to enlarge */
++      if (fp->_flags2 & _IO_FLAGS2_USER_WBUF) /* not allowed to enlarge */
+        return WEOF;
+       else
+        {
+@@ -182,7 +182,7 @@
+   _IO_ssize_t oldend = wd->_IO_write_end - wd->_IO_write_base;
+ 
+   /* Try to enlarge the buffer.  */
+-  if (fp->_flags & _IO_USER_BUF)
++  if (fp->_flags2 & _IO_FLAGS2_USER_WBUF)
+     /* User-provided buffer.  */
+     return 1;
+ 
+@@ -335,7 +335,7 @@
+      _IO_FILE *fp;
+      int dummy;
+ {
+-  if (fp->_wide_data->_IO_buf_base && !(fp->_flags & _IO_USER_BUF))
++  if (fp->_wide_data->_IO_buf_base && !(fp->_flags2 & _IO_FLAGS2_USER_WBUF))
+     (((_IO_strfile *) fp)->_s._free_buffer) (fp->_wide_data->_IO_buf_base);
+   fp->_wide_data->_IO_buf_base = NULL;
+ 
 diff -Naur glibc-2.5.orig/localedata/ChangeLog glibc-2.5/localedata/ChangeLog
 --- glibc-2.5.orig/localedata/ChangeLog 2006-09-29 11:30:52.000000000 -0700
@@ -1155 +1580 @@
 +  return result;
 +}
+diff -Naur glibc-2.5.orig/misc/tst-pselect.c glibc-2.5/misc/tst-pselect.c
+--- glibc-2.5.orig/misc/tst-pselect.c   2006-01-21 11:58:31.000000000 -0800
++++ glibc-2.5/misc/tst-pselect.c        2007-01-12 09:49:04.000000000 -0800
+@@ -29,7 +29,16 @@
+       return 1;
+     }
+ 
+-  if (sigblock (SIGUSR1) != 0)
++  sa.sa_handler = SIG_IGN;
++  sa.sa_flags = SA_NOCLDWAIT;
++
++  if (sigaction (SIGCHLD, &sa, NULL) != 0)
++    {
++      puts ("2nd sigaction failed");
++      return 1;
++    }
++
++  if (sigblock (sigmask (SIGUSR1)) != 0)
+     {
+       puts ("sigblock failed");
+       return 1;
+@@ -52,6 +61,7 @@
+ 
+   struct timespec to = { .tv_sec = 0, .tv_nsec = 500000000 };
+ 
++  pid_t parent = getpid ();
+   pid_t p = fork ();
+   if (p == 0)
+     {
+@@ -63,6 +73,9 @@
+       int e;
+       do
+        {
++         if (getppid () != parent)
++           exit (2);
++
+          errno = 0;
+          e = pselect (fds[0][0] + 1, &rfds, NULL, NULL, &to, &ss);
+        }
+@@ -108,12 +121,6 @@
+       return 1;
+     }
+ 
+-  if (TEMP_FAILURE_RETRY (waitpid (p, NULL, 0)) != p)
+-    {
+-      puts ("waitpid failed");
+-      return 1;
+-    }
+-
+   return 0;
+ }
+ 
 diff -Naur glibc-2.5.orig/nis/Makefile glibc-2.5/nis/Makefile
 --- glibc-2.5.orig/nis/Makefile 2006-04-13 22:45:49.000000000 -0700
@@ -1314 +1791 @@
  }
  libnsl_hidden_def (nis_list)
+diff -Naur glibc-2.5.orig/nis/nss_compat/compat-grp.c glibc-2.5/nis/nss_compat/compat-grp.c
+--- glibc-2.5.orig/nis/nss_compat/compat-grp.c  2006-07-31 16:33:04.000000000 -0700
++++ glibc-2.5/nis/nss_compat/compat-grp.c       2007-01-12 09:59:51.000000000 -0800
+@@ -580,13 +580,17 @@
+       /* +group */
+       if (result->gr_name[0] == '+' && result->gr_name[1] != '\0')
+        {
++         /* Yes, no +1, see the memcpy call below.  */
++         size_t len = strlen (result->gr_name);
++         char buf[len];
+          enum nss_status status;
+ 
+          /* Store the group in the blacklist for the "+" at the end of
+             /etc/group */
+-         blacklist_store_name (&result->gr_name[1], ent);
++         memcpy (buf, &result->gr_name[1], len);
+          status = getgrnam_plusgroup (&result->gr_name[1], result, ent,
+                                       buffer, buflen, errnop);
++         blacklist_store_name (buf, ent);
+          if (status == NSS_STATUS_SUCCESS && result->gr_gid == gid)
+            break;
+          else
 diff -Naur glibc-2.5.orig/nis/nss_nisplus/nisplus-grp.c glibc-2.5/nis/nss_nisplus/nisplus-grp.c
 --- glibc-2.5.orig/nis/nss_nisplus/nisplus-grp.c        2006-05-20 12:20:19.000000000 -0700
@@ -1603 +2102 @@
    }
  }
+diff -Naur glibc-2.5.orig/nptl/ChangeLog glibc-2.5/nptl/ChangeLog
+--- glibc-2.5.orig/nptl/ChangeLog       2006-09-24 10:14:11.000000000 -0700
++++ glibc-2.5/nptl/ChangeLog    2007-01-12 10:14:34.000000000 -0800
+@@ -1,3 +1,12 @@
++2006-12-28  David S. Miller  <davem@davemloft.net>
++
++       * shlib-versions: Fix sparc64 linux target specification.
++
++2006-12-21  Jakub Jelinek  <jakub@redhat.com>
++
++       * sysdeps/unix/sysv/linux/pthread_kill.c (pthread_kill): Make sure
++       tid isn't reread from pd->tid in between ESRCH test and the syscall.
++
+ 2006-09-24  Ulrich Drepper  <drepper@redhat.com>
+ 
+        [BZ #3251]
+diff -Naur glibc-2.5.orig/nptl/shlib-versions glibc-2.5/nptl/shlib-versions
+--- glibc-2.5.orig/nptl/shlib-versions  2004-07-05 10:03:27.000000000 -0700
++++ glibc-2.5/nptl/shlib-versions       2007-01-12 10:14:34.000000000 -0800
+@@ -1,5 +1,5 @@
+ mips.*-.*-linux.*      libpthread=0            GLIBC_2.0 GLIBC_2.2
+-sparc64-.*-linux.*     libpthread=0            GLIBC_2.2
++sparc64.*-.*-linux.*   libpthread=0            GLIBC_2.2
+ sh.*-.*-linux.*                libpthread=0            GLIBC_2.2
+ ia64.*-.*-linux.*      libpthread=0            GLIBC_2.2
+ hppa.*-.*-linux.*      libpthread=0            GLIBC_2.2
+diff -Naur glibc-2.5.orig/nptl/sysdeps/unix/sysv/linux/pthread_kill.c glibc-2.5/nptl/sysdeps/unix/sysv/linux/pthread_kill.c
+--- glibc-2.5.orig/nptl/sysdeps/unix/sysv/linux/pthread_kill.c  2004-09-28 15:22:37.000000000 -0700
++++ glibc-2.5/nptl/sysdeps/unix/sysv/linux/pthread_kill.c       2007-01-12 09:58:08.000000000 -0800
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
++/* Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
+ 
+@@ -33,7 +33,15 @@
+   struct pthread *pd = (struct pthread *) threadid;
+ 
+   /* Make sure the descriptor is valid.  */
+-  if (INVALID_TD_P (pd))
++  if (DEBUGGING_P && INVALID_TD_P (pd))
++    /* Not a valid thread handle.  */
++    return ESRCH;
++
++  /* Force load of pd->tid into local variable or register.  Otherwise
++     if a thread exits between ESRCH test and tgkill, we might return
++     EINVAL, because pd->tid would be cleared by the kernel.  */
++  pid_t tid = atomic_forced_read (pd->tid);
++  if (__builtin_expect (tid <= 0, 0))
+     /* Not a valid thread handle.  */
+     return ESRCH;
+ 
+@@ -53,15 +61,15 @@
+   int val;
+ #if __ASSUME_TGKILL
+   val = INTERNAL_SYSCALL (tgkill, err, 3, THREAD_GETMEM (THREAD_SELF, pid),
+-                         pd->tid, signo);
++                         tid, signo);
+ #else
+ # ifdef __NR_tgkill
+   val = INTERNAL_SYSCALL (tgkill, err, 3, THREAD_GETMEM (THREAD_SELF, pid),
+-                         pd->tid, signo);
++                         tid, signo);
+   if (INTERNAL_SYSCALL_ERROR_P (val, err)
+       && INTERNAL_SYSCALL_ERRNO (val, err) == ENOSYS)
+ # endif
+-    val = INTERNAL_SYSCALL (tkill, err, 2, pd->tid, signo);
++    val = INTERNAL_SYSCALL (tkill, err, 2, tid, signo);
+ #endif
+ 
+   return (INTERNAL_SYSCALL_ERROR_P (val, err)
 diff -Naur glibc-2.5.orig/nptl_db/ChangeLog glibc-2.5/nptl_db/ChangeLog
 --- glibc-2.5.orig/nptl_db/ChangeLog    2006-02-03 16:48:40.000000000 -0800
@@ -1728 +2298 @@
         }
  
+diff -Naur glibc-2.5.orig/nss/getXXbyYY_r.c glibc-2.5/nss/getXXbyYY_r.c
+--- glibc-2.5.orig/nss/getXXbyYY_r.c    2004-09-16 15:24:09.000000000 -0700
++++ glibc-2.5/nss/getXXbyYY_r.c 2007-01-12 09:53:27.000000000 -0800
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 1996-2002, 2003, 2004 Free Software Foundation, Inc.
++/* Copyright (C) 1996-2002, 2003, 2004, 2006 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
+ 
+@@ -18,6 +18,7 @@
+    02111-1307 USA.  */
+ 
+ #include <assert.h>
++#include <atomic.h>
+ #include <errno.h>
+ #include <stdbool.h>
+ #include "nsswitch.h"
+@@ -173,9 +174,6 @@
+        startp = (service_user *) -1l;
+       else
+        {
+-         startp = nip;
+-         start_fct = fct.l;
+-
+ #ifdef NEED__RES
+          /* The resolver code will really be used so we have to
+             initialize it.  */
+@@ -190,6 +188,11 @@
+          if (!_res_hconf.initialized)
+            _res_hconf_init ();
+ #endif /* need _res_hconf */
++
++         start_fct = fct.l;
++         /* Make sure start_fct is written before startp.  */
++         atomic_write_barrier ();
++         startp = nip;
+        }
+     }
+   else
 diff -Naur glibc-2.5.orig/nss/nss_files/files-alias.c glibc-2.5/nss/nss_files/files-alias.c
 --- glibc-2.5.orig/nss/nss_files/files-alias.c  2002-09-01 05:38:05.000000000 -0700
@@ -45988 +46597 @@
  GNU/Hurd system, using configurations i[34567]86-*-gnu.
  
+diff -Naur glibc-2.5.orig/stdlib/jrand48_r.c glibc-2.5/stdlib/jrand48_r.c
+--- glibc-2.5.orig/stdlib/jrand48_r.c   2001-07-05 21:55:41.000000000 -0700
++++ glibc-2.5/stdlib/jrand48_r.c        2007-01-12 09:52:07.000000000 -0800
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 1995, 1997, 1998, 2001 Free Software Foundation, Inc.
++/* Copyright (C) 1995, 1997, 1998, 2001, 2006 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995.
+ 
+@@ -30,7 +30,7 @@
+     return -1;
+ 
+   /* Store the result.  */
+-  *result = ((xsubi[2] << 16) | xsubi[1]) & 0xffffffffl;
++  *result = (int32_t) ((xsubi[2] << 16) | xsubi[1]);
+ 
+   return 0;
+ }
+diff -Naur glibc-2.5.orig/stdlib/Makefile glibc-2.5/stdlib/Makefile
+--- glibc-2.5.orig/stdlib/Makefile      2006-08-21 14:02:11.000000000 -0700
++++ glibc-2.5/stdlib/Makefile   2007-01-12 10:23:27.000000000 -0800
+@@ -1,4 +1,4 @@
+-# Copyright (C) 1991-2002,2003,2004,2005,2006 Free Software Foundation, Inc.
++# Copyright (C) 1991-2006, 2007 Free Software Foundation, Inc.
+ # This file is part of the GNU C Library.
+ 
+ # The GNU C Library is free software; you can redistribute it and/or
+@@ -66,7 +66,9 @@
+                   test-canon test-canon2 tst-strtoll tst-environ           \
+                   tst-xpg-basename tst-random tst-random2 tst-bsearch      \
+                   tst-limits tst-rand48 bug-strtod tst-setcontext          \
+-                  test-a64l tst-qsort tst-system testmb2 bug-strtod2
++                  test-a64l tst-qsort tst-system testmb2 bug-strtod2       \
++                  tst-atof1 tst-atof2 tst-strtod2 tst-strtod3 tst-rand48-2 \
++                  tst-makecontext tst-strtod4
+ 
+ include ../Makeconfig
+ 
+@@ -115,6 +117,8 @@
+ test-canon-ARGS = --test-dir=${common-objpfx}stdlib
+ 
+ tst-strtod-ENV = LOCPATH=$(common-objpfx)localedata
++tst-strtod3-ENV = LOCPATH=$(common-objpfx)localedata
++tst-strtod4-ENV = LOCPATH=$(common-objpfx)localedata
+ testmb2-ENV = LOCPATH=$(common-objpfx)localedata
+ 
+ # Run a test on the header files we use.
+diff -Naur glibc-2.5.orig/stdlib/strtod_l.c glibc-2.5/stdlib/strtod_l.c
+--- glibc-2.5.orig/stdlib/strtod_l.c    2006-01-14 04:09:09.000000000 -0800
++++ glibc-2.5/stdlib/strtod_l.c 2007-01-12 10:23:27.000000000 -0800
+@@ -1,5 +1,6 @@
+ /* Convert string representing a number to float value, using given locale.
+-   Copyright (C) 1997,1998,2002,2004,2005,2006 Free Software Foundation, Inc.
++   Copyright (C) 1997,1998,2002,2004,2005,2006,2007
++   Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
+ 
+@@ -650,10 +651,11 @@
+          if (c != '0')
+            {
+              for (cnt = 0; thousands[cnt] != '\0'; ++cnt)
+-               if (c != thousands[cnt])
++               if (thousands[cnt] != cp[cnt])
+                  break;
+              if (thousands[cnt] != '\0')
+                break;
++             cp += cnt - 1;
+            }
+          c = *++cp;
+        }
+@@ -662,20 +664,29 @@
+ 
+   /* If no other digit but a '0' is found the result is 0.0.
+      Return current read pointer.  */
+-  if ((c < L_('0') || c > L_('9'))
+-      && (base == 16 && (c < (CHAR_TYPE) TOLOWER (L_('a'))
+-                        || c > (CHAR_TYPE) TOLOWER (L_('f'))))
++  if (!((c >= L_('0') && c <= L_('9'))
++       || (base == 16 && ((CHAR_TYPE) TOLOWER (c) >= L_('a')
++                          && (CHAR_TYPE) TOLOWER (c) <= L_('f')))
++       || (
+ #ifdef USE_WIDE_CHAR
+-      && c != (wint_t) decimal
++           c == (wint_t) decimal
+ #else
+-      && ({ for (cnt = 0; decimal[cnt] != '\0'; ++cnt)
+-             if (decimal[cnt] != cp[cnt])
+-               break;
+-           decimal[cnt] != '\0'; })
+-#endif
+-      && (base == 16 && (cp == start_of_digits
+-                        || (CHAR_TYPE) TOLOWER (c) != L_('p')))
+-      && (base != 16 && (CHAR_TYPE) TOLOWER (c) != L_('e')))
++           ({ for (cnt = 0; decimal[cnt] != '\0'; ++cnt)
++                if (decimal[cnt] != cp[cnt])
++                  break;
++              decimal[cnt] == '\0'; })
++#endif
++           /* '0x.' alone is not a valid hexadecimal number.
++              '.' alone is not valid either, but that has been checked
++              already earlier.  */
++           && (base != 16
++               || cp != start_of_digits
++               || (cp[decimal_len] >= L_('0') && cp[decimal_len] <= L_('9'))
++               || ((CHAR_TYPE) TOLOWER (cp[decimal_len]) >= L_('a')
++                   && (CHAR_TYPE) TOLOWER (cp[decimal_len]) <= L_('f'))))
++       || (base == 16 && (cp != start_of_digits
++                          && (CHAR_TYPE) TOLOWER (c) == L_('p')))
++       || (base != 16 && (CHAR_TYPE) TOLOWER (c) == L_('e'))))
+     {
+ #ifdef USE_WIDE_CHAR
+       tp = __correctly_grouped_prefixwc (start_of_digits, cp, thousands,
+@@ -715,13 +726,14 @@
+                  break;
+              if (thousands[cnt] != '\0')
+                break;
++             cp += cnt - 1;
+            }
+ #endif
+        }
+       c = *++cp;
+     }
+ 
+-  if (grouping && dig_no > 0)
++  if (grouping && cp > start_of_digits)
+     {
+       /* Check the grouping of the digits.  */
+ #ifdef USE_WIDE_CHAR
+@@ -759,13 +771,15 @@
+        }
+     }
+ 
+-  /* We have the number digits in the integer part.  Whether these are all or
+-     any is really a fractional digit will be decided later.  */
++  /* We have the number of digits in the integer part.  Whether these
++     are all or any is really a fractional digit will be decided
++     later.  */
+   int_no = dig_no;
+   lead_zero = int_no == 0 ? -1 : 0;
+ 
+-  /* Read the fractional digits.  A special case are the 'american style'
+-     numbers like `16.' i.e. with decimal but without trailing digits.  */
++  /* Read the fractional digits.  A special case are the 'american
++     style' numbers like `16.' i.e. with decimal point but without
++     trailing digits.  */
+   if (
+ #ifdef USE_WIDE_CHAR
+       c == (wint_t) decimal
+@@ -815,15 +829,16 @@
+          if (base == 16)
+            exp_limit = (exp_negative ?
+                         -MIN_EXP + MANT_DIG + 4 * int_no :
+-                        MAX_EXP - 4 * int_no + lead_zero);
++                        MAX_EXP - 4 * int_no + 4 * lead_zero + 3);
+          else
+            exp_limit = (exp_negative ?
+                         -MIN_10_EXP + MANT_DIG + int_no :
+-                        MAX_10_EXP - int_no + lead_zero);
++                        MAX_10_EXP - int_no + lead_zero + 1);
+ 
+          do
+            {
+              exponent *= 10;
++             exponent += c - L_('0');
+ 
+              if (exponent > exp_limit)
+                /* The exponent is too large/small to represent a valid
+@@ -853,7 +868,6 @@
+                  /* NOTREACHED */
+                }
+ 
+-             exponent += c - L_('0');
+              c = *++cp;
+            }
+          while (c >= L_('0') && c <= L_('9'));
+@@ -888,7 +902,7 @@
+        --expp;
+        --dig_no;
+        --int_no;
+-       ++exponent;
++       exponent += base == 16 ? 4 : 1;
+       }
+     while (dig_no > 0 && exponent < 0);
+ 
+diff -Naur glibc-2.5.orig/stdlib/tst-atof1.c glibc-2.5/stdlib/tst-atof1.c
+--- glibc-2.5.orig/stdlib/tst-atof1.c   1969-12-31 16:00:00.000000000 -0800
++++ glibc-2.5/stdlib/tst-atof1.c        2007-01-12 10:07:19.000000000 -0800
+@@ -0,0 +1,19 @@
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++
++static int
++do_test (void)
++{
++  char buf[100];
++  snprintf (buf, sizeof (buf), "%g", atof ("0x10p-1"));
++  if (strcmp (buf, "8") != 0)
++    {
++      printf ("got \"%s\", expected \"8\"\n", buf);
++      return 1;
++    }
++  return 0;
++}
++
++#define TEST_FUNCTION do_test ()
++#include "../test-skeleton.c"
+diff -Naur glibc-2.5.orig/stdlib/tst-atof2.c glibc-2.5/stdlib/tst-atof2.c
+--- glibc-2.5.orig/stdlib/tst-atof2.c   1969-12-31 16:00:00.000000000 -0800
++++ glibc-2.5/stdlib/tst-atof2.c        2007-01-12 10:07:19.000000000 -0800
+@@ -0,0 +1,55 @@
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++
++
++static const struct
++{
++  const char *str;
++  const char *expected;
++} tests[] =
++  {
++    { "1e308", "1e+308" },
++    { "100000000e300", "1e+308" },
++    { "0x1p1023", "8.98847e+307" },
++    { "0x1000p1011", "8.98847e+307" },
++    { "0x1p1020", "1.12356e+307" },
++    { "0x0.00001p1040", "1.12356e+307" },
++    { "1e-307", "1e-307" },
++    { "0.000001e-301", "1e-307" },
++    { "0.0000001e-300", "1e-307" },
++    { "0.00000001e-299", "1e-307" },
++    { "1000000e-313", "1e-307" },
++    { "10000000e-314", "1e-307" },
++    { "100000000e-315", "1e-307" },
++    { "0x1p-1021", "4.45015e-308" },
++    { "0x1000p-1033", "4.45015e-308" },
++    { "0x10000p-1037", "4.45015e-308" },
++    { "0x0.001p-1009", "4.45015e-308" },
++    { "0x0.0001p-1005", "4.45015e-308" },
++  };
++#define NTESTS (sizeof (tests) / sizeof (tests[0]))
++
++
++static int
++do_test (void)
++{
++  int status = 0;
++
++  for (int i = 0; i < NTESTS; ++i)
++    {
++      char buf[100];
++      snprintf (buf, sizeof (buf), "%g", atof (tests[i].str));
++      if (strcmp (buf, tests[i].expected) != 0)
++       {
++         printf ("%d: got \"%s\", expected \"%s\"\n",
++                 i, buf, tests[i].expected);
++         status = 1;
++       }
++    }
++
++  return status;
++}
++
++#define TEST_FUNCTION do_test ()
++#include "../test-skeleton.c"
+diff -Naur glibc-2.5.orig/stdlib/tst-makecontext.c glibc-2.5/stdlib/tst-makecontext.c
+--- glibc-2.5.orig/stdlib/tst-makecontext.c     1969-12-31 16:00:00.000000000 -0800
++++ glibc-2.5/stdlib/tst-makecontext.c  2007-01-12 10:24:52.000000000 -0800
+@@ -0,0 +1,67 @@
++/* Copyright (C) 2006, 2007 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, write to the Free
++   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++   02111-1307 USA.  */
++
++#include <errno.h>
++#include <stdlib.h>
++#include <stdio.h>
++#include <ucontext.h>
++
++ucontext_t ucp;
++char st1[8192];
++__thread int thr;
++
++void
++cf (int i)
++{
++  if (i != 78 || thr != 94)
++    {
++      printf ("i %d thr %d\n", i, thr);
++      exit (1);
++    }
++  exit (0);
++}
++
++int
++do_test (void)
++{
++  if (getcontext (&ucp) != 0)
++    {
++      if (errno == ENOSYS)
++       {
++         puts ("context handling not supported");
++         return 0;
++       }
++
++      puts ("getcontext failed");
++      return 1;
++    }
++  thr = 94;
++  ucp.uc_link = NULL;
++  ucp.uc_stack.ss_sp = st1;
++  ucp.uc_stack.ss_size = sizeof st1;
++  makecontext (&ucp, (void (*) (void)) cf, 1, 78);
++  if (setcontext (&ucp) != 0)
++    {
++      puts ("setcontext failed");
++      return 1;
++    }
++  return 2;
++}
++
++#define TEST_FUNCTION do_test ()
++#include "../test-skeleton.c"
+diff -Naur glibc-2.5.orig/stdlib/tst-rand48-2.c glibc-2.5/stdlib/tst-rand48-2.c
+--- glibc-2.5.orig/stdlib/tst-rand48-2.c        1969-12-31 16:00:00.000000000 -0800
++++ glibc-2.5/stdlib/tst-rand48-2.c     2007-01-12 09:52:07.000000000 -0800
+@@ -0,0 +1,113 @@
++#include <stdint.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <time.h>
++
++int
++main (void)
++{
++  time_t t = time (NULL);
++  int i, ret = 0;
++  double d;
++  long int l;
++  struct drand48_data data;
++  unsigned short int buf[3];
++
++  srand48 ((long int) t);
++  for (i = 0; i < 50; i++)
++    if ((d = drand48 ()) < 0.0 || d >= 1.0)
++      {
++        printf ("drand48 %d %g\n", i, d);
++        ret = 1;
++      }
++
++  srand48_r ((long int) t, &data);
++  for (i = 0; i < 50; i++)
++    if (drand48_r (&data, &d) != 0 || d < 0.0 || d >= 1.0)
++      {
++        printf ("drand48_r %d %g\n", i, d);
++        ret = 1;
++      }
++
++  buf[2] = (t & 0xffff0000) >> 16; buf[1] = (t & 0xffff); buf[0] = 0x330e;
++  for (i = 0; i < 50; i++)
++    if ((d = erand48 (buf)) < 0.0 || d >= 1.0)
++      {
++        printf ("erand48 %d %g\n", i, d);
++        ret = 1;
++      }
++
++  buf[2] = (t & 0xffff0000) >> 16; buf[1] = (t & 0xffff); buf[0] = 0x330e;
++  for (i = 0; i < 50; i++)
++    if (erand48_r (buf, &data, &d) != 0 || d < 0.0 || d >= 1.0)
++      {
++        printf ("erand48_r %d %g\n", i, d);
++        ret = 1;
++      }
++
++  srand48 ((long int) t);
++  for (i = 0; i < 50; i++)
++    if ((l = lrand48 ()) < 0 || l > INT32_MAX)
++      {
++        printf ("lrand48 %d %ld\n", i, l);
++        ret = 1;
++      }
++
++  srand48_r ((long int) t, &data);
++  for (i = 0; i < 50; i++)
++    if (lrand48_r (&data, &l) != 0 || l < 0 || l > INT32_MAX)
++      {
++        printf ("lrand48_r %d %ld\n", i, l);
++        ret = 1;
++      }
++
++  buf[2] = (t & 0xffff0000) >> 16; buf[1] = (t & 0xffff); buf[0] = 0x330e;
++  for (i = 0; i < 50; i++)
++    if ((l = nrand48 (buf)) < 0 || l > INT32_MAX)
++      {
++        printf ("nrand48 %d %ld\n", i, l);
++        ret = 1;
++      }
++
++  buf[2] = (t & 0xffff0000) >> 16; buf[1] = (t & 0xffff); buf[0] = 0x330e;
++  for (i = 0; i < 50; i++)
++    if (nrand48_r (buf, &data, &l) != 0 || l < 0 || l > INT32_MAX)
++      {
++        printf ("nrand48_r %d %ld\n", i, l);
++        ret = 1;
++      }
++
++  srand48 ((long int) t);
++  for (i = 0; i < 50; i++)
++    if ((l = mrand48 ()) < INT32_MIN || l > INT32_MAX)
++      {
++        printf ("mrand48 %d %ld\n", i, l);
++        ret = 1;
++      }
++
++  srand48_r ((long int) t, &data);
++  for (i = 0; i < 50; i++)
++    if (mrand48_r (&data, &l) != 0 || l < INT32_MIN || l > INT32_MAX)
++      {
++        printf ("mrand48_r %d %ld\n", i, l);
++        ret = 1;
++      }
++
++  buf[2] = (t & 0xffff0000) >> 16; buf[1] = (t & 0xffff); buf[0] = 0x330e;
++  for (i = 0; i < 50; i++)
++    if ((l = jrand48 (buf)) < INT32_MIN || l > INT32_MAX)
++      {
++        printf ("jrand48 %d %ld\n", i, l);
++        ret = 1;
++      }
++
++  buf[2] = (t & 0xffff0000) >> 16; buf[1] = (t & 0xffff); buf[0] = 0x330e;
++  for (i = 0; i < 50; i++)
++    if (jrand48_r (buf, &data, &l) != 0 || l < INT32_MIN || l > INT32_MAX)
++      {
++        printf ("jrand48_r %d %ld\n", i, l);
++        ret = 1;
++      }
++
++  return ret;
++}
+diff -Naur glibc-2.5.orig/stdlib/tst-rand48.c glibc-2.5/stdlib/tst-rand48.c
+--- glibc-2.5.orig/stdlib/tst-rand48.c  2001-01-19 19:32:19.000000000 -0800
++++ glibc-2.5/stdlib/tst-rand48.c       2007-01-12 09:52:07.000000000 -0800
+@@ -44,10 +44,10 @@
+     }
+ 
+   l = mrand48 ();
+-  if (l != 0xa28c1003l)
++  if (l != -0x5d73effdl)
+     {
+       printf ("mrand48() in line %d failed: expected %lx, seen %lx\n",
+-             __LINE__ - 4, 0xa28c1003l, l);
++             __LINE__ - 4, -0x5d73effdl, l);
+       result = 1;
+     }
+ 
+@@ -60,10 +60,10 @@
+     }
+ 
+   l = mrand48 ();
+-  if (l != 0x9e88f474l)
++  if (l != -0x61770b8cl)
+     {
+       printf ("mrand48() in line %d failed: expected %lx, seen %lx\n",
+-             __LINE__ - 4, 0x9e88f474l, l);
++             __LINE__ - 4, -0x61770b8cl, l);
+       result = 1;
+     }
+ 
+@@ -92,10 +92,10 @@
+     }
+ 
+   l = mrand48 ();
+-  if (l != 0xeb7a1fa3l)
++  if (l != -0x1485e05dl)
+     {
+       printf ("mrand48() in line %d failed: expected %lx, seen %lx\n",
+-             __LINE__ - 4, 0xeb7a1fa3l, l);
++             __LINE__ - 4, -0x1485e05dl, l);
+       result = 1;
+     }
+ 
+@@ -171,10 +171,10 @@
+     }
+ 
+   l = mrand48 ();
+-  if (l != 0xa28c1003l)
++  if (l != -0x5d73effdl)
+     {
+       printf ("mrand48() in line %d failed: expected %lx, seen %lx\n",
+-             __LINE__ - 4, 0xa28c1003l, l);
++             __LINE__ - 4, -0x5d73effdl, l);
+       result = 1;
+     }
+ 
+@@ -187,10 +187,10 @@
+     }
+ 
+   l = mrand48 ();
+-  if (l != 0x9e88f474l)
++  if (l != -0x61770b8cl)
+     {
+       printf ("mrand48() in line %d failed: expected %lx, seen %lx\n",
+-             __LINE__ - 4, 0x9e88f474l, l);
++             __LINE__ - 4, -0x61770b8cl, l);
+       result = 1;
+     }
+ 
+@@ -231,10 +231,10 @@
+     }
+ 
+   l = mrand48 ();
+-  if (l != 0xeb7a1fa3l)
++  if (l != -0x1485e05dl)
+     {
+       printf ("mrand48() in line %d failed: expected %lx, seen %lx\n",
+-             __LINE__ - 4, 0xeb7a1fa3l, l);
++             __LINE__ - 4, -0x1485e05dl, l);
+       result = 1;
+     }
+ 
+@@ -287,10 +287,10 @@
+     }
+ 
+   l = jrand48 (xs);
+-  if (l != 0xf568c7a0l)
++  if (l != -0xa973860l)
+     {
+       printf ("jrand48() in line %d failed: expected %lx, seen %lx\n",
+-             __LINE__ - 4, 0xf568c7a0l, l);
++             __LINE__ - 4, -0xa973860l, l);
+       result = 1;
+     }
+ 
+diff -Naur glibc-2.5.orig/stdlib/tst-strtod2.c glibc-2.5/stdlib/tst-strtod2.c
+--- glibc-2.5.orig/stdlib/tst-strtod2.c 1969-12-31 16:00:00.000000000 -0800
++++ glibc-2.5/stdlib/tst-strtod2.c      2007-01-12 10:23:27.000000000 -0800
+@@ -0,0 +1,44 @@
++#include <stdio.h>
++#include <stdlib.h>
++
++struct test
++{
++  const char *str;
++  double result;
++  size_t offset;
++} tests[] =
++{
++  { "0xy", 0.0, 1 },
++  { "0x.y", 0.0, 1 },
++  { "0x0.y", 0.0, 4 },
++  { "0x.0y", 0.0, 4 },
++  { ".y", 0.0, 0 },
++  { "0.y", 0.0, 2 },
++  { ".0y", 0.0, 2 }
++};
++
++static int
++do_test (void)
++{
++  int status = 0;
++  for (size_t i = 0; i < sizeof (tests) / sizeof (tests[0]); ++i)
++    {
++      char *ep;
++      double r = strtod (tests[i].str, &ep);
++      if (r != tests[i].result)
++       {
++         printf ("test %zu r = %g, expect %g\n", i, r, tests[i].result);
++         status = 1;
++       }
++      if (ep != tests[i].str + tests[i].offset)
++       {
++         printf ("test %zu strtod parsed %ju characters, expected %zu\n",
++                 i, ep - tests[i].str, tests[i].offset);
++         status = 1;
++       }
++    }
++  return status;
++}
++
++#define TEST_FUNCTION do_test ()
++#include "../test-skeleton.c"
+diff -Naur glibc-2.5.orig/stdlib/tst-strtod3.c glibc-2.5/stdlib/tst-strtod3.c
+--- glibc-2.5.orig/stdlib/tst-strtod3.c 1969-12-31 16:00:00.000000000 -0800
++++ glibc-2.5/stdlib/tst-strtod3.c      2007-01-12 10:07:19.000000000 -0800
+@@ -0,0 +1,55 @@
++#include <locale.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++
++static const struct
++{
++  const char *in;
++  const char *out;
++  double expected;
++} tests[] =
++  {
++    { "000,,,e1", ",,,e1", 0.0 },
++    { "000e1", "", 0.0 },
++    { "000,1e1", ",1e1", 0.0 }
++  };
++#define NTESTS (sizeof (tests) / sizeof (tests[0]))
++
++
++static int
++do_test (void)
++{
++  if (setlocale (LC_ALL, "en_US.ISO-8859-1") == NULL)
++    {
++      puts ("could not set locale");
++      return 1;
++    }
++
++  int status = 0;
++
++  for (int i = 0; i < NTESTS; ++i)
++    {
++      char *ep;
++      double r = __strtod_internal (tests[i].in, &ep, 1);
++
++      if (strcmp (ep, tests[i].out) != 0)
++       {
++         printf ("%d: got rest string \"%s\", expected \"%s\"\n",
++                 i, ep, tests[i].out);
++         status = 1;
++       }
++
++      if (r != tests[i].expected)
++       {
++         printf ("%d: got wrong results %g, expected %g\n",
++                 i, r, tests[i].expected);
++         status = 1;
++       }
++    }
++
++  return status;
++}
++
++#define TEST_FUNCTION do_test ()
++#include "../test-skeleton.c"
+diff -Naur glibc-2.5.orig/stdlib/tst-strtod4.c glibc-2.5/stdlib/tst-strtod4.c
+--- glibc-2.5.orig/stdlib/tst-strtod4.c 1969-12-31 16:00:00.000000000 -0800
++++ glibc-2.5/stdlib/tst-strtod4.c      2007-01-12 10:23:27.000000000 -0800
+@@ -0,0 +1,56 @@
++#include <locale.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++
++#define NBSP "\xc2\xa0"
++
++static const struct
++{
++  const char *in;
++  const char *out;
++  double expected;
++} tests[] =
++  {
++    { "000"NBSP"000"NBSP"000", "", 0.0 },
++    { "1"NBSP"000"NBSP"000,5x", "x", 1000000.5 }
++  };
++#define NTESTS (sizeof (tests) / sizeof (tests[0]))
++
++
++static int
++do_test (void)
++{
++  if (setlocale (LC_ALL, "cs_CZ.UTF-8") == NULL)
++    {
++      puts ("could not set locale");
++      return 1;
++    }
++
++  int status = 0;
++
++  for (int i = 0; i < NTESTS; ++i)
++    {
++      char *ep;
++      double r = __strtod_internal (tests[i].in, &ep, 1);
++
++      if (strcmp (ep, tests[i].out) != 0)
++       {
++         printf ("%d: got rest string \"%s\", expected \"%s\"\n",
++                 i, ep, tests[i].out);
++         status = 1;
++       }
++
++      if (r != tests[i].expected)
++       {
++         printf ("%d: got wrong results %g, expected %g\n",
++                 i, r, tests[i].expected);
++         status = 1;
++       }
++    }
++
++  return status;
++}
++
++#define TEST_FUNCTION do_test ()
++#include "../test-skeleton.c"
+diff -Naur glibc-2.5.orig/string/Makefile glibc-2.5/string/Makefile
+--- glibc-2.5.orig/string/Makefile      2006-06-04 09:35:25.000000000 -0700
++++ glibc-2.5/string/Makefile   2007-01-12 10:02:24.000000000 -0800
+@@ -1,4 +1,4 @@
+-# Copyright (C) 1991-2002, 2005, 2006 Free Software Foundation, Inc.
++# Copyright (C) 1991-2002, 2005, 2006, 2007 Free Software Foundation, Inc.
+ # This file is part of the GNU C Library.
+ 
+ # The GNU C Library is free software; you can redistribute it and/or
+@@ -54,7 +54,7 @@
+                   bug-strncat1 bug-strspn1 bug-strpbrk1 tst-bswap      \
+                   tst-strtok tst-strxfrm bug-strcoll1 tst-strfry       \
+                   bug-strtok1 $(addprefix test-,$(strop-tests))        \
+-                  bug-envz1
++                  bug-envz1 tst-strxfrm2
+ distribute     := memcopy.h pagecopy.h tst-svc.expect test-string.h
+ 
+ 
+@@ -64,6 +64,7 @@
+ inl-tester-ENV = LANGUAGE=C
+ noinl-tester-ENV = LANGUAGE=C
+ tst-strxfrm-ENV = LOCPATH=$(common-objpfx)localedata
++tst-strxfrm2-ENV = LOCPATH=$(common-objpfx)localedata
+ bug-strcoll1-ENV = LOCPATH=$(common-objpfx)localedata
+ CFLAGS-inl-tester.c = -fno-builtin
+ CFLAGS-noinl-tester.c = -fno-builtin
+diff -Naur glibc-2.5.orig/string/strxfrm_l.c glibc-2.5/string/strxfrm_l.c
+--- glibc-2.5.orig/string/strxfrm_l.c   2005-10-15 13:49:18.000000000 -0700
++++ glibc-2.5/string/strxfrm_l.c        2007-01-12 10:02:24.000000000 -0800
+@@ -1,4 +1,5 @@
+-/* Copyright (C) 1995,96,97,2002, 2004, 2005 Free Software Foundation, Inc.
++/* Copyright (C) 1995, 1996, 1997, 2002, 2004, 2005, 2006
++   Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Written by Ulrich Drepper <drepper@gnu.org>, 1995.
+ 
+@@ -96,6 +97,7 @@
+   const int32_t *indirect;
+   uint_fast32_t pass;
+   size_t needed;
++  size_t last_needed;
+   const USTRING_TYPE *usrc;
+   size_t srclen = STRLEN (src);
+   int32_t *idxarr;
+@@ -197,6 +199,7 @@
+         this is true for all of them.  */
+       int position = rule & sort_position;
+ 
++      last_needed = needed;
+       if (position == 0)
+        {
+          for (idxcnt = 0; idxcnt < idxmax; ++idxcnt)
+@@ -426,11 +429,11 @@
+      a `position' rule at the end and if no non-ignored character
+      is found the last \1 byte is immediately followed by a \0 byte
+      signalling this.  We can avoid the \1 byte(s).  */
+-  if (needed <= n && needed > 2 && dest[needed - 2] == L('\1'))
++  if (needed > 2 && needed == last_needed + 1)
+     {
+       /* Remove the \1 byte.  */
+-      --needed;
+-      dest[needed - 1] = L('\0');
++      if (--needed <= n)
++       dest[needed - 1] = L('\0');
+     }
+ 
+   /* Free the memory if needed.  */
+diff -Naur glibc-2.5.orig/string/tst-strxfrm2.c glibc-2.5/string/tst-strxfrm2.c
+--- glibc-2.5.orig/string/tst-strxfrm2.c        1969-12-31 16:00:00.000000000 -0800
++++ glibc-2.5/string/tst-strxfrm2.c     2007-01-12 10:02:24.000000000 -0800
+@@ -0,0 +1,83 @@
++#include <locale.h>
++#include <stdio.h>
++#include <string.h>
++
++static int
++do_test (void)
++{
++  int res = 0;
++
++  char buf[20];
++  size_t l1 = strxfrm (NULL, "ab", 0);
++  size_t l2 = strxfrm (buf, "ab", 1);
++  size_t l3 = strxfrm (buf, "ab", sizeof (buf));
++  if (l3 < sizeof (buf) && strlen (buf) != l3)
++    {
++      puts ("C locale l3 test failed");
++      res = 1;
++    }
++
++  size_t l4 = strxfrm (buf, "ab", l1 + 1);
++  if (l4 < l1 + 1 && strlen (buf) != l4)
++    {
++      puts ("C locale l4 test failed");
++      res = 1;
++    }
++
++  buf[l1] = 'Z';
++  size_t l5 = strxfrm (buf, "ab", l1);
++  if (buf[l1] != 'Z')
++    {
++      puts ("C locale l5 test failed");
++      res = 1;
++    }
++
++  if (l1 != l2 || l1 != l3 || l1 != l4 || l1 != l5)
++    {
++      puts ("C locale retval test failed");
++      res = 1;
++    }
++
++  if (setlocale (LC_ALL, "de_DE.UTF-8") == NULL)
++    {
++      puts ("setlocale failed");
++      res = 1;
++    }
++  else
++    {
++      l1 = strxfrm (NULL, "ab", 0);
++      l2 = strxfrm (buf, "ab", 1);
++      l3 = strxfrm (buf, "ab", sizeof (buf));
++      if (l3 < sizeof (buf) && strlen (buf) != l3)
++       {
++         puts ("UTF-8 locale l3 test failed");
++         res = 1;
++       }
++
++      l4 = strxfrm (buf, "ab", l1 + 1);
++      if (l4 < l1 + 1 && strlen (buf) != l4)
++       {
++         puts ("UTF-8 locale l4 test failed");
++         res = 1;
++       }
++
++      buf[l1] = 'Z';
++      l5 = strxfrm (buf, "ab", l1);
++      if (buf[l1] != 'Z')
++       {
++         puts ("UTF-8 locale l5 test failed");
++         res = 1;
++       }
++
++      if (l1 != l2 || l1 != l3 || l1 != l4 || l1 != l5)
++       {
++         puts ("UTF-8 locale retval test failed");
++         res = 1;
++       }
++    }
++
++  return res;
++}
++
++#define TEST_FUNCTION do_test ()
++#include "../test-skeleton.c"
 diff -Naur glibc-2.5.orig/sunrpc/Makefile glibc-2.5/sunrpc/Makefile
 --- glibc-2.5.orig/sunrpc/Makefile      2005-06-26 11:24:19.000000000 -0700
@@ -46492 +47971 @@
  #define _PUSHARGS_6    pushl %ebp; cfi_adjust_cfa_offset (4); \
                         cfi_rel_offset (ebp, 0); L(PUSHBP1): _PUSHARGS_5
+diff -Naur glibc-2.5.orig/sysdeps/unix/sysv/linux/powerpc/powerpc32/makecontext.S glibc-2.5/sysdeps/unix/sysv/linux/powerpc/powerpc32/makecontext.S
+--- glibc-2.5.orig/sysdeps/unix/sysv/linux/powerpc/powerpc32/makecontext.S      2006-01-06 19:51:11.000000000 -0800
++++ glibc-2.5/sysdeps/unix/sysv/linux/powerpc/powerpc32/makecontext.S   2007-01-12 09:55:39.000000000 -0800
+@@ -26,9 +26,7 @@
+ 
+ ENTRY(__makecontext)
+        /* Set up the first 7 args to the function in its registers */
+-       addi    r11,r3,_UC_REG_SPACE+12
+-       clrrwi  r11,r11,4
+-       stw     r11,_UC_REGS_PTR(r3)
++       lwz     r11,_UC_REGS_PTR(r3)
+        stw     r6,_UC_GREGS+(PT_R3*4)(r11)
+        stw     r7,_UC_GREGS+(PT_R4*4)(r11)
+        stw     r8,_UC_GREGS+(PT_R5*4)(r11)
+diff -Naur glibc-2.5.orig/sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext.S glibc-2.5/sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext.S
+--- glibc-2.5.orig/sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext.S       2005-12-29 13:03:38.000000000 -0800
++++ glibc-2.5/sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext.S    2007-01-12 09:55:39.000000000 -0800
+@@ -1,5 +1,5 @@
+ /* Jump to a new context.
+-   Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
++   Copyright (C) 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -20,6 +20,7 @@
+ #include <sysdep.h>
+ #include <rtld-global-offsets.h>
+ #include <shlib-compat.h>
++#include <kernel-features.h>
+ 
+ #define __ASSEMBLY__
+ #include <asm/ptrace.h>
 diff -Naur glibc-2.5.orig/sysdeps/unix/sysv/linux/sparc/sparc64/pause.c glibc-2.5/sysdeps/unix/sysv/linux/sparc/sparc64/pause.c
 --- glibc-2.5.orig/sysdeps/unix/sysv/linux/sparc/sparc64/pause.c        2006-08-14 22:27:23.000000000 -0700

patches/vim-7.0-fixes-22.patch

@@ -1 +1 @@
 Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
-Date: 12-05-2006
+Date: 01-23-2007
 Initial Package Version: 7.0
 Origin: Upstream
 Upstream Status: Applied
-Description: Contains all upstream patches up to 7.0.178
+Description: Contains all upstream patches up to 7.0.188
              The following patches were skipped
-             005 027 028 032 045 057 065 074 108 130 131 132 138 156 161 170 171
+             005 027 028 032 045 057 065 074 108 130 131 132 138 156 161 170 171 180
 
 diff -Naur vim70.orig/configure vim70/configure
 --- vim70.orig/configure        2004-07-05 02:02:24.000000000 -0700
-+++ vim70/configure     2006-12-05 19:57:51.000000000 -0800
++++ vim70/configure     2007-01-23 17:14:51.000000000 -0800
 @@ -3,4 +3,4 @@
  # This is just a stub for the Unix configure script, to provide support for
@@ -19 +19 @@
 diff -Naur vim70.orig/runtime/autoload/ccomplete.vim vim70/runtime/autoload/ccomplete.vim
 --- vim70.orig/runtime/autoload/ccomplete.vim   2006-05-03 07:35:56.000000000 -0700
-+++ vim70/runtime/autoload/ccomplete.vim        2006-12-05 19:57:40.000000000 -0800
++++ vim70/runtime/autoload/ccomplete.vim        2007-01-23 17:14:45.000000000 -0800
 @@ -1,7 +1,7 @@
  " Vim completion script
@@ -40 +40 @@
 diff -Naur vim70.orig/runtime/autoload/gzip.vim vim70/runtime/autoload/gzip.vim
 --- vim70.orig/runtime/autoload/gzip.vim        2006-03-31 07:12:15.000000000 -0800
-+++ vim70/runtime/autoload/gzip.vim     2006-12-05 19:58:04.000000000 -0800
++++ vim70/runtime/autoload/gzip.vim     2007-01-23 17:15:02.000000000 -0800
 @@ -1,6 +1,6 @@
  " Vim autoload file for editing compressed files.
@@ -101 +101 @@
 diff -Naur vim70.orig/runtime/autoload/paste.vim vim70/runtime/autoload/paste.vim
 --- vim70.orig/runtime/autoload/paste.vim       2006-04-21 11:31:01.000000000 -0700
-+++ vim70/runtime/autoload/paste.vim    2006-12-05 19:57:46.000000000 -0800
++++ vim70/runtime/autoload/paste.vim    2007-01-23 17:14:49.000000000 -0800
 @@ -1,6 +1,6 @@
  " Vim support file to help with paste mappings and menus
@@ -121 +121 @@
 diff -Naur vim70.orig/runtime/autoload/spellfile.vim vim70/runtime/autoload/spellfile.vim
 --- vim70.orig/runtime/autoload/spellfile.vim   2006-02-01 04:12:24.000000000 -0800
-+++ vim70/runtime/autoload/spellfile.vim        2006-12-05 19:57:58.000000000 -0800
++++ vim70/runtime/autoload/spellfile.vim        2007-01-23 17:14:56.000000000 -0800
 @@ -1,9 +1,9 @@
  " Vim script to download a missing spell file
@@ -175 +175 @@
 +  endif
 +endfunc
+diff -Naur vim70.orig/runtime/doc/autocmd.txt vim70/runtime/doc/autocmd.txt
+--- vim70.orig/runtime/doc/autocmd.txt  2006-05-07 05:16:44.000000000 -0700
++++ vim70/runtime/doc/autocmd.txt       2007-01-23 17:15:23.000000000 -0800
+@@ -1,4 +1,4 @@
+-*autocmd.txt*   For Vim version 7.0.  Last change: 2006 May 06
++*autocmd.txt*   For Vim version 7.0.  Last change: 2007 Jan 16
+ 
+ 
+                  VIM REFERENCE MANUAL    by Bram Moolenaar
+@@ -279,6 +279,7 @@
+ |FuncUndefined|                a user function is used but it isn't defined
+ |SpellFileMissing|     a spell file is used but it can't be found
+ |SourcePre|            before sourcing a Vim script
++|SourceCmd|            before sourcing a Vim script |Cmd-event|
+ 
+ |VimResized|           after the Vim window size changed
+ |FocusGained|          Vim got input focus
+@@ -690,10 +691,17 @@
+                                Can be used to check for any changed files.
+                                                        *SourcePre*
+ SourcePre                      Before sourcing a Vim script. |:source|
++                               <afile> is the name of the file being sourced.
++                                                       *SourceCmd*
++SourceCmd                      When sourcing a Vim script. |:source|
++                               <afile> is the name of the file being sourced.
++                               The autocommand must source this file.
++                               |Cmd-event|
+                                                        *SpellFileMissing*
+ SpellFileMissing               When trying to load a spell checking file and
+-                               it can't be found.  <amatch> is the language,
+-                               'encoding' also matters.  See
++                               it can't be found.  The pattern is matched
++                               against the language.  <amatch> is the
++                               language, 'encoding' also matters.  See
+                                |spell-SpellFileMissing|.
+                                                        *StdinReadPost*
+ StdinReadPost                  After reading from the stdin into the buffer,
+@@ -1219,8 +1227,8 @@
+ 
+                                                        *Cmd-event*
+ When using one of the "*Cmd" events, the matching autocommands are expected to
+-do the file reading or writing.  This can be used when working with a special
+-kind of file, for example on a remote system.
++do the file reading, writing or sourcing.  This can be used when working with
++a special kind of file, for example on a remote system.
+ CAREFUL: If you use these events in a wrong way, it may have the effect of
+ making it impossible to read or write the matching files!  Make sure you test
+ your autocommands properly.  Best is to use a pattern that will never match a
+@@ -1233,9 +1241,10 @@
+ original file isn't needed for recovery.  You might want to do this only when
+ you expect the file to be modified.
+ 
+-The |v:cmdarg| variable holds the "++enc=" and "++ff=" argument that are
+-effective.  These should be used for the command that reads/writes the file.
+-The |v:cmdbang| variable is one when "!" was used, zero otherwise.
++For file read and write commands the |v:cmdarg| variable holds the "++enc="
++and "++ff=" argument that are effective.  These should be used for the command
++that reads/writes the file.  The |v:cmdbang| variable is one when "!" was
++used, zero otherwise.
+ 
+ See the $VIMRUNTIME/plugin/netrw.vim for examples.
+ 
 diff -Naur vim70.orig/runtime/doc/eval.txt vim70/runtime/doc/eval.txt
 --- vim70.orig/runtime/doc/eval.txt     2006-05-07 05:16:44.000000000 -0700
-+++ vim70/runtime/doc/eval.txt  2006-12-05 19:58:10.000000000 -0800
++++ vim70/runtime/doc/eval.txt  2007-01-23 17:15:09.000000000 -0800
 @@ -1,4 +1,4 @@
 -*eval.txt*      For Vim version 7.0.  Last change: 2006 May 06
@@ -257 +319 @@
 diff -Naur vim70.orig/runtime/doc/netbeans.txt vim70/runtime/doc/netbeans.txt
 --- vim70.orig/runtime/doc/netbeans.txt 2006-05-07 05:16:45.000000000 -0700
-+++ vim70/runtime/doc/netbeans.txt      2006-12-05 19:58:11.000000000 -0800
++++ vim70/runtime/doc/netbeans.txt      2007-01-23 17:15:10.000000000 -0800
 @@ -1,4 +1,4 @@
 -*netbeans.txt*  For Vim version 7.0.  Last change: 2006 Mar 09
@@ -293 +355 @@
 diff -Naur vim70.orig/runtime/menu.vim vim70/runtime/menu.vim
 --- vim70.orig/runtime/menu.vim 2006-04-17 06:47:28.000000000 -0700
-+++ vim70/runtime/menu.vim      2006-12-05 19:58:04.000000000 -0800
++++ vim70/runtime/menu.vim      2007-01-23 17:15:02.000000000 -0800
 @@ -2,7 +2,7 @@
  " You can also use this as a start for your own set of menus.
@@ -360 +422 @@
 diff -Naur vim70.orig/runtime/plugin/matchparen.vim vim70/runtime/plugin/matchparen.vim
 --- vim70.orig/runtime/plugin/matchparen.vim    2006-04-27 06:31:26.000000000 -0700
-+++ vim70/runtime/plugin/matchparen.vim 2006-12-05 19:58:01.000000000 -0800
++++ vim70/runtime/plugin/matchparen.vim 2007-01-23 17:15:00.000000000 -0800
 @@ -1,6 +1,6 @@
  " Vim plugin for showing matching parens
@@ -403 +465 @@
 diff -Naur vim70.orig/runtime/scripts.vim vim70/runtime/scripts.vim
 --- vim70.orig/runtime/scripts.vim      2006-03-28 11:30:49.000000000 -0800
-+++ vim70/runtime/scripts.vim   2006-12-05 19:57:51.000000000 -0800
++++ vim70/runtime/scripts.vim   2007-01-23 17:14:51.000000000 -0800
 @@ -1,7 +1,7 @@
  " Vim support file to detect file types in scripts
@@ -428 +490 @@
 diff -Naur vim70.orig/runtime/tutor/Makefile vim70/runtime/tutor/Makefile
 --- vim70.orig/runtime/tutor/Makefile   2004-06-07 07:32:39.000000000 -0700
-+++ vim70/runtime/tutor/Makefile        2006-12-05 19:58:01.000000000 -0800
++++ vim70/runtime/tutor/Makefile        2007-01-23 17:15:00.000000000 -0800
 @@ -2,8 +2,13 @@
  #
@@ -462 +524 @@
 diff -Naur vim70.orig/runtime/tutor/tutor.gr.utf-8 vim70/runtime/tutor/tutor.gr.utf-8
 --- vim70.orig/runtime/tutor/tutor.gr.utf-8     1969-12-31 16:00:00.000000000 -0800
-+++ vim70/runtime/tutor/tutor.gr.utf-8  2006-12-05 19:58:01.000000000 -0800
++++ vim70/runtime/tutor/tutor.gr.utf-8  2007-01-23 17:15:00.000000000 -0800
 @@ -0,0 +1,815 @@
 +===============================================================================
@@ -1495 +1557 @@
 diff -Naur vim70.orig/runtime/tutor/tutor.ru.utf-8 vim70/runtime/tutor/tutor.ru.utf-8
 --- vim70.orig/runtime/tutor/tutor.ru.utf-8     1969-12-31 16:00:00.000000000 -0800
-+++ vim70/runtime/tutor/tutor.ru.utf-8  2006-12-05 19:57:59.000000000 -0800
++++ vim70/runtime/tutor/tutor.ru.utf-8  2007-01-23 17:14:56.000000000 -0800
 @@ -0,0 +1,834 @@
 +===============================================================================
@@ -2416 +2478 @@
 diff -Naur vim70.orig/runtime/tutor/tutor.vim vim70/runtime/tutor/tutor.vim
 --- vim70.orig/runtime/tutor/tutor.vim  2006-03-18 12:20:36.000000000 -0800
-+++ vim70/runtime/tutor/tutor.vim       2006-12-05 19:58:01.000000000 -0800
++++ vim70/runtime/tutor/tutor.vim       2007-01-23 17:15:00.000000000 -0800
 @@ -1,6 +1,6 @@
  " Vim tutor support file
@@ -2468 +2530 @@
 diff -Naur vim70.orig/src/auto/configure vim70/src/auto/configure
 --- vim70.orig/src/auto/configure       2006-05-04 03:46:19.000000000 -0700
-+++ vim70/src/auto/configure    2006-12-05 19:58:07.000000000 -0800
++++ vim70/src/auto/configure    2007-01-23 17:15:06.000000000 -0800
 @@ -4014,7 +4014,7 @@
        LDFLAGS=$ldflags_save
@@ -2509 +2571 @@
 diff -Naur vim70.orig/src/buffer.c vim70/src/buffer.c
 --- vim70.orig/src/buffer.c     2006-04-26 14:37:23.000000000 -0700
-+++ vim70/src/buffer.c  2006-12-05 19:58:11.000000000 -0800
++++ vim70/src/buffer.c  2007-01-23 17:15:10.000000000 -0800
 @@ -434,12 +434,8 @@
      if (usingNetbeans)
@@ -2660 +2722 @@
 diff -Naur vim70.orig/src/configure vim70/src/configure
 --- vim70.orig/src/configure    2006-05-07 07:17:49.000000000 -0700
-+++ vim70/src/configure 2006-12-05 19:57:51.000000000 -0800
++++ vim70/src/configure 2007-01-23 17:14:51.000000000 -0800
 @@ -2,5 +2,9 @@
  # run the automatically generated configure script
@@ -2673 +2735 @@
 diff -Naur vim70.orig/src/configure.in vim70/src/configure.in
 --- vim70.orig/src/configure.in 2006-05-04 03:46:11.000000000 -0700
-+++ vim70/src/configure.in      2006-12-05 19:58:07.000000000 -0800
++++ vim70/src/configure.in      2007-01-23 17:15:06.000000000 -0800
 @@ -508,7 +508,8 @@
        LDFLAGS=$ldflags_save
@@ -2716 +2778 @@
 diff -Naur vim70.orig/src/edit.c vim70/src/edit.c
 --- vim70.orig/src/edit.c       2006-05-07 04:48:51.000000000 -0700
-+++ vim70/src/edit.c    2006-12-05 19:58:11.000000000 -0800
++++ vim70/src/edit.c    2007-01-23 17:15:10.000000000 -0800
 @@ -129,7 +129,7 @@
  
@@ -3337 +3399 @@
 diff -Naur vim70.orig/src/eval.c vim70/src/eval.c
 --- vim70.orig/src/eval.c       2006-05-05 10:15:26.000000000 -0700
-+++ vim70/src/eval.c    2006-12-05 19:58:24.000000000 -0800
++++ vim70/src/eval.c    2007-01-23 17:15:12.000000000 -0800
 @@ -166,7 +166,6 @@
      int                uf_tm_count;    /* nr of calls */
@@ -3399 +3461 @@
  static void copy_tv __ARGS((typval_T *from, typval_T *to));
  static int item_copy __ARGS((typval_T *from, typval_T *to, int deep, int copyID));
-@@ -2260,7 +2262,7 @@
+@@ -896,6 +898,7 @@
+ }
+ 
+ static lval_T  *redir_lval = NULL;
++static garray_T redir_ga;      /* only valid when redir_lval is not NULL */
+ static char_u  *redir_endp = NULL;
+ static char_u  *redir_varname = NULL;
+ 
+@@ -930,6 +933,9 @@
+        return FAIL;
+     }
+ 
++    /* The output is stored in growarray "redir_ga" until redirection ends. */
++    ga_init2(&redir_ga, (int)sizeof(char), 500);
++
+     /* Parse the variable name (can be a dict or list entry). */
+     redir_endp = get_lval(redir_varname, NULL, redir_lval, FALSE, FALSE, FALSE,
+                                                             FNE_CHECK_START);
+@@ -972,42 +978,36 @@
+ }
+ 
+ /*
+- * Append "value[len]" to the variable set by var_redir_start().
++ * Append "value[value_len]" to the variable set by var_redir_start().
++ * The actual appending is postponed until redirection ends, because the value
++ * appended may in fact be the string we write to, changing it may cause freed
++ * memory to be used:
++ *   :redir => foo
++ *   :let foo
++ *   :redir END
+  */
+     void
+-var_redir_str(value, len)
++var_redir_str(value, value_len)
+     char_u     *value;
+-    int                len;
++    int                value_len;
+ {
+-    char_u     *val;
+-    typval_T   tv;
+-    int                save_emsg;
+-    int                err;
++    size_t     len;
+ 
+     if (redir_lval == NULL)
+        return;
+ 
+-    if (len == -1)
+-       /* Append the entire string */
+-       val = vim_strsave(value);
++    if (value_len == -1)
++       len = STRLEN(value);    /* Append the entire string */
+     else
+-       /* Append only the specified number of characters */
+-       val = vim_strnsave(value, len);
+-    if (val == NULL)
+-       return;
++       len = value_len;        /* Append only "value_len" characters */
+ 
+-    tv.v_type = VAR_STRING;
+-    tv.vval.v_string = val;
+-
+-    save_emsg = did_emsg;
+-    did_emsg = FALSE;
+-    set_var_lval(redir_lval, redir_endp, &tv, FALSE, (char_u *)".");
+-    err = did_emsg;
+-    did_emsg |= save_emsg;
+-    if (err)
++    if (ga_grow(&redir_ga, (int)len) == OK)
++    {
++       mch_memmove((char *)redir_ga.ga_data + redir_ga.ga_len, value, len);
++       redir_ga.ga_len += len;
++    }
++    else
+        var_redir_stop();
+-
+-    vim_free(tv.vval.v_string);
+ }
+ 
+ /*
+@@ -1016,8 +1016,19 @@
+     void
+ var_redir_stop()
+ {
++    typval_T   tv;
++
+     if (redir_lval != NULL)
+     {
++       /* Append the trailing NUL. */
++       ga_append(&redir_ga, NUL);
++
++       /* Assign the text to the variable. */
++       tv.v_type = VAR_STRING;
++       tv.vval.v_string = redir_ga.ga_data;
++       set_var_lval(redir_lval, redir_endp, &tv, FALSE, (char_u *)".");
++       vim_free(tv.vval.v_string);
++
+        clear_lval(redir_lval);
+        vim_free(redir_lval);
+        redir_lval = NULL;
+@@ -2260,7 +2271,7 @@
             EMSG(_(e_letunexp));
         else
@@ -3408 +3570 @@
  
             p = get_tv_string_chk(tv);
-@@ -2269,7 +2271,7 @@
+@@ -2269,7 +2280,7 @@
                 s = get_reg_contents(*arg == '@' ? '"' : *arg, TRUE, TRUE);
                 if (s != NULL)
@@ -3417 +3579 @@
                 }
             }
-@@ -2278,7 +2280,7 @@
+@@ -2278,7 +2289,7 @@
                 write_reg_contents(*arg == '@' ? '"' : *arg, p, -1, FALSE);
                 arg_end = arg + 1;
@@ -3426 +3588 @@
      }
  
-@@ -3125,7 +3127,12 @@
+@@ -3125,7 +3136,12 @@
      funcdict_T fudi;
  
@@ -3440 +3602 @@
         return;
  
-@@ -3177,9 +3184,18 @@
+@@ -3177,9 +3193,18 @@
             failed = TRUE;
             break;
@@ -3459 +3621 @@
          * occurred or an exception was thrown but not caught.
          * get_func_tv() returned OK, so that the check for trailing
-@@ -3364,6 +3380,8 @@
+@@ -3364,6 +3389,8 @@
         hi = hash_find(ht, varname);
         if (!HASHITEM_EMPTY(hi))
@@ -3468 +3630 @@
                 return FAIL;
             delete_var(ht, hi);
-@@ -4895,7 +4913,7 @@
+@@ -4895,7 +4922,7 @@
                     {
                         if (list_append_tv(l, &item->li_tv) == FAIL)
@@ -3477 +3639 @@
                         }
                         item = item->li_next;
-@@ -5295,7 +5313,7 @@
+@@ -5295,7 +5322,7 @@
         EMSG2(_("E697: Missing end of List ']': %s"), *arg);
  failret:
@@ -3486 +3648 @@
      }
  
-@@ -5359,8 +5377,8 @@
+@@ -5359,8 +5386,8 @@
  list_unref(l)
      list_T *l;
@@ -3497 +3659 @@
  
  /*
-@@ -5368,14 +5386,12 @@
+@@ -5368,14 +5395,12 @@
   * Ignores the reference count.
   */
@@ -3515 +3677 @@
      if (l->lv_used_prev == NULL)
         first_list = l->lv_used_next;
-@@ -5388,7 +5404,10 @@
+@@ -5388,7 +5413,10 @@
      {
         /* Remove the item before deleting it. */
@@ -3527 +3689 @@
      vim_free(l);
  }
-@@ -5448,6 +5467,8 @@
+@@ -5448,6 +5476,8 @@
  {
      listitem_T *item1, *item2;
@@ -3536 +3698 @@
         return FALSE;
  
-@@ -5484,6 +5505,8 @@
+@@ -5484,6 +5514,8 @@
      dictitem_T *item2;
      int                todo;
@@ -3545 +3707 @@
         return FALSE;
  
-@@ -5516,19 +5539,29 @@
+@@ -5516,19 +5548,29 @@
  {
      char_u     buf1[NUMBUFLEN], buf2[NUMBUFLEN];
@@ -3579 +3741 @@
         case VAR_FUNC:
             return (tv1->vval.v_string != NULL
-@@ -6059,6 +6092,10 @@
+@@ -6059,6 +6101,10 @@
      tabpage_T  *tp;
  #endif
@@ -3590 +3752 @@
       * 1. Go through all accessible variables and mark all lists and dicts
       *    with copyID.
-@@ -6097,7 +6134,10 @@
+@@ -6097,7 +6143,10 @@
      for (dd = first_dict; dd != NULL; )
         if (dd->dv_copyID != copyID)
@@ -3602 +3764 @@
  
             /* restart, next dict may also have been freed */
-@@ -6114,7 +6154,10 @@
+@@ -6114,7 +6163,10 @@
      for (ll = first_list; ll != NULL; )
         if (ll->lv_copyID != copyID && ll->lv_watch == NULL)
@@ -3614 +3776 @@
  
             /* restart, next list may also have been freed */
-@@ -6207,11 +6250,12 @@
+@@ -6207,11 +6259,12 @@
      d = (dict_T *)alloc(sizeof(dict_T));
      if (d != NULL)
@@ -3628 +3790 @@
         hash_init(&d->dv_hashtab);
         d->dv_lock = 0;
-@@ -6229,8 +6273,8 @@
+@@ -6229,8 +6282,8 @@
  dict_unref(d)
      dict_T *d;
@@ -3639 +3801 @@
  
  /*
-@@ -6238,16 +6282,14 @@
+@@ -6238,16 +6291,14 @@
   * Ignores the reference count.
   */
@@ -3659 +3821 @@
      if (d->dv_used_prev == NULL)
         first_dict = d->dv_used_next;
-@@ -6267,7 +6309,10 @@
+@@ -6267,7 +6318,10 @@
              * something recursive causing trouble. */
             di = HI2DI(hi);
@@ -3671 +3833 @@
         }
      }
-@@ -6718,7 +6763,7 @@
+@@ -6718,7 +6772,7 @@
         EMSG2(_("E723: Missing end of Dictionary '}': %s"), *arg);
  failret:
@@ -3680 +3842 @@
      }
  
-@@ -7139,6 +7184,7 @@
+@@ -7139,6 +7193,7 @@
      {"setreg",         2, 3, f_setreg},
      {"settabwinvar",   4, 4, f_settabwinvar},
@@ -3688 +3850 @@
      {"sort",           1, 2, f_sort},
      {"soundfold",      1, 1, f_soundfold},
-@@ -7595,8 +7641,8 @@
+@@ -7595,8 +7650,8 @@
   * Give an error message with a function name.  Handle <SNR> things.
   */
@@ -3699 +3861 @@
  {
      char_u     *p;
-@@ -7605,7 +7651,7 @@
+@@ -7605,7 +7660,7 @@
         p = concat_str((char_u *)"<SNR>", name + 3);
      else
@@ -3708 +3870 @@
         vim_free(p);
  }
-@@ -8252,6 +8298,12 @@
+@@ -8252,6 +8307,12 @@
         EMSG(_("E785: complete() can only be used in Insert mode"));
         return;
@@ -3721 +3883 @@
      {
         EMSG(_(e_invarg));
-@@ -9173,25 +9225,25 @@
+@@ -9173,25 +9234,25 @@
      typval_T   save_key;
      int                rem;
@@ -3751 +3913 @@
      }
  
-@@ -9223,7 +9275,7 @@
+@@ -9223,7 +9284,7 @@
                 {
                     --todo;
@@ -3760 +3922 @@
                     vimvars[VV_KEY].vv_str = vim_strsave(di->di_key);
                     if (filter_map_one(&di->di_tv, expr, map, &rem) == FAIL
-@@ -9242,7 +9294,7 @@
+@@ -9242,7 +9303,7 @@
         {
             for (li = l->lv_first; li != NULL; li = nli)
@@ -3769 +3931 @@
                 nli = li->li_next;
                 if (filter_map_one(&li->li_tv, expr, map, &rem) == FAIL
-@@ -9598,7 +9650,9 @@
+@@ -9598,7 +9659,9 @@
      typval_T   *argvars;
      typval_T   *rettv;
@@ -3780 +3942 @@
  
  /*
-@@ -9792,6 +9846,9 @@
+@@ -9792,6 +9855,9 @@
      varnumber_T                n;
      int                        error = FALSE;
@@ -3790 +3952 @@
      ++allow_keys;
      if (argvars[0].v_type == VAR_UNKNOWN)
-@@ -9809,6 +9866,10 @@
+@@ -9809,6 +9875,10 @@
      --no_mapping;
      --allow_keys;
@@ -3801 +3963 @@
      if (IS_SPECIAL(n) || mod_mask != 0)
      {
-@@ -9837,6 +9898,53 @@
+@@ -9837,6 +9907,53 @@
         temp[i++] = NUL;
         rettv->v_type = VAR_STRING;
@@ -3855 +4017 @@
  }
  
-@@ -10412,20 +10520,14 @@
+@@ -10412,20 +10529,14 @@
  
      if (win != NULL && varname != NULL)
@@ -3882 +4044 @@
         {
             if (*varname == NUL)
-@@ -10438,6 +10540,10 @@
+@@ -10438,6 +10549,10 @@
             if (v != NULL)
                 copy_tv(&v->di_tv, rettv);
@@ -3893 +4055 @@
  
      --emsg_off;
-@@ -11312,14 +11418,19 @@
+@@ -11312,14 +11427,19 @@
  
  static int inputsecret_flag = 0;
@@ -3916 +4078 @@
      char_u     *prompt = get_tv_string_chk(&argvars[0]);
      char_u     *p = NULL;
-@@ -11369,10 +11480,10 @@
+@@ -11369,10 +11489,10 @@
             if (defstr != NULL)
                 stuffReadbuffSpec(defstr);
@@ -3929 +4091 @@
  
                 rettv->vval.v_string = NULL;
-@@ -11404,6 +11515,18 @@
+@@ -11404,6 +11524,18 @@
  }
  
@@ -3948 +4110 @@
   */
      static void
-@@ -11443,7 +11566,7 @@
+@@ -11443,7 +11575,7 @@
      }
      else
@@ -3957 +4119 @@
  
  /*
-@@ -11471,6 +11594,7 @@
+@@ -11471,6 +11603,7 @@
      }
  
@@ -3965 +4127 @@
      msg_scroll = TRUE;
      msg_clr_eos();
-@@ -13250,7 +13374,7 @@
+@@ -13250,7 +13383,7 @@
         if (argvars[2].v_type != VAR_UNKNOWN)
             EMSG2(_(e_toomanyarg), "remove()");
@@ -3974 +4136 @@
             key = get_tv_string_chk(&argvars[1]);
             if (key != NULL)
-@@ -13270,7 +13394,7 @@
+@@ -13270,7 +13403,7 @@
      else if (argvars[0].v_type != VAR_LIST)
         EMSG2(_(e_listdictarg), "remove()");
@@ -3983 +4145 @@
         int         error = FALSE;
  
-@@ -14157,11 +14281,7 @@
+@@ -14157,11 +14290,7 @@
      typval_T   *rettv;
  {
@@ -3995 +4157 @@
      typval_T   *varp;
      char_u     nbuf[NUMBUFLEN];
-@@ -14178,12 +14298,7 @@
+@@ -14178,12 +14307,7 @@
      if (buf != NULL && varname != NULL && varp != NULL)
      {
@@ -4008 +4170 @@
         if (*varname == '&')
         {
-@@ -14210,11 +14325,7 @@
+@@ -14210,11 +14334,7 @@
         }
  
@@ -4020 +4182 @@
  }
  
-@@ -14582,6 +14693,18 @@
+@@ -14582,6 +14702,18 @@
  }
  
@@ -4039 +4201 @@
   */
      static void
-@@ -15950,6 +16073,10 @@
+@@ -15950,6 +16082,10 @@
         }
      }
@@ -4050 +4212 @@
  }
  
-@@ -16173,7 +16300,7 @@
+@@ -16173,7 +16309,7 @@
         curwin->w_curswant = get_dict_number(dict, (char_u *)"curswant");
         curwin->w_set_curswant = FALSE;
@@ -4059 +4221 @@
         curwin->w_topfill = get_dict_number(dict, (char_u *)"topfill");
  #endif
-@@ -16218,6 +16345,7 @@
+@@ -16218,6 +16354,7 @@
  #ifdef FEAT_VIRTUALEDIT
      dict_add_nr_str(dict, "coladd", (long)curwin->w_cursor.coladd, NULL);
@@ -4067 +4229 @@
  
      dict_add_nr_str(dict, "topline", (long)curwin->w_topline, NULL);
-@@ -16438,9 +16566,12 @@
+@@ -16438,9 +16575,12 @@
      long       i = 0;
      long       n;
@@ -4083 +4245 @@
  
      if (fnump != NULL)
-@@ -16466,8 +16597,9 @@
+@@ -16466,8 +16606,9 @@
  #ifdef FEAT_VIRTUALEDIT
      n = list_find_nr(l, i, NULL);
@@ -4095 +4257 @@
  
      return OK;
-@@ -17759,6 +17891,13 @@
+@@ -17759,6 +17900,13 @@
      }
      else                   /* add a new variable */
@@ -4109 +4271 @@
         for (p = varname; *p != NUL; ++p)
             if (!eval_isnamec1(*p) && (p == varname || !VIM_ISDIGIT(*p))
-@@ -17792,7 +17931,7 @@
+@@ -17792,7 +17940,7 @@
  }
  
@@ -4118 +4280 @@
   */
      static int
-@@ -17814,6 +17953,23 @@
+@@ -17814,6 +17962,23 @@
  }
  
@@ -4142 +4304 @@
   * Also give an error message, using "name".
   */
-@@ -18396,12 +18552,14 @@
+@@ -18396,12 +18561,14 @@
  
      if (!eap->skip)
@@ -4159 +4321 @@
             if (*arg == K_SPECIAL)
                 j = 3;
-@@ -18786,6 +18944,7 @@
+@@ -18786,6 +18953,7 @@
                 if (dict_add(fudi.fd_dict, fudi.fd_di) == FAIL)
                 {
@@ -4167 +4329 @@
                 }
             }
-@@ -18963,7 +19122,8 @@
+@@ -18963,7 +19131,8 @@
      else if (lead > 0)
      {
@@ -4177 +4339 @@
             /* It's "s:" or "<SID>" */
             if (current_SID <= 0)
-@@ -19618,6 +19778,7 @@
+@@ -19618,6 +19787,7 @@
      char_u     *name;
  #ifdef FEAT_PROFILE
@@ -4185 +4347 @@
  
      /* If depth of calling is getting too high, don't execute the function */
-@@ -19685,6 +19846,7 @@
+@@ -19685,6 +19855,7 @@
      v->di_tv.vval.v_list = &fc.l_varlist;
      vim_memset(&fc.l_varlist, 0, sizeof(list_T));
@@ -4193 +4355 @@
      /*
       * Set a:firstline to "firstline" and a:lastline to "lastline".
-@@ -19761,7 +19923,7 @@
+@@ -19761,7 +19932,7 @@
             if (p_verbose >= 14)
             {
@@ -4202 +4364 @@
  
                 msg_puts((char_u *)"(");
-@@ -19773,8 +19935,8 @@
+@@ -19773,8 +19944,8 @@
                         msg_outnum((long)argvars[i].vval.v_number);
                     else
@@ -4213 +4375 @@
                         vim_free(tofree);
                     }
-@@ -19796,7 +19958,7 @@
+@@ -19796,7 +19967,7 @@
                        || (fc.caller != NULL && &fc.caller->func->uf_profiling))
         {
@@ -4222 +4384 @@
         }
         script_prof_save(&wait_start);
-@@ -19826,14 +19988,14 @@
+@@ -19826,14 +19997,14 @@
      if (do_profiling == PROF_YES && (fp->uf_profiling
                     || (fc.caller != NULL && &fc.caller->func->uf_profiling)))
@@ -4243 +4405 @@
      }
  #endif
-@@ -19852,13 +20014,13 @@
+@@ -19852,13 +20023,13 @@
         else
         {
@@ -4261 +4423 @@
 diff -Naur vim70.orig/src/ex_cmds2.c vim70/src/ex_cmds2.c
 --- vim70.orig/src/ex_cmds2.c   2006-04-17 03:19:07.000000000 -0700
-+++ vim70/src/ex_cmds2.c        2006-12-05 19:57:56.000000000 -0800
-@@ -3648,13 +3648,13 @@
++++ vim70/src/ex_cmds2.c        2007-01-23 17:15:23.000000000 -0800
+@@ -2811,6 +2811,17 @@
+     }
+ 
+ #ifdef FEAT_AUTOCMD
++    /* Apply SourceCmd autocommands, they should get the file and source it. */
++    if (has_autocmd(EVENT_SOURCECMD, fname_exp, NULL)
++           && apply_autocmds(EVENT_SOURCECMD, fname_exp, fname_exp,
++                                                              FALSE, curbuf))
++# ifdef FEAT_EVAL
++       return aborting() ? FAIL : OK;
++# else
++       return OK;
++# endif
++
++    /* Apply SourcePre autocommands, they may get the file. */
+     apply_autocmds(EVENT_SOURCEPRE, fname_exp, fname_exp, FALSE, curbuf);
+ #endif
+ 
+@@ -3648,13 +3659,13 @@
   * Return FALSE when not sourcing a file.
   */
@@ -4282 +4462 @@
 diff -Naur vim70.orig/src/ex_cmds.c vim70/src/ex_cmds.c
 --- vim70.orig/src/ex_cmds.c    2006-04-22 11:56:56.000000000 -0700
-+++ vim70/src/ex_cmds.c 2006-12-05 19:58:00.000000000 -0800
++++ vim70/src/ex_cmds.c 2007-01-23 17:14:59.000000000 -0800
 @@ -95,7 +95,10 @@
                 _("<%s>%s%s  %d,  Hex %02x,  Octal %03o"),
@@ -4393 +4573 @@
 diff -Naur vim70.orig/src/ex_cmds.h vim70/src/ex_cmds.h
 --- vim70.orig/src/ex_cmds.h    2006-04-07 02:44:46.000000000 -0700
-+++ vim70/src/ex_cmds.h 2006-12-05 19:57:46.000000000 -0800
++++ vim70/src/ex_cmds.h 2007-01-23 17:14:49.000000000 -0800
 @@ -262,7 +262,7 @@
  EX(CMD_comclear,       "comclear",     ex_comclear,
@@ -4405 +4585 @@
 diff -Naur vim70.orig/src/ex_docmd.c vim70/src/ex_docmd.c
 --- vim70.orig/src/ex_docmd.c   2006-05-05 09:33:19.000000000 -0700
-+++ vim70/src/ex_docmd.c        2006-12-05 19:58:21.000000000 -0800
++++ vim70/src/ex_docmd.c        2007-01-23 17:15:11.000000000 -0800
 @@ -58,9 +58,9 @@
  #endif
@@ -4868 +5048 @@
 diff -Naur vim70.orig/src/ex_eval.c vim70/src/ex_eval.c
 --- vim70.orig/src/ex_eval.c    2006-04-22 12:22:27.000000000 -0700
-+++ vim70/src/ex_eval.c 2006-12-05 19:58:21.000000000 -0800
++++ vim70/src/ex_eval.c 2007-01-23 17:15:11.000000000 -0800
 @@ -340,7 +340,7 @@
  
@@ -4894 +5074 @@
 diff -Naur vim70.orig/src/ex_getln.c vim70/src/ex_getln.c
 --- vim70.orig/src/ex_getln.c   2006-04-30 08:32:01.000000000 -0700
-+++ vim70/src/ex_getln.c        2006-12-05 19:58:12.000000000 -0800
++++ vim70/src/ex_getln.c        2007-01-23 17:15:10.000000000 -0800
 @@ -34,7 +34,7 @@
      int                xp_context;     /* type of expansion */
@@ -5044 +5224 @@
 diff -Naur vim70.orig/src/fileio.c vim70/src/fileio.c
 --- vim70.orig/src/fileio.c     2006-04-30 08:28:57.000000000 -0700
-+++ vim70/src/fileio.c  2006-12-05 19:58:02.000000000 -0800
++++ vim70/src/fileio.c  2007-01-23 17:15:23.000000000 -0800
 @@ -316,6 +316,9 @@
       * display the line. */
@@ -5055 +5235 @@
       * For Unix: Use the short file name whenever possible.
       * Avoids problems with networks and when directory names are changed.
+@@ -6151,8 +6154,8 @@
+     if (retval != FAIL)
+     {
+        curbuf = frombuf;
+-       while (!bufempty())
+-           if (ml_delete(curbuf->b_ml.ml_line_count, FALSE) == FAIL)
++       for (lnum = curbuf->b_ml.ml_line_count; lnum > 0; --lnum)
++           if (ml_delete(lnum, FALSE) == FAIL)
+            {
+                /* Oops!  We could try putting back the saved lines, but that
+                 * might fail again... */
 @@ -6450,17 +6453,10 @@
      int                old_ro = buf->b_p_ro;
@@ -5096 +5287 @@
      {"InsertEnter",    EVENT_INSERTENTER},
      {"InsertLeave",    EVENT_INSERTLEAVE},
-@@ -8088,6 +8080,7 @@
+@@ -7003,6 +6995,7 @@
+     {"ShellCmdPost",   EVENT_SHELLCMDPOST},
+     {"ShellFilterPost",        EVENT_SHELLFILTERPOST},
+     {"SourcePre",      EVENT_SOURCEPRE},
++    {"SourceCmd",      EVENT_SOURCECMD},
+     {"SpellFileMissing",EVENT_SPELLFILEMISSING},
+     {"StdinReadPost",  EVENT_STDINREADPOST},
+     {"StdinReadPre",   EVENT_STDINREADPRE},
+@@ -8088,6 +8081,7 @@
   * Search a window for the current buffer.  Save the cursor position and
   * screen offset.
@@ -5104 +5303 @@
      void
  aucmd_prepbuf(aco, buf)
-@@ -8151,6 +8144,7 @@
+@@ -8151,6 +8145,7 @@
  /*
   * Cleanup after executing autocommands for a (hidden) buffer.
@@ -5112 +5311 @@
      void
  aucmd_restbuf(aco)
-@@ -8295,7 +8289,11 @@
+@@ -8295,7 +8290,11 @@
  {
      int                state;
@@ -5125 +5324 @@
         state = get_real_state();
         if (state == NORMAL_BUSY || (state & INSERT) != 0)
-@@ -9063,8 +9061,38 @@
+@@ -9063,8 +9062,38 @@
      return retval;
  }
@@ -5166 +5365 @@
 diff -Naur vim70.orig/src/fold.c vim70/src/fold.c
 --- vim70.orig/src/fold.c       2006-04-22 12:35:56.000000000 -0700
-+++ vim70/src/fold.c    2006-12-05 19:58:10.000000000 -0800
++++ vim70/src/fold.c    2007-01-23 17:15:09.000000000 -0800
 @@ -2971,7 +2971,11 @@
      else
@@ -5181 +5380 @@
 diff -Naur vim70.orig/src/getchar.c vim70/src/getchar.c
 --- vim70.orig/src/getchar.c    2006-05-03 10:29:21.000000000 -0700
-+++ vim70/src/getchar.c 2006-12-05 19:58:33.000000000 -0800
++++ vim70/src/getchar.c 2007-01-23 17:15:12.000000000 -0800
 @@ -76,7 +76,7 @@
   */
@@ -5316 +5515 @@
 diff -Naur vim70.orig/src/globals.h vim70/src/globals.h
 --- vim70.orig/src/globals.h    2006-04-30 06:16:23.000000000 -0700
-+++ vim70/src/globals.h 2006-12-05 19:58:06.000000000 -0800
++++ vim70/src/globals.h 2007-01-23 17:15:05.000000000 -0800
 @@ -166,6 +166,7 @@
  EXTERN int     emsg_off INIT(= 0);         /* don't display errors for now,
@@ -5356 +5555 @@
 diff -Naur vim70.orig/src/gui_at_fs.c vim70/src/gui_at_fs.c
 --- vim70.orig/src/gui_at_fs.c  2005-07-09 04:30:17.000000000 -0700
-+++ vim70/src/gui_at_fs.c       2006-12-05 19:57:43.000000000 -0800
++++ vim70/src/gui_at_fs.c       2007-01-23 17:14:47.000000000 -0800
 @@ -1861,27 +1861,27 @@
      XtPointer  pnew;
@@ -5472 +5671 @@
 diff -Naur vim70.orig/src/gui_beval.c vim70/src/gui_beval.c
 --- vim70.orig/src/gui_beval.c  2006-05-04 12:29:51.000000000 -0700
-+++ vim70/src/gui_beval.c       2006-12-05 19:57:56.000000000 -0800
++++ vim70/src/gui_beval.c       2007-01-23 17:14:55.000000000 -0800
 @@ -926,7 +926,7 @@
  #  define IS_NONPRINTABLE(c) (((c) < 0x20 && (c) != TAB && (c) != NL) \
@@ -5511 +5710 @@
 diff -Naur vim70.orig/src/gui.c vim70/src/gui.c
 --- vim70.orig/src/gui.c        2006-05-03 04:00:59.000000000 -0700
-+++ vim70/src/gui.c     2006-12-05 19:58:06.000000000 -0800
++++ vim70/src/gui.c     2007-01-23 17:15:05.000000000 -0800
 @@ -187,9 +187,10 @@
  #endif
@@ -5614 +5813 @@
 diff -Naur vim70.orig/src/gui_gtk.c vim70/src/gui_gtk.c
 --- vim70.orig/src/gui_gtk.c    2006-05-05 04:52:52.000000000 -0700
-+++ vim70/src/gui_gtk.c 2006-12-05 19:58:10.000000000 -0800
++++ vim70/src/gui_gtk.c 2007-01-23 17:15:08.000000000 -0800
 @@ -957,15 +957,15 @@
  get_menu_position(vimmenu_T *menu)
@@ -5712 +5911 @@
 diff -Naur vim70.orig/src/gui_gtk_x11.c vim70/src/gui_gtk_x11.c
 --- vim70.orig/src/gui_gtk_x11.c        2006-05-04 23:58:59.000000000 -0700
-+++ vim70/src/gui_gtk_x11.c     2006-12-05 19:57:56.000000000 -0800
++++ vim70/src/gui_gtk_x11.c     2007-01-23 17:14:55.000000000 -0800
 @@ -3233,12 +3233,12 @@
  on_select_tab(
@@ -5777 +5976 @@
 diff -Naur vim70.orig/src/gui_xmebw.c vim70/src/gui_xmebw.c
 --- vim70.orig/src/gui_xmebw.c  2006-04-30 08:32:32.000000000 -0700
-+++ vim70/src/gui_xmebw.c       2006-12-05 19:58:10.000000000 -0800
++++ vim70/src/gui_xmebw.c       2007-01-23 17:15:08.000000000 -0800
 @@ -47,13 +47,13 @@
  #include "gui_xmebwp.h"
@@ -5906 +6105 @@
 diff -Naur vim70.orig/src/hardcopy.c vim70/src/hardcopy.c
 --- vim70.orig/src/hardcopy.c   2006-05-04 03:09:58.000000000 -0700
-+++ vim70/src/hardcopy.c        2006-12-05 19:57:56.000000000 -0800
++++ vim70/src/hardcopy.c        2007-01-23 17:14:55.000000000 -0800
 @@ -1794,29 +1794,27 @@
      static int
@@ -6009 +6208 @@
 diff -Naur vim70.orig/src/if_cscope.c vim70/src/if_cscope.c
 --- vim70.orig/src/if_cscope.c  2006-04-18 01:54:15.000000000 -0700
-+++ vim70/src/if_cscope.c       2006-12-05 19:58:12.000000000 -0800
-@@ -989,8 +989,7 @@
++++ vim70/src/if_cscope.c       2007-01-23 17:15:15.000000000 -0800
+@@ -627,10 +627,11 @@
+         * If the database is out of date, or there's some other problem,
+         * cscope will output error messages before the number-of-lines output.
+         * Display/discard any output that doesn't match what we want.
++        * Accept "\S*cscope: X lines", also matches "mlcscope".
+         */
+        if ((stok = strtok(buf, (const char *)" ")) == NULL)
+            continue;
+-       if (strcmp((const char *)stok, "cscope:"))
++       if (strstr((const char *)stok, "cscope:") == NULL)
+            continue;
+ 
+        if ((stok = strtok(NULL, (const char *)" ")) == NULL)
+@@ -989,8 +990,7 @@
  {
      int i;
@@ -6020 +6232 @@
      char cmdletter;
      char *qfpos;
-@@ -1009,7 +1008,7 @@
+@@ -1009,7 +1009,7 @@
      totmatches = 0;
      for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
@@ -6029 +6241 @@
  
         /* send cmd to cscope */
-@@ -1101,38 +1100,44 @@
+@@ -1101,38 +1101,44 @@
      if (qfpos != NULL && *qfpos != '0' && totmatches > 0)
      {
@@ -6096 +6308 @@
         mch_remove(tmp);
         vim_free(tmp);
-@@ -1141,6 +1146,9 @@
+@@ -1141,6 +1147,9 @@
      else
  #endif /* FEAT_QUICKFIX */
@@ -6106 +6318 @@
         cs_fill_results((char *)pat, totmatches, nummatches, &matches,
                                                          &contexts, &matched);
-@@ -1721,7 +1729,7 @@
+@@ -1721,7 +1730,7 @@
                continue;
  
@@ -6115 +6327 @@
  
            if (strcmp(cntx, "<global>")==0)
-@@ -1729,7 +1737,7 @@
+@@ -1729,7 +1738,7 @@
            else
                sprintf(context, "<<%s>>", cntx);
@@ -6126 +6338 @@
 diff -Naur vim70.orig/src/if_perl.xs vim70/src/if_perl.xs
 --- vim70.orig/src/if_perl.xs   2006-03-06 10:57:16.000000000 -0800
-+++ vim70/src/if_perl.xs        2006-12-05 19:57:54.000000000 -0800
++++ vim70/src/if_perl.xs        2007-01-23 17:14:52.000000000 -0800
 @@ -155,8 +155,8 @@
  static int (*perl_run)(PerlInterpreter*);
@@ -6241 +6453 @@
 diff -Naur vim70.orig/src/if_python.c vim70/src/if_python.c
 --- vim70.orig/src/if_python.c  2006-04-30 08:31:36.000000000 -0700
-+++ vim70/src/if_python.c       2006-12-05 19:58:04.000000000 -0800
++++ vim70/src/if_python.c       2007-01-23 17:15:02.000000000 -0800
 @@ -1463,7 +1463,7 @@
      if (this->buf && this->buf != INVALID_BUFFER_VALUE)
@@ -6280 +6492 @@
 diff -Naur vim70.orig/src/if_ruby.c vim70/src/if_ruby.c
 --- vim70.orig/src/if_ruby.c    2006-04-30 08:37:52.000000000 -0700
-+++ vim70/src/if_ruby.c 2006-12-05 19:57:54.000000000 -0800
++++ vim70/src/if_ruby.c 2007-01-23 17:14:52.000000000 -0800
 @@ -643,11 +643,14 @@
  
@@ -6395 +6607 @@
 diff -Naur vim70.orig/src/macros.h vim70/src/macros.h
 --- vim70.orig/src/macros.h     2006-03-01 04:01:10.000000000 -0800
-+++ vim70/src/macros.h  2006-12-05 19:58:00.000000000 -0800
++++ vim70/src/macros.h  2007-01-23 17:14:57.000000000 -0800
 @@ -276,3 +276,9 @@
  # define MB_CHARLEN(p)         STRLEN(p)
@@ -6408 +6620 @@
 diff -Naur vim70.orig/src/main.c vim70/src/main.c
 --- vim70.orig/src/main.c       2006-05-03 10:36:44.000000000 -0700
-+++ vim70/src/main.c    2006-12-05 19:58:11.000000000 -0800
++++ vim70/src/main.c    2007-01-23 17:15:10.000000000 -0800
 @@ -564,7 +564,11 @@
       */
@@ -6602 +6814 @@
 diff -Naur vim70.orig/src/Makefile vim70/src/Makefile
 --- vim70.orig/src/Makefile     2006-05-07 06:25:27.000000000 -0700
-+++ vim70/src/Makefile  2006-12-05 19:57:59.000000000 -0800
++++ vim70/src/Makefile  2007-01-23 17:14:56.000000000 -0800
 @@ -2177,6 +2177,7 @@
         cd $(SHADOWDIR)/xxd; ln -s ../../xxd/*.[ch] ../../xxd/Make* .
@@ -6622 +6834 @@
 diff -Naur vim70.orig/src/mbyte.c vim70/src/mbyte.c
 --- vim70.orig/src/mbyte.c      2006-04-30 04:51:01.000000000 -0700
-+++ vim70/src/mbyte.c   2006-12-05 19:58:39.000000000 -0800
++++ vim70/src/mbyte.c   2007-01-23 17:15:12.000000000 -0800
 @@ -311,7 +311,11 @@
  
@@ -6719 +6931 @@
 diff -Naur vim70.orig/src/memfile.c vim70/src/memfile.c
 --- vim70.orig/src/memfile.c    2006-03-06 00:59:15.000000000 -0800
-+++ vim70/src/memfile.c 2006-12-05 19:58:11.000000000 -0800
++++ vim70/src/memfile.c 2007-01-23 17:15:10.000000000 -0800
 @@ -517,7 +517,7 @@
         mf_ins_free(mfp, hp);   /* put *hp in the free list */
@@ -6776 +6988 @@
 diff -Naur vim70.orig/src/memline.c vim70/src/memline.c
 --- vim70.orig/src/memline.c    2006-04-20 14:00:21.000000000 -0700
-+++ vim70/src/memline.c 2006-12-05 19:58:12.000000000 -0800
++++ vim70/src/memline.c 2007-01-23 17:15:12.000000000 -0800
 @@ -215,7 +215,7 @@
  #define ML_FLUSH       0x02        /* flush locked block */
@@ -6807 +7019 @@
         else
             set_b0_dir_flag(b0p, buf);
-@@ -1325,6 +1325,7 @@
+@@ -1325,7 +1325,11 @@
             mf_put(mfp, hp, FALSE, FALSE);
         mf_close(mfp, FALSE);       /* will also vim_free(mfp->mf_fname) */
      }
-+    vim_free(buf->b_ml.ml_stack);
-     vim_free(buf);
+-    vim_free(buf);
++    if (buf != NULL)
++    {
++       vim_free(buf->b_ml.ml_stack);
++       vim_free(buf);
++    }
      if (serious_error && called_from_main)
         ml_close(curbuf, TRUE);
-@@ -1633,6 +1634,7 @@
+ #ifdef FEAT_AUTOCMD
+@@ -1633,6 +1637,7 @@
      int                    fd;
      struct block0   b0;
@@ -6823 +7040 @@
      char_u         uname[B0_UNAME_SIZE];
  #endif
-@@ -1652,8 +1654,11 @@
+@@ -1652,8 +1657,11 @@
  #endif
             MSG_PUTS(_("             dated: "));
@@ -6837 +7054 @@
  
      /*
-@@ -3652,6 +3657,7 @@
+@@ -3652,6 +3660,7 @@
  {
      struct stat st;
@@ -6845 +7062 @@
      ++no_wait_return;
      (void)EMSG(_("E325: ATTENTION"));
-@@ -3666,7 +3672,11 @@
+@@ -3666,7 +3675,11 @@
      {
         MSG_PUTS(_("             dated: "));
@@ -6860 +7077 @@
 diff -Naur vim70.orig/src/menu.c vim70/src/menu.c
 --- vim70.orig/src/menu.c       2006-05-03 10:30:48.000000000 -0700
-+++ vim70/src/menu.c    2006-12-05 19:58:28.000000000 -0800
++++ vim70/src/menu.c    2007-01-23 17:15:12.000000000 -0800
 @@ -511,6 +511,14 @@
          * name (without mnemonic and accelerator text). */
@@ -6946 +7163 @@
 diff -Naur vim70.orig/src/message.c vim70/src/message.c
 --- vim70.orig/src/message.c    2006-05-06 13:07:37.000000000 -0700
-+++ vim70/src/message.c 2006-12-05 19:58:06.000000000 -0800
++++ vim70/src/message.c 2007-01-23 17:15:17.000000000 -0800
 @@ -53,7 +53,6 @@
  static struct msg_hist *first_msg_hist = NULL;
@@ -6955 +7172 @@
  /*
   * When writing messages to the screen, there are many different situations.
-@@ -1925,7 +1924,8 @@
+@@ -1557,7 +1556,7 @@
+     int                c_extra = 0;
+     char_u     *p_extra = NULL;            /* init to make SASC shut up */
+     int                n;
+-    int                attr= 0;
++    int                attr = 0;
+     char_u     *trail = NULL;
+ #ifdef FEAT_MBYTE
+     int                l;
+@@ -1582,7 +1581,7 @@
+ 
+     while (!got_int)
+     {
+-       if (n_extra)
++       if (n_extra > 0)
+        {
+            --n_extra;
+            if (c_extra)
+@@ -1596,7 +1595,7 @@
+            col += (*mb_ptr2cells)(s);
+            mch_memmove(buf, s, (size_t)l);
+            buf[l] = NUL;
+-           msg_puts_attr(buf, attr);
++           msg_puts(buf);
+            s += l;
+            continue;
+        }
+@@ -1636,6 +1635,9 @@
+                p_extra = transchar_byte(c);
+                c_extra = NUL;
+                c = *p_extra++;
++               /* Use special coloring to be able to distinguish <hex> from
++                * the same in plain text. */
++               attr = hl_attr(HLF_8);
+            }
+            else if (c == ' ' && trail != NULL && s > trail)
+            {
+@@ -1925,7 +1927,8 @@
              * If screen is completely filled and 'more' is set then wait
              * for a character.
@@ -6965 +7219 @@
             {
  #ifdef FEAT_CON_DIALOG
-@@ -4123,8 +4123,6 @@
+@@ -4123,8 +4126,6 @@
             case 'c':
             case 's':
@@ -6974 +7228 @@
                 switch (fmt_spec)
                 {
-@@ -4175,15 +4173,16 @@
+@@ -4175,15 +4176,16 @@
                         str_arg_l = 0;
                     else
@@ -6999 +7253 @@
 diff -Naur vim70.orig/src/misc1.c vim70/src/misc1.c
 --- vim70.orig/src/misc1.c      2006-04-30 08:30:02.000000000 -0700
-+++ vim70/src/misc1.c   2006-12-05 19:58:10.000000000 -0800
++++ vim70/src/misc1.c   2007-01-23 17:15:07.000000000 -0800
 @@ -1761,15 +1761,13 @@
       * Add column offset for 'number', 'foldcolumn', etc.
@@ -7114 +7368 @@
 diff -Naur vim70.orig/src/misc2.c vim70/src/misc2.c
 --- vim70.orig/src/misc2.c      2006-05-04 05:12:38.000000000 -0700
-+++ vim70/src/misc2.c   2006-12-05 19:58:04.000000000 -0800
++++ vim70/src/misc2.c   2007-01-23 17:15:02.000000000 -0800
 @@ -1229,6 +1229,94 @@
      return escaped_string;
@@ -7212 +7466 @@
 diff -Naur vim70.orig/src/netbeans.c vim70/src/netbeans.c
 --- vim70.orig/src/netbeans.c   2006-04-22 11:00:05.000000000 -0700
-+++ vim70/src/netbeans.c        2006-12-05 19:58:11.000000000 -0800
++++ vim70/src/netbeans.c        2007-01-23 17:15:10.000000000 -0800
 @@ -61,7 +61,7 @@
  
@@ -7421 +7675 @@
 diff -Naur vim70.orig/src/normal.c vim70/src/normal.c
 --- vim70.orig/src/normal.c     2006-04-29 06:11:18.000000000 -0700
-+++ vim70/src/normal.c  2006-12-05 19:58:33.000000000 -0800
++++ vim70/src/normal.c  2007-01-23 17:15:12.000000000 -0800
 @@ -651,9 +651,8 @@
         /* Fake a "c"hange command.  When "restart_edit" is set (e.g., because
@@ -7520 +7774 @@
 diff -Naur vim70.orig/src/ops.c vim70/src/ops.c
 --- vim70.orig/src/ops.c        2006-04-30 08:13:44.000000000 -0700
-+++ vim70/src/ops.c     2006-12-05 19:58:11.000000000 -0800
++++ vim70/src/ops.c     2007-01-23 17:15:10.000000000 -0800
 @@ -95,8 +95,8 @@
  static void block_insert __ARGS((oparg_T *oap, char_u *s, int b_insert, struct block_def*bdp));
@@ -7720 +7974 @@
 diff -Naur vim70.orig/src/option.c vim70/src/option.c
 --- vim70.orig/src/option.c     2006-05-03 10:32:28.000000000 -0700
-+++ vim70/src/option.c  2006-12-05 19:58:09.000000000 -0800
++++ vim70/src/option.c  2007-01-23 17:15:07.000000000 -0800
 @@ -2294,7 +2294,7 @@
                             {(char_u *)0L, (char_u *)0L}
@@ -7836 +8090 @@
 diff -Naur vim70.orig/src/os_unix.c vim70/src/os_unix.c
 --- vim70.orig/src/os_unix.c    2006-05-01 01:13:15.000000000 -0700
-+++ vim70/src/os_unix.c 2006-12-05 19:57:56.000000000 -0800
++++ vim70/src/os_unix.c 2007-01-23 17:14:55.000000000 -0800
 @@ -3934,7 +3934,7 @@
                     {
@@ -7895 +8149 @@
 diff -Naur vim70.orig/src/popupmnu.c vim70/src/popupmnu.c
 --- vim70.orig/src/popupmnu.c   2006-04-20 13:18:37.000000000 -0700
-+++ vim70/src/popupmnu.c        2006-12-05 19:57:54.000000000 -0800
++++ vim70/src/popupmnu.c        2007-01-23 17:14:53.000000000 -0800
 @@ -552,6 +552,9 @@
  {
@@ -7908 +8162 @@
 diff -Naur vim70.orig/src/proto/buffer.pro vim70/src/proto/buffer.pro
 --- vim70.orig/src/proto/buffer.pro     2006-05-07 06:08:29.000000000 -0700
-+++ vim70/src/proto/buffer.pro  2006-12-05 19:58:00.000000000 -0800
++++ vim70/src/proto/buffer.pro  2007-01-23 17:14:57.000000000 -0800
 @@ -10,6 +10,7 @@
  extern int do_buffer __ARGS((int action, int start, int dir, int count, int forceit));
@@ -7919 +8173 @@
 diff -Naur vim70.orig/src/proto/eval.pro vim70/src/proto/eval.pro
 --- vim70.orig/src/proto/eval.pro       2006-05-07 06:08:33.000000000 -0700
-+++ vim70/src/proto/eval.pro    2006-12-05 19:58:07.000000000 -0800
++++ vim70/src/proto/eval.pro    2007-01-23 17:15:06.000000000 -0800
 @@ -44,7 +44,7 @@
  extern char_u *get_user_var_name __ARGS((expand_T *xp, int idx));
@@ -7931 +8185 @@
 diff -Naur vim70.orig/src/proto/menu.pro vim70/src/proto/menu.pro
 --- vim70.orig/src/proto/menu.pro       2006-05-07 06:08:51.000000000 -0700
-+++ vim70/src/proto/menu.pro    2006-12-05 19:57:54.000000000 -0800
++++ vim70/src/proto/menu.pro    2007-01-23 17:14:53.000000000 -0800
 @@ -10,6 +10,7 @@
  extern int menu_is_child_of_popup __ARGS((vimmenu_T *menu));
@@ -7942 +8196 @@
 diff -Naur vim70.orig/src/proto/misc2.pro vim70/src/proto/misc2.pro
 --- vim70.orig/src/proto/misc2.pro      2006-05-07 06:08:54.000000000 -0700
-+++ vim70/src/proto/misc2.pro   2006-12-05 19:58:04.000000000 -0800
++++ vim70/src/proto/misc2.pro   2007-01-23 17:15:02.000000000 -0800
 @@ -29,6 +29,7 @@
  extern char_u *vim_strnsave __ARGS((char_u *string, int len));
@@ -7953 +8207 @@
 diff -Naur vim70.orig/src/proto/ops.pro vim70/src/proto/ops.pro
 --- vim70.orig/src/proto/ops.pro        2006-05-07 06:08:58.000000000 -0700
-+++ vim70/src/proto/ops.pro     2006-12-05 19:58:11.000000000 -0800
++++ vim70/src/proto/ops.pro     2007-01-23 17:15:10.000000000 -0800
 @@ -17,10 +17,10 @@
  extern void put_register __ARGS((int name, void *reg));
@@ -7969 +8223 @@
 diff -Naur vim70.orig/src/proto/undo.pro vim70/src/proto/undo.pro
 --- vim70.orig/src/proto/undo.pro       2006-05-07 06:09:11.000000000 -0700
-+++ vim70/src/proto/undo.pro    2006-12-05 19:57:47.000000000 -0800
++++ vim70/src/proto/undo.pro    2007-01-23 17:14:49.000000000 -0800
 @@ -4,6 +4,7 @@
  extern int u_savesub __ARGS((linenr_T lnum));
@@ -7980 +8234 @@
 diff -Naur vim70.orig/src/quickfix.c vim70/src/quickfix.c
 --- vim70.orig/src/quickfix.c   2006-05-03 00:47:42.000000000 -0700
-+++ vim70/src/quickfix.c        2006-12-05 19:58:09.000000000 -0800
++++ vim70/src/quickfix.c        2007-01-23 17:15:07.000000000 -0800
 @@ -500,8 +500,6 @@
         {
@@ -8235 +8489 @@
 diff -Naur vim70.orig/src/regexp.c vim70/src/regexp.c
 --- vim70.orig/src/regexp.c     2006-04-30 08:31:50.000000000 -0700
-+++ vim70/src/regexp.c  2006-12-05 19:58:09.000000000 -0800
++++ vim70/src/regexp.c  2007-01-23 17:15:07.000000000 -0800
 @@ -3777,8 +3777,8 @@
  
@@ -8372 +8626 @@
 diff -Naur vim70.orig/src/screen.c vim70/src/screen.c
 --- vim70.orig/src/screen.c     2006-05-05 03:13:55.000000000 -0700
-+++ vim70/src/screen.c  2006-12-05 19:58:12.000000000 -0800
++++ vim70/src/screen.c  2007-01-23 17:15:11.000000000 -0800
 @@ -455,6 +455,7 @@
                     && curwin->w_topline == curwin->w_lines[0].wl_lnum)
@@ -8556 +8810 @@
 diff -Naur vim70.orig/src/search.c vim70/src/search.c
 --- vim70.orig/src/search.c     2006-05-05 05:12:13.000000000 -0700
-+++ vim70/src/search.c  2006-12-05 19:58:06.000000000 -0800
-@@ -1259,7 +1259,7 @@
++++ vim70/src/search.c  2007-01-23 17:15:26.000000000 -0800
+@@ -812,7 +812,11 @@
+ #ifdef FEAT_MBYTE
+                        if (has_mbyte)
+                        {
+-                           ptr = ml_get_buf(buf, pos->lnum, FALSE);
++                           /* 'e' offset may put us just below the last line */
++                           if (pos->lnum > buf->b_ml.ml_line_count)
++                               ptr = (char_u *)"";
++                           else
++                               ptr = ml_get_buf(buf, pos->lnum, FALSE);
+                            pos->col -= (*mb_head_off)(ptr, ptr + pos->col);
+                        }
+ #endif
+@@ -1259,7 +1263,7 @@
         /*
          * Add character and/or line offset
@@ -8566 +8833 @@
             if (spats[0].off.line)      /* Add the offset to the line number. */
             {
-@@ -4688,6 +4688,7 @@
+@@ -4688,6 +4692,7 @@
  #ifdef FEAT_INS_EXPAND
                     if (action == ACTION_EXPAND)
@@ -8574 +8841 @@
                                 _("Scanning included file: %s"),
                                 (char *)new_fname);
-@@ -4826,15 +4827,20 @@
+@@ -4826,15 +4831,20 @@
  
                 if ((compl_cont_status & CONT_ADDING) && i == compl_length)
@@ -8602 +8869 @@
  
                     /* we read a line, set "already" to check this "line" later
-@@ -4871,7 +4877,7 @@
+@@ -4871,7 +4881,7 @@
                         goto exit_matched;
                 }
@@ -8613 +8880 @@
 diff -Naur vim70.orig/src/spell.c vim70/src/spell.c
 --- vim70.orig/src/spell.c      2006-05-05 00:49:58.000000000 -0700
-+++ vim70/src/spell.c   2006-12-05 19:58:02.000000000 -0800
++++ vim70/src/spell.c   2007-01-23 17:15:01.000000000 -0800
 @@ -1483,7 +1483,7 @@
             else if ((mode == FIND_COMPOUND || mode == FIND_KEEPCOMPOUND
@@ -8944 +9211 @@
 diff -Naur vim70.orig/src/structs.h vim70/src/structs.h
 --- vim70.orig/src/structs.h    2006-04-09 10:57:46.000000000 -0700
-+++ vim70/src/structs.h 2006-12-05 19:57:54.000000000 -0800
++++ vim70/src/structs.h 2007-01-23 17:14:52.000000000 -0800
 @@ -2213,18 +2213,20 @@
  
@@ -8970 +9237 @@
 diff -Naur vim70.orig/src/syntax.c vim70/src/syntax.c
 --- vim70.orig/src/syntax.c     2006-04-26 05:49:45.000000000 -0700
-+++ vim70/src/syntax.c  2006-12-05 19:58:10.000000000 -0800
++++ vim70/src/syntax.c  2007-01-23 17:15:09.000000000 -0800
 @@ -977,6 +977,7 @@
  {
@@ -9074 +9341 @@
 diff -Naur vim70.orig/src/tag.c vim70/src/tag.c
 --- vim70.orig/src/tag.c        2006-04-27 06:11:21.000000000 -0700
-+++ vim70/src/tag.c     2006-12-05 19:58:07.000000000 -0800
++++ vim70/src/tag.c     2007-01-23 17:15:06.000000000 -0800
 @@ -911,7 +911,7 @@
  
@@ -9116 +9383 @@
 diff -Naur vim70.orig/src/term.c vim70/src/term.c
 --- vim70.orig/src/term.c       2006-05-03 10:34:57.000000000 -0700
-+++ vim70/src/term.c    2006-12-05 19:58:10.000000000 -0800
++++ vim70/src/term.c    2007-01-23 17:15:08.000000000 -0800
 @@ -3137,25 +3137,32 @@
             screenalloc(FALSE);
@@ -9180 +9447 @@
 diff -Naur vim70.orig/src/testdir/test56.in vim70/src/testdir/test56.in
 --- vim70.orig/src/testdir/test56.in    2005-05-18 08:37:37.000000000 -0700
-+++ vim70/src/testdir/test56.in 2006-12-05 19:58:00.000000000 -0800
++++ vim70/src/testdir/test56.in 2007-01-23 17:14:57.000000000 -0800
 @@ -3,7 +3,7 @@
  STARTTEST
@@ -9192 +9459 @@
 diff -Naur vim70.orig/src/ui.c vim70/src/ui.c
 --- vim70.orig/src/ui.c 2006-03-27 11:15:09.000000000 -0800
-+++ vim70/src/ui.c      2006-12-05 19:57:56.000000000 -0800
++++ vim70/src/ui.c      2007-01-23 17:14:55.000000000 -0800
 @@ -1137,7 +1137,6 @@
      int                len;
@@ -9212 +9479 @@
 diff -Naur vim70.orig/src/undo.c vim70/src/undo.c
 --- vim70.orig/src/undo.c       2006-04-21 02:30:59.000000000 -0700
-+++ vim70/src/undo.c    2006-12-05 19:57:56.000000000 -0800
++++ vim70/src/undo.c    2007-01-23 17:15:12.000000000 -0800
 @@ -84,7 +84,6 @@
  static void u_unch_branch __ARGS((u_header_T *uhp));
@@ -9230 +9497 @@
  {
      /* Don't allow changes when 'modifiable' is off.  */
-@@ -1188,7 +1187,7 @@
+@@ -342,11 +341,15 @@
+        uhp->uh_alt_next = old_curhead;
+        if (old_curhead != NULL)
+        {
++           uhp->uh_alt_prev = old_curhead->uh_alt_prev;
++           if (uhp->uh_alt_prev != NULL)
++               uhp->uh_alt_prev->uh_alt_next = uhp;
+            old_curhead->uh_alt_prev = uhp;
+            if (curbuf->b_u_oldhead == old_curhead)
+                curbuf->b_u_oldhead = uhp;
+        }
+-       uhp->uh_alt_prev = NULL;
++       else
++           uhp->uh_alt_prev = NULL;
+        if (curbuf->b_u_newhead != NULL)
+            curbuf->b_u_newhead->uh_prev = uhp;
+ 
+@@ -857,6 +860,11 @@
+        uhp = curbuf->b_u_curhead;
+        while (uhp != NULL)
+        {
++           /* Go back to the first branch with a mark. */
++           while (uhp->uh_alt_prev != NULL
++                                       && uhp->uh_alt_prev->uh_walk == mark)
++               uhp = uhp->uh_alt_prev;
++
+            /* Find the last branch with a mark, that's the one. */
+            last = uhp;
+            while (last->uh_alt_next != NULL
+@@ -866,6 +874,8 @@
+            {
+                /* Make the used branch the first entry in the list of
+                 * alternatives to make "u" and CTRL-R take this branch. */
++               while (uhp->uh_alt_prev != NULL)
++                   uhp = uhp->uh_alt_prev;
+                if (last->uh_alt_next != NULL)
+                    last->uh_alt_next->uh_alt_prev = last->uh_alt_prev;
+                last->uh_alt_prev->uh_alt_next = last->uh_alt_next;
+@@ -1188,7 +1198,7 @@
      int                did_undo;       /* just did an undo */
      int                absolute;       /* used ":undo N" */
@@ -9239 +9544 @@
      char_u     msgbuf[80];
  
-@@ -1206,20 +1205,20 @@
+@@ -1206,20 +1216,20 @@
  
      u_oldcount -= u_newcount;
@@ -9266 +9571 @@
  
      if (curbuf->b_u_curhead != NULL)
-@@ -1245,7 +1244,7 @@
+@@ -1245,7 +1255,7 @@
  
      smsg((char_u *)_("%ld %s; %s #%ld  %s"),
@@ -9277 +9582 @@
 diff -Naur vim70.orig/src/version.c vim70/src/version.c
 --- vim70.orig/src/version.c    2006-05-03 00:50:42.000000000 -0700
-+++ vim70/src/version.c 2006-12-05 19:58:39.000000000 -0800
-@@ -667,6 +667,328 @@
++++ vim70/src/version.c 2007-01-23 17:15:26.000000000 -0800
+@@ -667,6 +667,346 @@
  static int included_patches[] =
  {   /* Add new patch number below this line */
  /**/
++    188,
++/**/
++    187,
++/**/
++    186,
++/**/
++    185,
++/**/
++    184,
++/**/
++    183,
++/**/
++    182,
++/**/
++    181,
++/**/
++    179,
++/**/
 +    178,
 +/**/
@@ -9607 +9930 @@
  };
  
-@@ -731,7 +1053,11 @@
+@@ -731,7 +1071,11 @@
      /* Only MS VC 4.1 and earlier can do Win32s */
      MSG_PUTS(_("\nMS-Windows 16/32 bit GUI version"));
@@ -9621 +9944 @@
 diff -Naur vim70.orig/src/vim.h vim70/src/vim.h
 --- vim70.orig/src/vim.h        2006-04-30 08:32:38.000000000 -0700
-+++ vim70/src/vim.h     2006-12-05 19:58:11.000000000 -0800
++++ vim70/src/vim.h     2007-01-23 17:15:23.000000000 -0800
 @@ -585,7 +585,6 @@
  #define INSERT         0x10    /* Insert mode */
@@ -9640 +9963 @@
  #define FORWARD                        1
  #define BACKWARD               (-1)
+@@ -1100,7 +1102,7 @@
+     EVENT_COLORSCHEME,         /* after loading a colorscheme */
+     EVENT_FILEAPPENDPOST,      /* after appending to a file */
+     EVENT_FILEAPPENDPRE,       /* before appending to a file */
+-    EVENT_FILEAPPENDCMD,       /* appende to a file using command */
++    EVENT_FILEAPPENDCMD,       /* append to a file using command */
+     EVENT_FILECHANGEDSHELL,    /* after shell command that changed file */
+     EVENT_FILECHANGEDSHELLPOST,        /* after (not) reloading changed file */
+     EVENT_FILECHANGEDRO,       /* before first change to read-only file */
 @@ -1118,6 +1120,7 @@
      EVENT_FOCUSGAINED,         /* got the focus */
@@ -9648 +9980 @@
      EVENT_INSERTENTER,         /* when entering Insert mode */
      EVENT_INSERTLEAVE,         /* when leaving Insert mode */
-@@ -1666,7 +1669,10 @@
+@@ -1144,6 +1147,7 @@
+     EVENT_REMOTEREPLY,         /* upon string reception from a remote vim */
+     EVENT_SWAPEXISTS,          /* found existing swap file */
+     EVENT_SOURCEPRE,           /* before sourcing a Vim script */
++    EVENT_SOURCECMD,           /* sourcing a Vim script using command */
+     EVENT_SPELLFILEMISSING,    /* spell file missing */
+     EVENT_CURSORMOVED,         /* cursor was moved */
+     EVENT_CURSORMOVEDI,                /* cursor was moved in Insert mode */
+@@ -1666,7 +1670,10 @@
  #define VV_SWAPCHOICE  46
  #define VV_SWAPCOMMAND 47
@@ -9662 +10002 @@
 diff -Naur vim70.orig/src/window.c vim70/src/window.c
 --- vim70.orig/src/window.c     2006-05-06 03:54:51.000000000 -0700
-+++ vim70/src/window.c  2006-12-05 19:58:12.000000000 -0800
++++ vim70/src/window.c  2007-01-23 17:15:11.000000000 -0800
 @@ -340,10 +340,10 @@
                 {