Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 771-772)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 26-27)

   - Update from CVS
   - lisp/vc-hooks.el (vc-find-root): Fix file attribute test

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

2 files changed, 11 insertions, 8 deletions

diff --git a/admin/nt/dump.bat b/admin/nt/dump.bat
index b332e7471f6..49d83e24651 100755
--- a/admin/nt/dump.bat
+++ b/admin/nt/dump.bat
@@ -10,8 +10,6 @@ ren emacs.exe emacs.exe.orig
 

 :dump

 rem Overwrites emacs.exe if still present

-mkdir ..\lib-src

-copy fns* ..\lib-src

 mkdir obj

 mkdir obj\i386

 mkdir obj\etc

diff --git a/admin/nt/makedist.bat b/admin/nt/makedist.bat
index b160da93c4f..56fca7949fa 100755
--- a/admin/nt/makedist.bat
+++ b/admin/nt/makedist.bat
@@ -25,8 +25,6 @@ rem along with GNU Emacs; see the file COPYING.  If not, write to the
 rem Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,

 rem Boston, MA 02110-1301, USA.

 

-set ZIP=zip

-

 if (%3) == () goto usage

 if not (%4) == () goto %4

 

@@ -34,18 +32,25 @@ if not (%4) == () goto %4
 

 echo Create full bin distribution

 copy %3\README.W32 emacs-%1\README.W32

-

-%ZIP% -x emacs.mdp -x *.pdb -x *.opt -x *~ -x CVS -9 emacs-%1/BUGS emacs-%1/README emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc emacs-%1/info emacs-%1/lisp %2-bin-i386.zip

+rem Info-ZIP zip seems to be broken on Windows.

+rem It always writes to zip.zip and treats the zipfile argument as one

+rem of the files to go in it.

+rem zip -9 -r %2-bin-i386 emacs-%1/BUGS emacs-%1/README emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc emacs-%1/info emacs-%1/lisp emacs-%1/leim -x emacs.mdp *.pdb *.opt *~ CVS

+7z a -tZIP -mx=9 -xr!emacs.mdp -xr!*.pdb -xr!*.opt -xr!*~ -xr!CVS -xr!.arch-inventory %2-bin-i386.zip emacs-%1/BUGS emacs-%1/README emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc emacs-%1/info emacs-%1/lisp emacs-%1/leim 

 del emacs-%1\README.W32

 if not (%4) == () goto end

 

 :barebin

-

 echo Create archive with just the basic binaries and generated files

 echo (the user needs to unpack the full source distribution for

 echo  everything else)

 copy %3\README.W32 emacs-%1\README.W32

-%ZIP% -9 emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc/DOC emacs-%1/etc/DOC-X %2-barebin-i386.zip

+copy %3\dump.bat emacs-%1\bin\dump.bat

+rem Info-ZIP zip seems to be broken on Windows.

+rem It always writes to zip.zip and treats the zipfile argument as one

+rem of the files to go in it.

+rem zip -9 -r %2-barebin-i386.zip emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc/DOC-X

+7z a -tZIP -mx=9 %2-barebin-i386.zip emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc/DOC-X

 del emacs-%1\README.W32

 if not (%4) == () goto end