mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-24 10:38:38 +00:00
Merge from emacs--rel--22
Patches applied: * emacs--rel--22 (patch 125-127) - Update from CVS Revision: emacs@sv.gnu.org/emacs--devo--0--patch-896
This commit is contained in:
commit
5a95db215e
@ -35,8 +35,8 @@ copy %3\README.W32 emacs-%1\README.W32
|
||||
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/INSTALL 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/INSTALL emacs-%1/bin emacs-%1/etc emacs-%1/info emacs-%1/lisp emacs-%1/leim emacs-%1/site-lisp
|
||||
rem zip -9 -r %2-bin-i386 emacs-%1/BUGS emacs-%1/COPYING emacs-%1/README emacs-%1/README.W32 emacs-%1/INSTALL 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/COPYING emacs-%1/README emacs-%1/README.W32 emacs-%1/INSTALL emacs-%1/bin emacs-%1/etc emacs-%1/info emacs-%1/lisp emacs-%1/leim emacs-%1/site-lisp
|
||||
del emacs-%1\README.W32
|
||||
if not (%4) == () goto end
|
||||
|
||||
@ -49,8 +49,8 @@ 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
|
||||
rem zip -9 -r %2-barebin-i386.zip emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc/DOC-X emacs-%1/COPYING
|
||||
7z a -tZIP -mx=9 %2-barebin-i386.zip emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc/DOC-X emacs-%1/COPYING
|
||||
del emacs-%1\README.W32
|
||||
if not (%4) == () goto end
|
||||
|
||||
|
@ -1,3 +1,7 @@
|
||||
2007-10-18 Martin Rudalics <rudalics@gmx.at>
|
||||
|
||||
* trouble.texi (Quitting): Fix typo.
|
||||
|
||||
2007-10-18 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* frames.texi (Mode Line Mouse): Mention minor mode names.
|
||||
|
@ -84,7 +84,7 @@ waiting for the operating system to do something, quitting is
|
||||
impossible unless special pains are taken for the particular system
|
||||
call within Emacs where the waiting occurs. We have done this for the
|
||||
system calls that users are likely to want to quit from, but it's
|
||||
possible you will a case not handled. In one very common
|
||||
possible you will encounter a case not handled. In one very common
|
||||
case---waiting for file input or output using NFS---Emacs itself knows
|
||||
how to quit, but many NFS implementations simply do not allow user
|
||||
programs to stop waiting for NFS when the NFS server is hung.
|
||||
|
@ -324,7 +324,7 @@ need to quote the space with a C-q. The underlying changes in the
|
||||
keymaps that are active in the minibuffer are described below under
|
||||
"New keymaps for typing file names".
|
||||
|
||||
If you want the old behavior back, put these two key bindings to your
|
||||
If you want the old behavior back, add these two key bindings to your
|
||||
~/.emacs init file:
|
||||
|
||||
(define-key minibuffer-local-filename-completion-map
|
||||
|
@ -2200,6 +2200,13 @@ month names with consistent widths for some locales on some versions
|
||||
of Windows. This is caused by a deficiency in the underlying system
|
||||
library function.
|
||||
|
||||
The functions set-time-zone-rule, and display-time-world (which uses it)
|
||||
do not work on Windows. Fixing this is difficult, since Windows uses
|
||||
localtime for the system clock, and any attempt to change the timezone
|
||||
would have to be accompanied by a clock change for the results to remain
|
||||
consistent. The way in which these functions are used is not intended to
|
||||
cause such system-wide disruption.
|
||||
|
||||
Files larger than 4GB cause overflow in the size (represented as a
|
||||
32-bit integer) reported by `file-attributes'. This affects Dired as
|
||||
well, since the Windows port uses a Lisp emulation of `ls' that relies
|
||||
|
@ -1,3 +1,7 @@
|
||||
2007-10-18 Jason Rumney <jasonr@gnu.org>
|
||||
|
||||
* makefile.w32-in (install): Install COPYING in top-level and bin dirs.
|
||||
|
||||
2007-09-27 Jason Rumney <jasonr@gnu.org>
|
||||
|
||||
* gmake.defs (COMCTL32): New system library.
|
||||
|
@ -211,6 +211,8 @@ install: all $(INSTALL_DIR)/bin install-other-dirs-$(MAKETYPE)
|
||||
$(IFNOTSAMEDIR) $(CP_DIR) ../etc $(INSTALL_DIR) $(ENDIF)
|
||||
- $(CP_DIR) icons $(INSTALL_DIR)/etc
|
||||
$(IFNOTSAMEDIR) $(CP_DIR) ../info $(INSTALL_DIR) $(ENDIF)
|
||||
$(IFNOTSAMEDIR) $(CP) ../COPYING $(INSTALL_DIR) $(ENDIF)
|
||||
- $(CP) ../COPYING $(INSTALL_DIR)/bin
|
||||
- $(DEL) ../same-dir.tst
|
||||
- $(DEL) $(INSTALL_DIR)/same-dir.tst
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user