Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-328

4 files changed, 71 insertions, 2 deletions

diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 25d0483e09a..4257b60ee36 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -112,7 +112,10 @@ Also emacsclient does not work on Windows, it also worked with
 server.el version 1.136.
 http://lists.gnu.org/archive/html/emacs-devel/2008-01/msg00710.html
 
-
+** diff mode change for missing spaces in -u format.
+Installed 2008-01-08 fix does not work right.
+http://lists.gnu.org/archive/html/emacs-devel/2007-11/msg01990.html
+http://lists.gnu.org/archive/html/emacs-devel/2008-01/msg01114.html
 
 * DOCUMENTATION
 
diff --git a/admin/nt/README-UNDUMP.W32 b/admin/nt/README-UNDUMP.W32
index 9c9875b44d4..e1634448be1 100644
--- a/admin/nt/README-UNDUMP.W32
+++ b/admin/nt/README-UNDUMP.W32
@@ -1,3 +1,7 @@
+Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+  Free Software Foundation, Inc.
+See the end of the file for license conditions.
+
                            Emacs for Windows
 
 This README file describes how to dump a bare precompiled version of GNU
@@ -34,3 +38,21 @@ problems with Emacs, including problems with dumping, send email to
 "help-emacs-windows@gnu.org".
 
 Enjoy!
+
+
+This file is part of GNU Emacs.
+
+GNU Emacs is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3, or (at your option)
+any later version.
+
+GNU Emacs 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 General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
diff --git a/admin/nt/README-ftp-server b/admin/nt/README-ftp-server
index e04201a7b7b..a2f6cb9ede3 100644
--- a/admin/nt/README-ftp-server
+++ b/admin/nt/README-ftp-server
@@ -1,3 +1,7 @@
+Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+  Free Software Foundation, Inc.
+See the end of the file for license conditions.
+
                       Precompiled Distributions of
                            Emacs for Windows
 
@@ -269,4 +273,22 @@
   (jasonr@gnu.org)
 
   Most of this README was contributed by former maintainer Andrew Innes
-  (andrewi@gnu.org)
\ No newline at end of file
+  (andrewi@gnu.org)
+
+
+This file is part of GNU Emacs.
+
+GNU Emacs is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3, or (at your option)
+any later version.
+
+GNU Emacs 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 General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
diff --git a/admin/nt/README.W32 b/admin/nt/README.W32
index 4c74f12f96c..9d78e4f5e89 100644
--- a/admin/nt/README.W32
+++ b/admin/nt/README.W32
@@ -1,3 +1,7 @@
+Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+  Free Software Foundation, Inc.
+See the end of the file for license conditions.
+
                            Emacs for Windows
 
   This README file describes how to set up and run a precompiled version
@@ -211,3 +215,21 @@
   c-submit-bug-report for C/C++/Java mode, etc.
 
   Enjoy!
+
+
+This file is part of GNU Emacs.
+
+GNU Emacs is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3, or (at your option)
+any later version.
+
+GNU Emacs 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 General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.