mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-25 10:47:00 +00:00
Merge from emacs--devo--0
Patches applied: * emacs--devo--0 (patch 765-770) - Update from CVS - Merge from emacs--rel--22 - Merge from gnus--rel--5.10 * emacs--rel--22 (patch 24-25) * gnus--rel--5.10 (patch 222-223) - Update from CVS Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-16
This commit is contained in:
commit
98db66cac2
11
ChangeLog
11
ChangeLog
@ -1,3 +1,14 @@
|
||||
2007-05-22 Andreas Schwab <schwab@suse.de>
|
||||
|
||||
* configure.in: Prefer build_alias over host when host_alias is
|
||||
not set.
|
||||
* configure: Regenerate.
|
||||
|
||||
2007-05-20 Andreas Schwab <schwab@suse.de>
|
||||
|
||||
* configure.in: Remove empty AC_SUBST.
|
||||
* configure: Regenerate.
|
||||
|
||||
2007-05-20 Nick Roberts <nickrob@snap.net.nz>
|
||||
|
||||
* configure.in: Use HAVE_GPM instead of HAVE_GPM_H and implement
|
||||
|
@ -38,8 +38,6 @@ to the hack introduced on 2005-07-01 to fix some other Cleartype problem.
|
||||
** henman@it.to-be.co.jp 09 Aug 2006: ispell.el problem on Cygwin.
|
||||
(Did we decide that is unreproducible?)
|
||||
|
||||
** eliz@gnu.org, May 20: EOL conversion of files in .tar archives
|
||||
|
||||
* BUGS
|
||||
|
||||
NB the definitive copy of this file for Emacs 22 is on the
|
||||
@ -59,6 +57,8 @@ Sync change from trunk 2007-05-19.
|
||||
|
||||
** viper and tramp should not load cl at run time.
|
||||
|
||||
** yamaoka@jpl.org's patch for mail-extract-address-components problem.
|
||||
|
||||
* DOCUMENTATION
|
||||
|
||||
** Check the Emacs Tutorial.
|
||||
|
@ -1,17 +1,16 @@
|
||||
Precompiled Distributions of
|
||||
Emacs for Windows
|
||||
|
||||
Version 21.3
|
||||
Version 22.1
|
||||
|
||||
April 22, 2003
|
||||
May 22, 2007
|
||||
|
||||
This directory contains source and precompiled distributions for GNU
|
||||
Emacs on Windows NT/2000/XP and Windows 95/98/Me. This port is a part
|
||||
of the standard GNU Emacs distribution from the Free Software
|
||||
Emacs on Windows NT/2000/XP and Windows 95/98/Me. This port is a
|
||||
part of the standard GNU Emacs distribution from the Free Software
|
||||
Foundation; the precompiled distributions are provided here for
|
||||
convenience since, unlike Unix, the majority of Windows users do not
|
||||
have access to a compiler (and, besides, do you really want to compile
|
||||
Emacs when you don't have to?).
|
||||
convenience since the majority of Windows users are not accustomed
|
||||
to compiling programs themselves.
|
||||
|
||||
If you have access to the World Wide Web, I would recommend pointing
|
||||
your favorite web browser to the following document (if you haven't
|
||||
@ -27,79 +26,56 @@
|
||||
|
||||
If you want to redistribute any of the precompiled distributions of
|
||||
Emacs, be careful to check the implications of the GPL. For instance,
|
||||
if you put the emacs-21.3-bin-i386.tar.gz file from this directory on
|
||||
if you put the emacs-22.1-bin-i386.tar.gz file from this directory on
|
||||
an Internet site, you must arrange to distribute the source files of
|
||||
the SAME version (i.e. emacs-21.3-src.tar.gz).
|
||||
the SAME version (i.e. ../emacs-22.1.tar.gz).
|
||||
|
||||
Making a link to our copy of the source is NOT sufficient, since we
|
||||
might upgrade to a new version while you are still distributing the
|
||||
old binaries.
|
||||
|
||||
|
||||
* Distributions in .tar.gz format
|
||||
* Distributions in .tar.gz and .zip format
|
||||
|
||||
Emacs is distributed primarily as a set of large gzipped tar files
|
||||
Emacs is distributed primarily as source code in a large gzipped tar file
|
||||
(*.tar.gz). Because Emacs is quite large and therefore difficult to
|
||||
download over unreliable connections, it is provided in several
|
||||
combinations, ranging from the complete source plus executables, to
|
||||
just the minimal amount needed to run without any source, plus a
|
||||
couple of optional packages. Here are the combinations (i386 in the
|
||||
name indicates a tarball contains executables compiled for
|
||||
Intel-compatible x86 systems):
|
||||
download over unreliable connections, the Windows binaries are provided
|
||||
in several combinations, ranging from the complete source plus executables,
|
||||
to just the minimal amount needed to run without any source, plus a
|
||||
couple of optional packages. Formerly, we used the same .tar.gz format
|
||||
but since there are no longer legal problems with .zip files, and the
|
||||
latest versions of Windows support these natively, the Windows binaries
|
||||
of Emacs are now distributed as .zip files.
|
||||
Here are the combinations (i386 in the name indicates a zipfile contains
|
||||
executables compiled for Intel-compatible x86 systems):
|
||||
|
||||
+ Primary precompiled distribution, including lisp source:
|
||||
|
||||
emacs-21.3-fullbin-i386.tar.gz
|
||||
|
||||
+ Minimal precompiled distribution, which excludes lisp source:
|
||||
|
||||
emacs-21.3-bin-i386.tar.gz
|
||||
|
||||
You can download emacs-21.3-lisp.tar.gz to get the lisp source, if
|
||||
you later decide you want it - it is useful for understanding how
|
||||
packages work, and how they can best be setup or customized.
|
||||
|
||||
emacs-22.1-bin-i386.zip
|
||||
|
||||
NB. If you just want to run Emacs, get one of the distributions above.
|
||||
|
||||
+ Bare executables, useful if you want to get the complete source
|
||||
release, but can't compile Emacs yourself:
|
||||
|
||||
+ Bare executables, only useful if you want to get the complete source
|
||||
release below, but can't compile Emacs yourself:
|
||||
|
||||
emacs-21.3-barebin-i386.tar.gz (requires emacs-21.3-src.tar.gz)
|
||||
|
||||
+ Undumped executable, only needed for rebuilding Emacs after changing
|
||||
certain core lisp files:
|
||||
|
||||
emacs-21.3-undumped-i386.tar.gz
|
||||
|
||||
+ Optional package providing the Library of Emacs Input Methods for
|
||||
typing non-ascii characters, notably Chinese, Japanese and Korean,
|
||||
but also including European and other character sets:
|
||||
|
||||
emacs-21.3-leim.tar.gz
|
||||
emacs-22.1-barebin-i386.zip (requires ../emacs-22.1.tar.gz)
|
||||
|
||||
+ The complete official source for Emacs:
|
||||
|
||||
emacs-21.3-src.tar.gz
|
||||
|
||||
+ The complete official source for LEIM:
|
||||
|
||||
leim-21.3-src.tar.gz
|
||||
|
||||
../emacs-22.1.tar.gz
|
||||
|
||||
* Distributions for non-x86 platforms
|
||||
|
||||
Distributions for non-x86 platforms are no longer supplied. Older
|
||||
platforms supported by Windows NT no longer seem to be in demand,
|
||||
and Emacs is yet to be ported to 64bit Windows platforms. If you are
|
||||
willing to help port Emacs to 64bit versions of Windows, your
|
||||
willing to help port Emacs 23 to 64bit versions of Windows, your
|
||||
contribution will be welcome on the emacs-devel mailing list.
|
||||
|
||||
* Unpacking distributions
|
||||
|
||||
Ports of GNU gzip and GNU tar for handling the distribution file
|
||||
formats can be found in several places that distribute ports of GNU
|
||||
Ports of GNU gzip and GNU tar for handling the source distribution file
|
||||
format can be found in several places that distribute ports of GNU
|
||||
programs, for example:
|
||||
|
||||
Cygwin: http://www.cygwin.com/
|
||||
@ -132,6 +108,11 @@
|
||||
You may be prompted to rename or overwrite directories when using
|
||||
djtarnt: simply type return to continue (this is harmless).
|
||||
|
||||
The precompiled binaries can be unpacked using unzip.exe from info-zip.org
|
||||
if you do not already have other tools to do this.
|
||||
|
||||
% unzip some.zip
|
||||
|
||||
Once you have unpacked a precompiled distribution of Emacs, it should
|
||||
have the following subdirectories:
|
||||
|
||||
@ -143,11 +124,11 @@
|
||||
If you do use other utility programs to unpack the distribution, check
|
||||
the following to be sure the distribution was not corrupted:
|
||||
|
||||
+ Be sure to disable the CR/LF translation or the executables will be
|
||||
unusable. Older versions of WinZip would enable this translation
|
||||
by default. If you are using WinZip, disable it. (I don't have
|
||||
WinZip myself, and I do not know the specific commands necessary
|
||||
to disable it.)
|
||||
+ Be sure to disable the CR/LF translation or the executables will
|
||||
be unusable. Older versions of WinZip would enable this
|
||||
translation by default when unpacking .tar files. If you are
|
||||
using WinZip, disable it. (I don't have WinZip myself, and I do
|
||||
not know the specific commands necessary to disable it.)
|
||||
|
||||
+ Check that filenames were not truncated to 8.3. For example, there
|
||||
should be a file lisp/abbrevlist.el; if this has been truncated to
|
||||
|
@ -25,135 +25,36 @@ 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
|
||||
|
||||
rem Beware broken ports of tar. Recent cygwin versions work well, older
|
||||
rem cygwin versions and the current MSys port have problems with DOS
|
||||
rem line ends when reading file names from a file. Other ports have their
|
||||
rem own problems too.
|
||||
set TAR=tar
|
||||
|
||||
rem Make a copy of current Emacs source
|
||||
if (%3) == () goto usage
|
||||
if not (%4) == () goto %4
|
||||
if not (%4) == (src) goto :lisp
|
||||
|
||||
:src
|
||||
|
||||
echo Create full source distribution, excluding leim
|
||||
%TAR% --exclude leim --exclude _marker --exclude DOC --exclude DOC-X --exclude TAGS --exclude bin --exclude obj --exclude obj-spd --exclude oo --exclude oo-spd --exclude *~ --exclude *.rej -cvf - emacs-%1 | gzip -9 > %2-src.tar.gz
|
||||
if not (%4) == () goto end
|
||||
|
||||
:lisp
|
||||
echo Create limited elisp source distribution
|
||||
%TAR% --exclude *.rej --exclude *.elc --exclude *~ -cvf - emacs-%1/lisp | gzip -9 > %2-lisp.tar.gz
|
||||
if not (%4) == () goto end
|
||||
|
||||
:bin
|
||||
|
||||
set eld=emacs-%1/lisp
|
||||
|
||||
rem List of Lisp files that are not compiled and that should be
|
||||
rem included in the bin distribution.
|
||||
|
||||
rem It would be better to generate this list automatically. It is the
|
||||
rem list of all .el files for which there is no corresponding .elc
|
||||
rem file, minus ldefs-boot.el. --lute
|
||||
|
||||
set elfiles=%eld%/cus-load.el %eld%/emacs-lisp/cl-specs.el %eld%/eshell/esh-groups.el %eld%/eshell/esh-maint.el %eld%/finder-inf.el %eld%/forms-d2.el %eld%/forms-pass.el %eld%/international/latin-1.el %eld%/international/latin-2.el %eld%/international/latin-3.el %eld%/international/latin-4.el %eld%/international/latin-5.el %eld%/international/latin-8.el %eld%/international/latin-9.el %eld%/international/mule-conf.el %eld%/language/czech.el %eld%/language/devanagari.el %eld%/language/english.el %eld%/language/georgian.el %eld%/language/greek.el %eld%/language/hebrew.el %eld%/language/japanese.el %eld%/language/kannada.el %eld%/language/korean.el %eld%/language/lao.el %eld%/language/malayalam.el %eld%/language/misc-lang.el %eld%/language/romanian.el %eld%/language/slovak.el %eld%/language/tamil.el %eld%/language/thai.el %eld%/language/utf-8-lang.el %eld%/loaddefs.el %eld%/loadup.el %eld%/mail/blessmail.el %eld%/mh-e/mh-acros.el %eld%/mh-e/mh-gnus.el %eld%/mh-e/mh-loaddefs.el %eld%/obsolete/keyswap.el %eld%/patcomp.el %eld%/paths.el %eld%/play/bruce.el %eld%/subdirs.el %eld%/term/AT386.el %eld%/term/apollo.el %eld%/term/bobcat.el %eld%/term/internal.el %eld%/term/iris-ansi.el %eld%/term/linux.el %eld%/term/lk201.el %eld%/term/news.el %eld%/term/vt102.el %eld%/term/vt125.el %eld%/term/vt200.el %eld%/term/vt201.el %eld%/term/vt220.el %eld%/term/vt240.el %eld%/term/vt300.el %eld%/term/vt320.el %eld%/term/vt400.el %eld%/term/vt420.el %eld%/term/wyse50.el %eld%/version.el
|
||||
|
||||
set fns_el=
|
||||
for %%f in (emacs-%1/bin/fns*) do set fns_el=%fns_el% emacs-%1/bin/%%f
|
||||
|
||||
echo Create bin distribution
|
||||
copy %3\README.W32 emacs-%1\README.W32
|
||||
|
||||
del #files# #elfiles#
|
||||
for %%f in (emacs-%1/BUGS emacs-%1/README emacs-%1/README.W32) do echo %%f>>#files#
|
||||
for %%f in (emacs-%1/bin/fns*) do echo emacs-%1/bin/%%f>>#elfiles#
|
||||
for %%f in (emacs-%1/bin emacs-%1/etc emacs-%1/info emacs-%1/lisp) do echo %%f>>#files#
|
||||
for %%f in (emacs-%1/lock emacs-%1/site-lisp) do echo %%f>>#files#
|
||||
for %%f in (%elfiles% emacs-%1/site-lisp/subdirs.el) do echo %%f>>#elfiles#
|
||||
|
||||
%TAR% --exclude temacs.exe --exclude emacs.mdp --exclude *.pdb --exclude *.opt --exclude "*.el" --exclude "*~" -T #files# -cvf %2-bin-i386.tar
|
||||
%TAR% -T #elfiles# -rvf %2-bin-i386.tar
|
||||
gzip -9 %2-bin-i386.tar
|
||||
del emacs-%1\README.W32
|
||||
rem del #files# #elfiles#
|
||||
if not (%4) == () goto end
|
||||
|
||||
:fullbin
|
||||
|
||||
echo Create full bin distribution
|
||||
copy %3\README.W32 emacs-%1\README.W32
|
||||
|
||||
%TAR% --exclude temacs.exe --exclude emacs.mdp --exclude *.pdb --exclude *.opt --exclude *~ -cvf - emacs-%1/BUGS emacs-%1/README emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc emacs-%1/info emacs-%1/lisp emacs-%1/lock emacs-%1/site-lisp | gzip -9 > %2-fullbin-i386.tar.gz
|
||||
%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
|
||||
del emacs-%1\README.W32
|
||||
if not (%4) == () goto end
|
||||
|
||||
:leim
|
||||
|
||||
echo Create archive with precompiled leim files
|
||||
%TAR% -cvf - emacs-%1/leim/leim-list.el emacs-%1/leim/quail emacs-%1/leim/ja-dic | gzip -9 > %2-leim.tar.gz
|
||||
if not (%4) == () goto end
|
||||
|
||||
:undumped
|
||||
|
||||
echo Create archive with extra files needed for redumping emacs
|
||||
copy %3\README-UNDUMP.W32 emacs-%1\README-UNDUMP.W32
|
||||
copy %3\dump.bat emacs-%1\bin
|
||||
if exist emacs-%1\src\obj-spd\i386\temacs.exe copy emacs-%1\src\obj-spd\i386\temacs.exe emacs-%1\bin
|
||||
if exist emacs-%1\src\oo-spd\i386\temacs.exe copy emacs-%1\src\oo-spd\i386\temacs.exe emacs-%1\bin
|
||||
%TAR% -cvf - emacs-%1/README-UNDUMP.W32 emacs-%1/bin/dump.bat emacs-%1/bin/temacs.exe | gzip -9 > %2-undumped-i386.tar.gz
|
||||
del emacs-%1\bin\temacs.exe
|
||||
del emacs-%1\bin\dump.bat
|
||||
del emacs-%1\README-UNDUMP.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
|
||||
%TAR% -cvf - emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc/DOC emacs-%1/etc/DOC-X | gzip -9 > %2-barebin-i386.tar.gz
|
||||
%ZIP% -9 emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc/DOC emacs-%1/etc/DOC-X %2-barebin-i386.zip
|
||||
del emacs-%1\README.W32
|
||||
if not (%4) == () goto end
|
||||
|
||||
goto end
|
||||
|
||||
rem Only do this if explicitly requested
|
||||
:zipfiles
|
||||
|
||||
echo Create zip files for bin and lisp archives
|
||||
mkdir distrib
|
||||
cd distrib
|
||||
gunzip -c ..\%2-bin-i386.tar.gz | %TAR% xf -
|
||||
rem Need to split emacs.exe into fragments because it is too big now
|
||||
rem to fit on a floppy even by itself.
|
||||
copy %3\stitch.bat %2\bin
|
||||
cd %2\bin
|
||||
split -b 1000000 emacs.exe emacs
|
||||
del emacs.exe
|
||||
cd ..\..
|
||||
zip -rp9 em%5bin %2
|
||||
rm -rf %2
|
||||
zipsplit -n 1400000 -b .. em%5bin.zip
|
||||
del em%5bin.zip
|
||||
gunzip -c ..\%2-lisp.tar.gz | %TAR% xf -
|
||||
zip -rp9 em%5lis %2
|
||||
rm -rf %2
|
||||
zipsplit -n 1400000 -b .. em%5lis.zip
|
||||
del em%5lis.zip
|
||||
cd ..
|
||||
|
||||
goto end
|
||||
|
||||
:usage
|
||||
echo Generate source and binary distributions of emacs.
|
||||
echo Usage: %0 emacs-version dist-basename distfiles [lisp,bin,undumped,barebin]
|
||||
echo Usage: %0 emacs-version dist-basename distfiles [bin,barebin]
|
||||
echo (e.g., %0 19.34 emacs-19.34.5 d:\andrewi\distfiles)
|
||||
echo Or: %0 emacs-version dist-basename distfiles "zipfiles" short-version
|
||||
echo (e.g., %0 20.6 emacs-20.6 d:\andrewi\distfiles zipfiles 206)
|
||||
:end
|
||||
|
||||
goto skipArchTag
|
||||
|
10
configure
vendored
10
configure
vendored
@ -412,10 +412,10 @@ else
|
||||
fi
|
||||
|
||||
test \$exitcode = 0") || {
|
||||
echo Please tell bug-autoconf@gnu.org about your system,
|
||||
echo including any error possibly output before this message.
|
||||
echo This can help us improve future autoconf versions.
|
||||
echo Configuration will now proceed without shell functions.
|
||||
echo No shell found that supports shell functions.
|
||||
echo Please tell autoconf@gnu.org about your system,
|
||||
echo including any error possibly output before this
|
||||
echo message
|
||||
}
|
||||
|
||||
|
||||
@ -2176,7 +2176,7 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
|
||||
|
||||
|
||||
canonical=$host
|
||||
configuration=${host_alias-$host}
|
||||
configuration=${host_alias-${build_alias-$host}}
|
||||
|
||||
|
||||
|
||||
|
@ -200,7 +200,7 @@ fi
|
||||
|
||||
AC_CANONICAL_HOST
|
||||
canonical=$host
|
||||
configuration=${host_alias-$host}
|
||||
configuration=${host_alias-${build_alias-$host}}
|
||||
|
||||
dnl This used to use changequote, but, apart from `changequote is evil'
|
||||
dnl per the autoconf manual, we can speed up autoconf somewhat by quoting
|
||||
|
@ -1,3 +1,9 @@
|
||||
2007-05-22 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* NEWS.22: New file with entries for Emacs 22.
|
||||
* NEWS: Move Emacs 22 entries to new file NEWS.22, leave empty
|
||||
template for next Emacs version.
|
||||
|
||||
2007-05-19 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* images/cancel.pbm: Convert from PGM to PBM.
|
||||
|
5408
etc/NEWS.22
Normal file
5408
etc/NEWS.22
Normal file
File diff suppressed because it is too large
Load Diff
30
etc/PROBLEMS
30
etc/PROBLEMS
@ -158,7 +158,6 @@ will run it under. For details, see
|
||||
|
||||
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239344
|
||||
|
||||
|
||||
* Crash bugs
|
||||
|
||||
** Emacs crashes in x-popup-dialog.
|
||||
@ -2453,6 +2452,27 @@ This results from a bug in a VERY old version of GNU Sed. To solve
|
||||
the problem, install the current version of GNU Sed, then rerun
|
||||
Emacs's configure script.
|
||||
|
||||
*** Compiling on GNU/Linux fails due to a missing left operand in gnu-linux.h.
|
||||
|
||||
The error messages have the form:
|
||||
|
||||
../src/s/gnu-linux.h:49:24: error: operator '>' has no left operand
|
||||
|
||||
This error occurs because your system defines LINUX_VERSION_CODE in
|
||||
the standard header file linux/version.h but does not give it a value.
|
||||
As a workaround, you can edit the file src/s/gnu-linux.h to add the
|
||||
needed definition. On the line after "#include <linux/version.h>",
|
||||
add a line as shown below:
|
||||
|
||||
#include <linux/version.h>
|
||||
#define LINUX_VERSION_CODE 132626
|
||||
|
||||
The number to use depends on your kernel version (the example shown is
|
||||
for kernel 2.6.18). The number can be obtained by running the
|
||||
following command in the shell:
|
||||
|
||||
uname -r | sed -e 's/\./ /g' -e 's/-.*//' | awk '{print $1*(2^16) + $2*(2^8) + $3}'
|
||||
|
||||
*** Building a 32-bit executable on a 64-bit GNU/Linux architecture.
|
||||
|
||||
First ensure that the necessary 32-bit system libraries and include
|
||||
@ -2810,6 +2830,14 @@ with spaces in the value, eg --enable-locallisppath='/path/with\ spaces'.
|
||||
Using directory paths with spaces is not supported at this time: you
|
||||
must re-configure without using spaces.
|
||||
|
||||
*** Installing to a directory with non-ASCII characters in the name fails.
|
||||
|
||||
Installation may fail, or the Emacs executable may not start
|
||||
correctly, if a directory name containing non-ASCII characters is used
|
||||
as a `configure' argument (e.g. `--prefix'). The problem can also
|
||||
occur if a non-ASCII directory is specified in the EMACSLOADPATH
|
||||
envvar.
|
||||
|
||||
*** On Solaris, use GNU Make when installing an out-of-tree build
|
||||
|
||||
The Emacs configuration process allows you to configure the
|
||||
|
4
etc/TODO
4
etc/TODO
@ -553,6 +553,10 @@ but which can also be used as a modifier).
|
||||
** Cleanup all the GC_ mark bit stuff -- there is no longer any distinction
|
||||
since the mark bit is no longer stored in the Lisp_Object itself.
|
||||
|
||||
** Refine the `predicate' arg to read-file-name.
|
||||
Currently, it mixes up the predicate to apply when doing completion and the
|
||||
one to use when terminating the selection.
|
||||
|
||||
** Merge ibuffer.el and buff-menu.el.
|
||||
More specifically do what's needed to make ibuffer.el the default,
|
||||
or just an extension of buff-menu.el.
|
||||
|
@ -404,6 +404,7 @@ Compilation killed at Wed Jul 20 12:20:10
|
||||
Compilation terminated at Wed Jul 20 12:20:10
|
||||
Compilation exited abnormally with code 1 at Wed Jul 20 12:21:12
|
||||
Compilation finished at Thu Jul 21 15:02:15
|
||||
Compilation segmentation fault at Thu Jul 13 10:55:49
|
||||
|
||||
|
||||
Copyright (C) 2004, 2005, 2006, 2007
|
||||
|
33420
lisp/ChangeLog
33420
lisp/ChangeLog
File diff suppressed because it is too large
Load Diff
33375
lisp/ChangeLog.12
Normal file
33375
lisp/ChangeLog.12
Normal file
File diff suppressed because it is too large
Load Diff
@ -186,33 +186,33 @@ If this contains a %s, that will be replaced by the matching rule."
|
||||
(completing-read "Keyword, C-h: " v1 nil t))
|
||||
str ", ") & -2 "
|
||||
|
||||
;; This file 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 2, or (at your option)
|
||||
;; any later version.
|
||||
\;; This file 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 2, or (at your option)
|
||||
\;; any later version.
|
||||
|
||||
;; This file 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.
|
||||
\;; This file 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.
|
||||
\;; 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.
|
||||
|
||||
;;; Commentary:
|
||||
\;;; Commentary:
|
||||
|
||||
;; " _ "
|
||||
\;; " _ "
|
||||
|
||||
;;; Code:
|
||||
\;;; Code:
|
||||
|
||||
|
||||
|
||||
\(provide '"
|
||||
(file-name-sans-extension (file-name-nondirectory (buffer-file-name)))
|
||||
")
|
||||
;;; " (file-name-nondirectory (buffer-file-name)) " ends here\n"))
|
||||
\;;; " (file-name-nondirectory (buffer-file-name)) " ends here\n"))
|
||||
"A list specifying text to insert by default into a new file.
|
||||
Elements look like (CONDITION . ACTION) or ((CONDITION . DESCRIPTION) . ACTION).
|
||||
CONDITION may be a regexp that must match the new file's name, or it may be
|
||||
|
@ -92,7 +92,7 @@ against the file name, and TYPE is nil for text, t for binary.")
|
||||
|
||||
(defun find-buffer-file-type-coding-system (command)
|
||||
"Choose a coding system for a file operation in COMMAND.
|
||||
COMMAND is a list that specifies the operation, and I/O primitive as its
|
||||
COMMAND is a list that specifies the operation, an I/O primitive, as its
|
||||
CAR, and the arguments that might be given to that operation as its CDR.
|
||||
If operation is `insert-file-contents', the coding system is chosen based
|
||||
upon the filename (the CAR of the arguments beyond the operation), the contents
|
||||
@ -109,6 +109,10 @@ and whether the file exists:
|
||||
If the file exists: `undecided'
|
||||
If the file does not exist: default-buffer-file-coding-system
|
||||
|
||||
Note that the CAR of arguments to `insert-file-contents' operation could
|
||||
be a cons cell of the form \(FILENAME . BUFFER\), where BUFFER is a buffer
|
||||
into which the file's contents were already read, but not yet decoded.
|
||||
|
||||
If operation is `write-region', the coding system is chosen based upon
|
||||
the value of `buffer-file-coding-system' and `buffer-file-type'. If
|
||||
`buffer-file-coding-system' is non-nil, its value is used. If it is
|
||||
|
@ -103,7 +103,7 @@ used (see below).
|
||||
|
||||
BODY contains code to execute each time the mode is activated or deactivated.
|
||||
It is executed after toggling the mode,
|
||||
and before running the hook variable `mode-HOOK'.
|
||||
and before running the hook variable `MODE-hook'.
|
||||
Before the actual body code, you can write keyword arguments (alternating
|
||||
keywords and values). These following keyword arguments are supported (other
|
||||
keywords will be passed to `defcustom' if the minor mode is global):
|
||||
@ -486,7 +486,7 @@ BASE-next also tries to make sure that the whole entry is visible by
|
||||
the next entry) and recentering if necessary.
|
||||
ENDFUN should return the end position (with or without moving point).
|
||||
NARROWFUN non-nil means to check for narrowing before moving, and if
|
||||
found, do widen first and then call NARROWFUN with no args after moving."
|
||||
found, do `widen' first and then call NARROWFUN with no args after moving."
|
||||
(let* ((base-name (symbol-name base))
|
||||
(prev-sym (intern (concat base-name "-prev")))
|
||||
(next-sym (intern (concat base-name "-next")))
|
||||
|
@ -1985,6 +1985,8 @@ since only a single case-insensitive search through the alist is made."
|
||||
("[:/]_emacs\\'" . emacs-lisp-mode)
|
||||
("/crontab\\.X*[0-9]+\\'" . shell-script-mode)
|
||||
("\\.ml\\'" . lisp-mode)
|
||||
;; Common Lisp ASDF package system.
|
||||
("\\.asd\\'" . lisp-mode)
|
||||
("\\.\\(asn\\|mib\\|smi\\)\\'" . snmp-mode)
|
||||
("\\.\\(as\\|mi\\|sm\\)2\\'" . snmpv2-mode)
|
||||
("\\.\\(diffs?\\|patch\\|rej\\)\\'" . diff-mode)
|
||||
@ -2169,10 +2171,11 @@ Also applies to `magic-fallback-mode-alist'.")
|
||||
(defun set-auto-mode (&optional keep-mode-if-same)
|
||||
"Select major mode appropriate for current buffer.
|
||||
|
||||
This checks for a -*- mode tag in the buffer's text, checks the
|
||||
interpreter that runs this file against `interpreter-mode-alist',
|
||||
compares the buffer beginning against `magic-mode-alist', or
|
||||
compares the filename against the entries in `auto-mode-alist'.
|
||||
To find the right major mode, this function checks for a -*- mode tag,
|
||||
checks if it uses an interpreter listed in `interpreter-mode-alist',
|
||||
matches the buffer beginning against `magic-mode-alist',
|
||||
compares the filename against the entries in `auto-mode-alist',
|
||||
then matches the buffer beginning against `magic-fallback-mode-alist'.
|
||||
|
||||
It does not check for the `mode:' local variable in the
|
||||
Local Variables section of the file; for that, use `hack-local-variables'.
|
||||
@ -2181,7 +2184,8 @@ If `enable-local-variables' is nil, this function does not check for a
|
||||
-*- mode tag.
|
||||
|
||||
If the optional argument KEEP-MODE-IF-SAME is non-nil, then we
|
||||
only set the major mode, if that would change it."
|
||||
set the major mode only if that would change it. In other words
|
||||
we don't actually set it to the same mode the buffer already has."
|
||||
;; Look for -*-MODENAME-*- or -*- ... mode: MODENAME; ... -*-
|
||||
(let (end done mode modes)
|
||||
;; Find a -*- mode tag
|
||||
|
@ -1,3 +1,8 @@
|
||||
2007-05-24 Katsumi Yamaoka <yamaoka@jpl.org>
|
||||
|
||||
* message.el (message-narrow-to-headers-or-head): Ignore
|
||||
mail-header-separator in the body.
|
||||
|
||||
2007-05-10 Reiner Steib <Reiner.Steib@gmx.de>
|
||||
|
||||
* gnus-art.el (gnus-article-mode): Fix comment about displaying
|
||||
|
@ -2225,14 +2225,12 @@ Point is left at the beginning of the narrowed-to region."
|
||||
(widen)
|
||||
(narrow-to-region
|
||||
(goto-char (point-min))
|
||||
(cond
|
||||
((re-search-forward
|
||||
(concat "^" (regexp-quote mail-header-separator) "\n") nil t)
|
||||
(match-beginning 0))
|
||||
((search-forward "\n\n" nil t)
|
||||
(1- (point)))
|
||||
(t
|
||||
(point-max))))
|
||||
(if (re-search-forward (concat "\\(\n\\)\n\\|^\\("
|
||||
(regexp-quote mail-header-separator)
|
||||
"\n\\)")
|
||||
nil t)
|
||||
(or (match-end 1) (match-beginning 2))
|
||||
(point-max)))
|
||||
(goto-char (point-min)))
|
||||
|
||||
(defun message-news-p ()
|
||||
|
@ -232,6 +232,23 @@ face (according to `face-differs-from-default-p')."
|
||||
libname)
|
||||
file))))
|
||||
|
||||
(defun find-source-lisp-file (file-name)
|
||||
(let* ((elc-file (locate-file (concat file-name
|
||||
(if (string-match "\\.el" file-name)
|
||||
"c"
|
||||
".elc"))
|
||||
load-path))
|
||||
(str (if (and elc-file (file-readable-p elc-file))
|
||||
(with-temp-buffer
|
||||
(insert-file-contents-literally elc-file nil 0 256)
|
||||
(buffer-string))))
|
||||
(src-file (and str
|
||||
(string-match ";;; from file \\(.*\\.el\\)" str)
|
||||
(match-string 1 str))))
|
||||
(if (and src-file (file-readable-p src-file))
|
||||
src-file
|
||||
file-name)))
|
||||
|
||||
;;;###autoload
|
||||
(defun describe-function-1 (function)
|
||||
(let* ((def (if (symbolp function)
|
||||
@ -309,6 +326,10 @@ face (according to `face-differs-from-default-p')."
|
||||
;; but that's completely wrong when the user used load-file.
|
||||
(princ (if (eq file-name 'C-source) "C source code" file-name))
|
||||
(princ "'")
|
||||
;; See if lisp files are present where they where installed from.
|
||||
(if (not (eq file-name 'C-source))
|
||||
(setq file-name (find-source-lisp-file file-name)))
|
||||
|
||||
;; Make a hyperlink to the library.
|
||||
(with-current-buffer standard-output
|
||||
(save-excursion
|
||||
|
@ -1426,7 +1426,8 @@ Turning the mode on runs the normal hook `compilation-minor-mode-hook'."
|
||||
process-status exit-status msg)
|
||||
(cons msg exit-status)))
|
||||
(omax (point-max))
|
||||
(opoint (point)))
|
||||
(opoint (point))
|
||||
(cur-buffer (current-buffer)))
|
||||
;; Record where we put the message, so we can ignore it later on.
|
||||
(goto-char omax)
|
||||
(insert ?\n mode-name " " (car status))
|
||||
@ -1447,8 +1448,8 @@ Turning the mode on runs the normal hook `compilation-minor-mode-hook'."
|
||||
(goto-char opoint))
|
||||
(with-no-warnings
|
||||
(if compilation-finish-function
|
||||
(funcall compilation-finish-function (current-buffer) msg)))
|
||||
(run-hook-with-args 'compilation-finish-functions (current-buffer) msg)))
|
||||
(funcall compilation-finish-function cur-buffer msg)))
|
||||
(run-hook-with-args 'compilation-finish-functions cur-buffer msg)))
|
||||
|
||||
;; Called when compilation process changes state.
|
||||
(defun compilation-sentinel (proc msg)
|
||||
|
@ -363,6 +363,7 @@ MODE should be an integer which is a file mode value."
|
||||
((eq type 29) ?M) ; multivolume continuation
|
||||
((eq type 35) ?S) ; sparse
|
||||
((eq type 38) ?V) ; volume header
|
||||
((eq type 55) ?H) ; extended pax header
|
||||
(t ?\s)
|
||||
)
|
||||
(tar-grind-file-mode mode)
|
||||
@ -421,7 +422,7 @@ is visible (and the real data of the buffer is hidden)."
|
||||
(buffer-substring pos (+ pos 512)))))))
|
||||
(setq pos (+ pos 512))
|
||||
(progress-reporter-update progress-reporter pos)
|
||||
(if (eq (tar-header-link-type tokens) 20)
|
||||
(if (memq (tar-header-link-type tokens) '(20 55))
|
||||
;; Foo. There's an extra empty block after these.
|
||||
(setq pos (+ pos 512)))
|
||||
(let ((size (tar-header-size tokens)))
|
||||
@ -657,13 +658,14 @@ appear on disk when you save the tar-file's buffer."
|
||||
(size (tar-header-size tokens))
|
||||
(link-p (tar-header-link-type tokens)))
|
||||
(if link-p
|
||||
(error "This is a %s, not a real file"
|
||||
(cond ((eq link-p 5) "directory")
|
||||
((eq link-p 20) "tar directory header")
|
||||
((eq link-p 28) "next has longname")
|
||||
((eq link-p 29) "multivolume-continuation")
|
||||
((eq link-p 35) "sparse entry")
|
||||
((eq link-p 38) "volume header")
|
||||
(error "This is a%s, not a real file"
|
||||
(cond ((eq link-p 5) " directory")
|
||||
((eq link-p 20) " tar directory header")
|
||||
((eq link-p 28) " next has longname")
|
||||
((eq link-p 29) " multivolume-continuation")
|
||||
((eq link-p 35) " sparse entry")
|
||||
((eq link-p 38) " volume header")
|
||||
((eq link-p 55) "n extended pax header")
|
||||
(t "link"))))
|
||||
(if (zerop size) (error "This is a zero-length file"))
|
||||
descriptor))
|
||||
@ -681,6 +683,12 @@ appear on disk when you save the tar-file's buffer."
|
||||
(goto-char (posn-point (event-end event)))
|
||||
(tar-extract))
|
||||
|
||||
(defun tar-file-name-handler (op &rest args)
|
||||
"Helper function for `tar-extract'."
|
||||
(or (eq op 'file-exists-p)
|
||||
(let ((file-name-handler-alist nil))
|
||||
(apply op args))))
|
||||
|
||||
(defun tar-extract (&optional other-window-p)
|
||||
"In Tar mode, extract this entry of the tar file into its own buffer."
|
||||
(interactive)
|
||||
@ -735,9 +743,17 @@ appear on disk when you save the tar-file's buffer."
|
||||
(save-excursion
|
||||
(funcall set-auto-coding-function
|
||||
name (- (point-max) (point)))))
|
||||
(car (find-operation-coding-system
|
||||
'insert-file-contents
|
||||
(cons name (current-buffer)) t))))
|
||||
;; The following binding causes
|
||||
;; find-buffer-file-type-coding-system
|
||||
;; (defined on dos-w32.el) to act as if
|
||||
;; the file being extracted existed, so
|
||||
;; that the file's contents' encoding and
|
||||
;; EOL format are auto-detected.
|
||||
(let ((file-name-handler-alist
|
||||
'(("" . tar-file-name-handler))))
|
||||
(car (find-operation-coding-system
|
||||
'insert-file-contents
|
||||
(cons name (current-buffer)) t)))))
|
||||
(multibyte enable-multibyte-characters)
|
||||
(detected (detect-coding-region
|
||||
(point-min)
|
||||
@ -758,7 +774,9 @@ appear on disk when you save the tar-file's buffer."
|
||||
(coding-system-change-text-conversion
|
||||
coding 'raw-text)))
|
||||
(decode-coding-region (point-min) (point-max) coding)
|
||||
(set-buffer-file-coding-system coding))
|
||||
;; Force buffer-file-coding-system to what
|
||||
;; decode-coding-region actually used.
|
||||
(set-buffer-file-coding-system last-coding-system-used t))
|
||||
;; Set the default-directory to the dir of the
|
||||
;; superior buffer.
|
||||
(setq default-directory
|
||||
|
@ -159,6 +159,11 @@ Leave one space between words, two at end of sentences or after colons
|
||||
and `sentence-end-without-period').
|
||||
Remove indentation from each line."
|
||||
(interactive "*r")
|
||||
;; Ideally, we'd want to scan the text from the end, so that changes to
|
||||
;; text don't affect the boundary, but the regexp we match against does
|
||||
;; not match as eagerly when matching backward, so we instead use
|
||||
;; a marker.
|
||||
(unless (markerp end) (setq end (copy-marker end t)))
|
||||
(let ((end-spc-re (concat "\\(" (sentence-end) "\\) *\\| +")))
|
||||
(save-excursion
|
||||
(goto-char beg)
|
||||
|
@ -1,3 +1,8 @@
|
||||
2007-05-24 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
|
||||
|
||||
* INSTALL: Add note about moving self-contained application bundle
|
||||
to non-ASCII directory.
|
||||
|
||||
2007-04-26 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
|
||||
|
||||
* INSTALL: Fix description about using colors in terminal.
|
||||
|
@ -153,6 +153,11 @@ options to user
|
||||
|
||||
For usage of other options, use the --help option.
|
||||
|
||||
Note: due to the problem "Installing to a directory with non-ASCII
|
||||
characters in the name fails" mentioned in etc/PROBLEMS, you may not
|
||||
move a self-contained Emacs.app application bundle to a non-ASCII
|
||||
directory.
|
||||
|
||||
* BUILDING EMACS ON MAC OS Classic
|
||||
|
||||
You can use MPW-GM (Aug. 2001) to build Emacs. MPW-GM can be
|
||||
|
@ -1,3 +1,8 @@
|
||||
2007-05-22 Eli Zaretskii <eliz@gnu.org>
|
||||
|
||||
* INSTALL: Add information about where to find GDB, and warn
|
||||
against --no-debug option to configure.bat.
|
||||
|
||||
2007-05-19 Eli Zaretskii <eliz@gnu.org>
|
||||
|
||||
* INSTALL: Fix URL of EmacsW32 site where building with image
|
||||
|
@ -227,6 +227,9 @@
|
||||
To configure Emacs to build with GCC or MSVC, whichever is available,
|
||||
simply change to the `nt' subdirectory and run `configure.bat' with no
|
||||
options. To see what options are available, run `configure --help'.
|
||||
Do NOT use the --no-debug option to configure.bat unless you are
|
||||
absolutely sure the produced binaries will never need to be run under
|
||||
a debugger.
|
||||
|
||||
N.B. It is normal to see a few error messages output while configure
|
||||
is running, when gcc support is being tested. These cannot be
|
||||
@ -380,7 +383,8 @@
|
||||
|
||||
You should be able to debug Emacs using the debugger that is
|
||||
appropriate for the compiler you used, namely DevStudio or Windbg if
|
||||
compiled with MSVC, or GDB if compiled with GCC.
|
||||
compiled with MSVC, or GDB if compiled with GCC. (GDB for Windows
|
||||
is available from the MinGW site, http://www.mingw.org/download.shtml.)
|
||||
|
||||
When Emacs aborts due to a fatal internal error, Emacs on Windows
|
||||
pops up an Emacs Abort Dialog asking you whether you want to debug
|
||||
|
@ -1,3 +1,20 @@
|
||||
2007-05-24 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
|
||||
|
||||
* macterm.c [USE_CARBON_EVENTS] (mac_handle_window_event):
|
||||
Call mac_wakeup_from_rne on window size change.
|
||||
|
||||
2007-05-23 Johannes Weiner <hannes@saeurebad.de> (tiny change)
|
||||
|
||||
* keyboard.c (make_lispy_movement): Condition on HAVE_GPM too.
|
||||
|
||||
2007-05-22 Richard Stallman <rms@gnu.org>
|
||||
|
||||
* xterm.c (x_connection_closed): Remove NO_RETURN.
|
||||
|
||||
2007-05-22 Martin Rudalics <rudalics@gmx.at>
|
||||
|
||||
* syntax.c (scan_words): Fix arg to UPDATE_SYNTAX_TABLE_BACKWARD.
|
||||
|
||||
2007-05-21 Chong Yidong <cyd@stupidchicken.com>
|
||||
|
||||
* image.c (uncache_image): New function.
|
||||
|
@ -6189,7 +6189,7 @@ make_lispy_event (event)
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef HAVE_MOUSE
|
||||
#if defined(HAVE_MOUSE) || defined(HAVE_GPM)
|
||||
|
||||
static Lisp_Object
|
||||
make_lispy_movement (frame, bar_window, part, x, y, time)
|
||||
@ -6228,7 +6228,7 @@ make_lispy_movement (frame, bar_window, part, x, y, time)
|
||||
}
|
||||
}
|
||||
|
||||
#endif /* HAVE_MOUSE */
|
||||
#endif /* HAVE_MOUSE || HAVE GPM */
|
||||
|
||||
/* Construct a switch frame event. */
|
||||
static Lisp_Object
|
||||
|
@ -9888,6 +9888,7 @@ mac_handle_window_event (next_handler, event, data)
|
||||
width = bounds.right - bounds.left;
|
||||
height = bounds.bottom - bounds.top;
|
||||
mac_handle_size_change (f, width, height);
|
||||
mac_wakeup_from_rne ();
|
||||
}
|
||||
}
|
||||
|
||||
|
12
src/syntax.c
12
src/syntax.c
@ -1276,19 +1276,19 @@ scan_words (from, count)
|
||||
position of it. */
|
||||
while (1)
|
||||
{
|
||||
int temp_byte;
|
||||
|
||||
if (from == beg)
|
||||
break;
|
||||
temp_byte = dec_bytepos (from_byte);
|
||||
DEC_BOTH (from, from_byte);
|
||||
UPDATE_SYNTAX_TABLE_BACKWARD (from);
|
||||
ch0 = FETCH_CHAR (temp_byte);
|
||||
ch0 = FETCH_CHAR (from_byte);
|
||||
code = SYNTAX (ch0);
|
||||
if (!(words_include_escapes
|
||||
&& (code == Sescape || code == Scharquote)))
|
||||
if (code != Sword || WORD_BOUNDARY_P (ch0, ch1))
|
||||
break;
|
||||
DEC_BOTH (from, from_byte);
|
||||
{
|
||||
INC_BOTH (from, from_byte);
|
||||
break;
|
||||
}
|
||||
ch1 = ch0;
|
||||
}
|
||||
count++;
|
||||
|
@ -371,7 +371,9 @@ static void x_check_expected_move P_ ((struct frame *, int, int));
|
||||
static void x_sync_with_move P_ ((struct frame *, int, int, int));
|
||||
static int handle_one_xevent P_ ((struct x_display_info *, XEvent *,
|
||||
int *, struct input_event *));
|
||||
static SIGTYPE x_connection_closed P_ ((Display *, char *)) NO_RETURN;
|
||||
/* Don't declare this NO_RETURN because we want no
|
||||
interference with debugging failing X calls. */
|
||||
static SIGTYPE x_connection_closed P_ ((Display *, char *));
|
||||
|
||||
|
||||
/* Flush display of frame F, or of all frames if F is null. */
|
||||
|
Loading…
Reference in New Issue
Block a user