Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
478ebb73
Commit
478ebb73
authored
May 27, 2010
by
Kenichi Handa
Browse files
merge trunk
parents
2b25da45
b7bd8478
Changes
30
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
245 additions
and
781 deletions
+245
-781
ChangeLog
ChangeLog
+24
-0
INSTALL
INSTALL
+10
-16
admin/ChangeLog
admin/ChangeLog
+6
-0
admin/notes/cpp
admin/notes/cpp
+0
-14
admin/quick-install-emacs
admin/quick-install-emacs
+3
-3
config.bat
config.bat
+4
-5
configure
configure
+32
-97
configure.in
configure.in
+31
-83
doc/misc/ChangeLog
doc/misc/ChangeLog
+5
-0
doc/misc/eshell.texi
doc/misc/eshell.texi
+11
-0
etc/ChangeLog
etc/ChangeLog
+4
-0
etc/MACHINES
etc/MACHINES
+1
-11
etc/PROBLEMS
etc/PROBLEMS
+8
-493
lib-src/ChangeLog
lib-src/ChangeLog
+4
-0
lib-src/Makefile.in
lib-src/Makefile.in
+1
-1
lisp/ChangeLog
lisp/ChangeLog
+24
-2
lisp/emacs-lisp/smie.el
lisp/emacs-lisp/smie.el
+46
-22
lisp/emulation/edt.el
lisp/emulation/edt.el
+26
-33
lisp/org/ChangeLog
lisp/org/ChangeLog
+4
-0
lisp/org/org.el
lisp/org/org.el
+1
-1
No files found.
ChangeLog
View file @
478ebb73
2010-05-27 Glenn Morris <rgm@gnu.org>
* config.bat: Do not preprocess src/Makefile.in.
* configure.in: Do not preprocess src/Makefile.in.
(cpp_undefs, CPP_NEED_TRADITIONAL): Remove.
(AC_EGREP_CPP): Test no longer needed.
* make-dist: No more Makefile.c files.
2010-05-26 Glenn Morris <rgm@gnu.org>
* configure.in (YMF_PASS_LDFLAGS): Remove.
(PRE_EDIT_LDFLAGS, POST_EDIT_LDFLAGS): New output variables.
* configure.in (CPPFLAGS, CFLAGS, REAL_CFLAGS):
Add $GNUSTEP_LOCAL_HEADERS.
(LDFLAGS, LD_SWITCH_SYSTEM_TEMACS): Add $GNUSTEP_LOCAL_LIBRARIES.
* configure.in (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS)
(GNUSTEP_MAKEFILES): Remove.
(LD_SWITCH_SYSTEM_TEMACS): Move NS_IMPL_GNUSTEP_TEMACS_LDFLAGS
stuff to here.
2010-05-25 Glenn Morris <rgm@gnu.org>
* configure.in (LD_SWITCH_SYSTEM): Move some gnu-linux stuff...
...
...
INSTALL
View file @
478ebb73
GNU
Emacs
Installation
Guide
Copyright
(
C
)
1992
,
1994
,
1996
,
1997
,
2000
,
2001
,
2002
,
2003
,
2004
,
2005
,
2006
,
2007
,
2008
,
2009
,
2010
Free
Software
Foundation
,
Inc
.
2005
,
2006
,
2007
,
2008
,
2009
,
2010
Free
Software
Foundation
,
Inc
.
See
the
end
of
the
file
for
license
conditions
.
...
...
@@ -686,8 +687,8 @@ when running make in the subdirectories.
CONFIGURATION
BY
HAND
Instead
of
running
the
`
configure
' program, you have to perform the
following steps.
This
should
not
be
necessary
and
is
not
recommended
.
Instead
of
running
the
`
configure
' program, you have to perform the
following steps.
1) Copy `./src/config.in'
to
`./
src
/
config
.
h
'.
...
...
@@ -701,22 +702,15 @@ the appropriate system and architecture description files.
2) Edit `./src/config.h'
to
set
the
right
options
for
your
system
.
If
you
need
to
override
any
of
the
definitions
in
the
s
/*.
h
and
m
/*.
h
files
for
your
system
and
machine
,
do
so
by
editing
config
.
h
,
not
by
changing
the
s
/*.
h
and
m
/*.
h
files
.
Occasionally
you
may
need
to
redefine
parameters
used
in
`./
lib
-
src
/
movemail
.
c
'.
changing
the
s
/*.
h
and
m
/*.
h
files
.
3) Create src/Makefile and lib-src/Makefile from the corresponding
`Makefile.in'
files
.
First
copy
`
Makefile
.
in
' to `Makefile.c'
,
then
edit
in
appropriate
substitutions
for
the
@...@
constructs
,
and
then
copy
the
shell
commands
near
the
end
of
`
configure
'
that run cpp to construct `Makefile'
.
4
)
Create
`
Makefile
' files in various other directories
from the corresponding `Makefile.in'
files
.
This
isn
't so hard,
just a matter of substitution.
3
)
Create
`
Makefile
' files in various directories from the
corresponding `Makefile.in'
files
.
This
isn
't so hard, just a matter
of editing in appropriate substitutions for the @...@ constructs.
The `configure'
script
is
built
from
`
configure
.
in
' by the `autoconf'
program
.
You
need
version
2.51
or
newer
of
`
autoconf
' to rebuild
`configure
'
.
program
.
You
need
at
least
the
version
of
autoconf
specified
in
the
AC_PREREQ
(...)
command
to
rebuild
`
configure
' from `configure.in
'
.
BUILDING
GNU
EMACS
BY
HAND
...
...
admin/ChangeLog
View file @
478ebb73
2010-05-27 Glenn Morris <rgm@gnu.org>
* quick-install-emacs (AVOID): No more Makefile.c files.
* notes/cpp: Remove file.
2010-05-15 Ken Raeburn <raeburn@raeburn.org>
* admin.el (set-version, set-copyright): Update emacs.c instead of
...
...
admin/notes/cpp
deleted
100644 → 0
View file @
2b25da45
ttn 2003-04-09
we use a C preprocesor not only in the normal compilation of .c files
into object files, but also for creating src/Makefile.
(delimited by comment "start of cpp stuff"). some cpp implementations
insert whitespace in between tokens.
during makefile creation, the preprocessor symbol NOT_C_CODE is defined.
this should not be defined for normal .c file compilation.
there has been discussion on eliminating this use of cpp and relying
solely on autoconf processing. rms says to leave it be.
;;; arch-tag: d654291e-9fc8-41b7-ab0c-d3cde842a8e0
admin/quick-install-emacs
View file @
478ebb73
#!/bin/sh
### quick-install-emacs --- do a halfway-decent job of installing emacs quickly
## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
2010
## Free Software Foundation, Inc.
## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
##
2010
Free Software Foundation, Inc.
## Author: Miles Bader <miles@gnu.org>
...
...
@@ -31,7 +31,7 @@
PUBLIC_LIBSRC_BINARIES
=
'b2m emacsclient etags ctags ebrowse'
PUBLIC_LIBSRC_SCRIPTS
=
'grep-changelog rcs-checkin'
AVOID
=
"CVS -DIC README COPYING ChangeLog ~ [.]orig
$
[.]rej
$
Makefile
$
Makefile.in
$
Makefile.c
$
makefile
$
makefile.w32-in
$
stamp-subdir [.]cvsignore [.]arch-ids [{]arch[}] [.][cho]
$
make-docfile testfile test-distrib"
AVOID
=
"CVS -DIC README COPYING ChangeLog ~ [.]orig
$
[.]rej
$
Makefile
$
Makefile.in
$
makefile
$
makefile.w32-in
$
stamp-subdir [.]cvsignore [.]arch-ids [{]arch[}] [.][cho]
$
make-docfile testfile test-distrib"
# Prune old binaries lying around in the source tree
PRUNE
=
no
...
...
config.bat
View file @
478ebb73
...
...
@@ -190,11 +190,10 @@ rem On my system dir.h gets in the way. It's a VMS file so who cares.
if
exist
dir
.h
ren
dir
.h
vmsdir
.h
rem Create "makefile" from "makefile.in".
rm
-f
Makefile
junk
.c
junk2
.c
sed
-e
"1,/== start of cpp stuff ==/s@
^#
#*[ ].*$@@"
<
Makefile
.in
>
junk
.c
copy
junk
.c
+
deps
.mk
junk2
.c
gcc
-E -traditional
junk2
.c
|
sed
-f
../msdos/sed1v2.inp
>
Makefile
rm
-f
junk
.c
junk2
.c
rm
-f
Makefile
makefile
.tmp
copy
Makefile
.in
+
deps
.mk
makefile
.tmp
sed
-f
../msdos/sed1v2.inp
<
makefile
.tmp
>
Makefile
rm
-f
makefile
.tmp
if
"
%X1
1
%
"
==
""
goto
src5
mv
Makefile
makefile
.tmp
...
...
configure
View file @
478ebb73
...
...
@@ -720,8 +720,6 @@ DEPFLAGS
XMKMF
LD_SWITCH_X_SITE_AUX
LD_SWITCH_X_SITE_AUX_RPATH
NS_IMPL_GNUSTEP_INC
NS_IMPL_GNUSTEP_TEMACS_LDFLAGS
TEMACS_LDFLAGS2
NS_OBJ
NS_SUPPORT
...
...
@@ -820,7 +818,8 @@ CYGWIN_OBJ
PRE_ALLOC_OBJ
POST_ALLOC_OBJ
LD_SWITCH_SYSTEM_TEMACS
YMF_PASS_LDFLAGS
PRE_EDIT_LDFLAGS
POST_EDIT_LDFLAGS
LINKER
LIB_GCC
MOUSE_SUPPORT
...
...
@@ -9935,8 +9934,6 @@ fi
HAVE_NS=no
NS_IMPL_COCOA=no
NS_IMPL_GNUSTEP=no
NS_IMPL_GNUSTEP_INC=
NS_IMPL_GNUSTEP_TEMACS_LDFLAGS=
tmp_CPPFLAGS="$CPPFLAGS"
tmp_CFLAGS="$CFLAGS"
CPPFLAGS="$CPPFLAGS -x objective-c"
...
...
@@ -9955,22 +9952,18 @@ if test "${with_ns}" != no; then
ns_appbindir=${ns_appdir}
ns_appresdir=${ns_appdir}Resources
ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base
GNUSTEP_MAKEFILES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_MAKEFILES)"
GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)"
GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)"
GNUSTEP_SYSTEM_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_LIBRARIES)"
## Pull in stuff from GNUstep-make.
## FIXME? Cleaner to use AC_SUBST_FILE for this?
NS_IMPL_GNUSTEP_INC="FOUNDATION_LIB=gnu
GUI_LIB=gnu
include $GNUSTEP_MAKEFILES/Additional/base.make
include $GNUSTEP_MAKEFILES/Additional/gui.make
shared=no
"
NS_IMPL_GNUSTEP_TEMACS_LDFLAGS="-L${GNUSTEP_SYSTEM_LIBRARIES} -lgnustep-gui -lgnustep-base -lobjc \${CONFIG_SYSTEM_LIBS} -lpthread"
CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES}"
GNUSTEP_LOCAL_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_LOCAL_HEADERS)"
GNUSTEP_LOCAL_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_LOCAL_LIBRARIES)"
test "x${GNUSTEP_LOCAL_HEADERS}" != "x" && \
GNUSTEP_LOCAL_HEADERS="-I${GNUSTEP_LOCAL_HEADERS}"
test "x${GNUSTEP_LOCAL_LIBRARIES}" != "x" && \
GNUSTEP_LOCAL_LIBRARIES="-L${GNUSTEP_LOCAL_LIBRARIES}"
CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}"
CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}"
REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}"
LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES} ${GNUSTEP_LOCAL_LIBRARIES}"
LIB_STANDARD=
START_FILES=
TEMACS_LDFLAGS2=
...
...
@@ -10162,8 +10155,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
ns_frag=/dev/null
NS_OBJ=
NS_SUPPORT=
...
...
@@ -26634,6 +26625,11 @@ case "$opsys" in
*) LD_SWITCH_SYSTEM_TEMACS= ;;
esac
if test "$NS_IMPL_GNUSTEP" = "yes"; then
LD_SWITCH_SYSTEM_TEMACS="${LD_SWITCH_SYSTEM_TEMACS} -L${GNUSTEP_SYSTEM_LIBRARIES} ${GNUSTEP_LOCAL_LIBRARIES} -lgnustep-gui -lgnustep-base -lobjc -lpthread"
fi
LINKER=
...
...
@@ -26660,11 +26656,9 @@ case "$opsys" in
;;
esac
## A macro which other sections of Makefile can redefine to munge the
## flags before they are passed to LD. This is helpful if you have
## redefined LD to something odd, like "gcc".
## (The YMF prefix is a holdover from the old name "ymakefile".)
YMF_PASS_LDFLAGS=flags
PRE_EDIT_LDFLAGS=
POST_EDIT_LDFLAGS=
if test "x$ORDINARY_LINK" = "xyes"; then
LINKER="\$(CC)"
...
...
@@ -26692,21 +26686,23 @@ elif test "x$GCC" = "xyes" && test "x$LINKER" = "x"; then
## shell''s ``for'' construct. Note that sane people do not have '.' in
## their paths, so we must use ./prefix-args.
## TODO either make prefix-args check ORDINARY_LINK internally,
## or remove it altogether (bug#6184), removing the need for this macro.
YMF_PASS_LDFLAGS='`./prefix-args -Xlinker flags`'
## or remove it altogether (bug#6184), removing the need for this hack.
PRE_EDIT_LDFLAGS='`./prefix-args -Xlinker'
POST_EDIT_LDFLAGS='`'
fi
test "x$LINKER" = "x" && LINKER=ld
## FIXME? What setting of
YMF_PASS
_LDFLAGS should this have?
## FIXME? What setting of
EDIT
_LDFLAGS should this have?
test "$NS_IMPL_GNUSTEP" = "yes" && LINKER="\$(CC) -rdynamic"
## FIXME? The logic here is not precisely the same as that above
##
setting YMF_PASS_LDFLAGS.
There is no check here for a pre-defined
##
LINKER.
Should we only be setting LIB_GCC if LD ~ -nostdlib?
## FIXME? The logic here is not precisely the same as that above
.
## There is no check here for a pre-defined
LINKER.
## Should we only be setting LIB_GCC if LD ~ -nostdlib?
LIB_GCC=
if test "x$GCC" = "xyes" && test "x$ORDINARY_LINK" != "xyes"; then
...
...
@@ -26852,42 +26848,7 @@ test "${prefix}" != NONE &&
test "${exec_prefix}" != NONE &&
exec_prefix=`echo "${exec_prefix}" | sed 's,\([^/]\)/*$,\1,'`
# Now get this: Some word that is part of the ${srcdir} directory name
# or the ${configuration} value might, just might, happen to be an
# identifier like `sun4' or `i386' or something, and be predefined by
# the C preprocessor to some helpful value like 1, or maybe the empty
# string. Needless to say consequent macro substitutions are less
# than conducive to the makefile finding the correct directory.
# src/Makefile.in used to treat X11 as equivalent to HAVE_X11.
# But nothing in Emacs defines X11, and everywhere else uses HAVE_X11,
# so that cannot have been doing anything.
cpp_undefs="`echo $srcdir $configuration $canonical unix mktime register X11 |
sed -e 's/[^a-zA-Z0-9_]/ /g' -e 's/^/ /' -e 's/ *$//' \
-e 's/ */ -U/g' -e 's/-U[0-9][^ ]*//g'`"
## Check if the C preprocessor will convert `..' to `. .'. If so, set
## CPP_NEED_TRADITIONAL to `yes' so that the code to generate Makefile
## from Makefile.c can correctly provide the arg `-traditional' to the
## C preprocessor.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
yes..yes
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "yes..yes" >/dev/null 2>&1; then
CPP_NEED_TRADITIONAL=no
else
CPP_NEED_TRADITIONAL=yes
fi
rm -f conftest*
ac_config_files="$ac_config_files Makefile lib-src/Makefile oldXMenu/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile doc/lispref/Makefile src/Makefile.c:src/Makefile.in lwlib/Makefile lisp/Makefile leim/Makefile"
ac_config_files="$ac_config_files Makefile lib-src/Makefile oldXMenu/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile doc/lispref/Makefile src/Makefile lwlib/Makefile lisp/Makefile leim/Makefile"
ac_config_commands="$ac_config_commands default"
...
...
@@ -27474,7 +27435,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
#
# INIT-COMMANDS
#
GCC="$GCC" NON_GNU_CPP="$NON_GNU_CPP" CPP="$CPP" CPP
_NEED_TRADITIONAL="$CPP_NEED_TRADITIONAL" CPPFLAGS="$CPPFLAGS" cpp_undefs="$cpp_undefs
"
GCC="$GCC" NON_GNU_CPP="$NON_GNU_CPP" CPP="$CPP" CPP
FLAGS="$CPPFLAGS
"
_ACEOF
...
...
@@ -27492,7 +27453,7 @@ do
"doc/misc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/misc/Makefile" ;;
"doc/lispintro/Makefile") CONFIG_FILES="$CONFIG_FILES doc/lispintro/Makefile" ;;
"doc/lispref/Makefile") CONFIG_FILES="$CONFIG_FILES doc/lispref/Makefile" ;;
"src/Makefile
.c
") CONFIG_FILES="$CONFIG_FILES src/Makefile
.c:src/Makefile.in
" ;;
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"lwlib/Makefile") CONFIG_FILES="$CONFIG_FILES lwlib/Makefile" ;;
"lisp/Makefile") CONFIG_FILES="$CONFIG_FILES lisp/Makefile" ;;
"leim/Makefile") CONFIG_FILES="$CONFIG_FILES leim/Makefile" ;;
...
...
@@ -28158,35 +28119,9 @@ for dir in etc lisp ; do
test -d ${dir} || mkdir ${dir}
done
# Build src/Makefile from ${srcdir}/src/Makefile.c
# This must be done after src/config.h is built, since we rely on that file.
echo creating src/epaths.h
${MAKE-make} epaths-force
# As of 2000-11-19, newest development versions of GNU cpp preprocess
# `..' to `. .' unless invoked with -traditional
if test "x$GCC" = xyes && test "x$CPP_NEED_TRADITIONAL" = xyes; then
CPPFLAGS="$CPPFLAGS -traditional"
fi
echo creating src/Makefile
( cd src
rm -f junk.c junk1.c junk2.c
sed -e '/start of cpp stuff/q' \
< Makefile.c > junk1.c
sed -e '1,/start of cpp stuff/d'\
-e 's,/\*\*/#\(.*\)$,/* \1 */,' \
< Makefile.c > junk.c
$CPP -P $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c
cat junk1.c junk2.c > Makefile.new
rm -f junk.c junk1.c junk2.c
chmod 444 Makefile.new
mv -f Makefile.new Makefile
)
if test ! -f src/.gdbinit && test -f $srcdir/src/.gdbinit; then
echo creating src/.gdbinit
echo source $srcdir/src/.gdbinit > src/.gdbinit
...
...
configure.in
View file @
478ebb73
...
...
@@ -1468,8 +1468,6 @@ fi
HAVE_NS=no
NS_IMPL_COCOA=no
NS_IMPL_GNUSTEP=no
NS_IMPL_GNUSTEP_INC=
NS_IMPL_GNUSTEP_TEMACS_LDFLAGS=
tmp_CPPFLAGS="$CPPFLAGS"
tmp_CFLAGS="$CFLAGS"
CPPFLAGS="$CPPFLAGS -x objective-c"
...
...
@@ -1491,24 +1489,20 @@ if test "${with_ns}" != no; then
ns_appbindir=${ns_appdir}
ns_appresdir=${ns_appdir}Resources
ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base
dnl FIXME sourcing this 3 times in subshells seems inefficient.
GNUSTEP_MAKEFILES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_MAKEFILES)"
dnl FIXME sourcing this several times in subshells seems inefficient.
GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)"
GNUSTEP_SYSTEM_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_LIBRARIES)"
## Pull in stuff from GNUstep-make.
## FIXME? Cleaner to use AC_SUBST_FILE for this?
NS_IMPL_GNUSTEP_INC="FOUNDATION_LIB=gnu
GUI_LIB=gnu
include $GNUSTEP_MAKEFILES/Additional/base.make
include $GNUSTEP_MAKEFILES/Additional/gui.make
shared=no
"
dnl Presumably ${CONFIG_SYSTEM_LIBS} is defined by above includes.
NS_IMPL_GNUSTEP_TEMACS_LDFLAGS="-L${GNUSTEP_SYSTEM_LIBRARIES} -lgnustep-gui -lgnustep-base -lobjc \${CONFIG_SYSTEM_LIBS} -lpthread"
CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES}"
dnl I seemed to need these as well with GNUstep-startup 0.25.
GNUSTEP_LOCAL_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_LOCAL_HEADERS)"
GNUSTEP_LOCAL_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_LOCAL_LIBRARIES)"
test "x${GNUSTEP_LOCAL_HEADERS}" != "x" && \
GNUSTEP_LOCAL_HEADERS="-I${GNUSTEP_LOCAL_HEADERS}"
test "x${GNUSTEP_LOCAL_LIBRARIES}" != "x" && \
GNUSTEP_LOCAL_LIBRARIES="-L${GNUSTEP_LOCAL_LIBRARIES}"
CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}"
CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}"
REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}"
LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES} ${GNUSTEP_LOCAL_LIBRARIES}"
LIB_STANDARD=
START_FILES=
TEMACS_LDFLAGS2=
...
...
@@ -1525,8 +1519,6 @@ shared=no
NS_HAVE_NSINTEGER=no
fi
fi
AC_SUBST(NS_IMPL_GNUSTEP_INC)
AC_SUBST(NS_IMPL_GNUSTEP_TEMACS_LDFLAGS)
AC_SUBST(TEMACS_LDFLAGS2)
ns_frag=/dev/null
...
...
@@ -3311,6 +3303,11 @@ case "$opsys" in
*) LD_SWITCH_SYSTEM_TEMACS= ;;
esac
if test "$NS_IMPL_GNUSTEP" = "yes"; then
LD_SWITCH_SYSTEM_TEMACS="${LD_SWITCH_SYSTEM_TEMACS} -L${GNUSTEP_SYSTEM_LIBRARIES} ${GNUSTEP_LOCAL_LIBRARIES} -lgnustep-gui -lgnustep-base -lobjc -lpthread"
fi
AC_SUBST(LD_SWITCH_SYSTEM_TEMACS)
...
...
@@ -3338,11 +3335,9 @@ case "$opsys" in
;;
esac
## A macro which other sections of Makefile can redefine to munge the
## flags before they are passed to LD. This is helpful if you have
## redefined LD to something odd, like "gcc".
## (The YMF prefix is a holdover from the old name "ymakefile".)
YMF_PASS_LDFLAGS=flags
PRE_EDIT_LDFLAGS=
POST_EDIT_LDFLAGS=
if test "x$ORDINARY_LINK" = "xyes"; then
LINKER="\$(CC)"
...
...
@@ -3366,21 +3361,23 @@ elif test "x$GCC" = "xyes" && test "x$LINKER" = "x"; then
## shell''s ``for'' construct. Note that sane people do not have '.' in
## their paths, so we must use ./prefix-args.
## TODO either make prefix-args check ORDINARY_LINK internally,
## or remove it altogether (bug#6184), removing the need for this macro.
YMF_PASS_LDFLAGS='`./prefix-args -Xlinker flags`'
## or remove it altogether (bug#6184), removing the need for this hack.
PRE_EDIT_LDFLAGS='`./prefix-args -Xlinker'
POST_EDIT_LDFLAGS='`'
fi
AC_SUBST(YMF_PASS_LDFLAGS)
AC_SUBST(PRE_EDIT_LDFLAGS)
AC_SUBST(POST_EDIT_LDFLAGS)
test "x$LINKER" = "x" && LINKER=ld
## FIXME? What setting of
YMF_PASS
_LDFLAGS should this have?
## FIXME? What setting of
EDIT
_LDFLAGS should this have?
test "$NS_IMPL_GNUSTEP" = "yes" && LINKER="\$(CC) -rdynamic"
AC_SUBST(LINKER)
## FIXME? The logic here is not precisely the same as that above
##
setting YMF_PASS_LDFLAGS.
There is no check here for a pre-defined
##
LINKER.
Should we only be setting LIB_GCC if LD ~ -nostdlib?
## FIXME? The logic here is not precisely the same as that above
.
## There is no check here for a pre-defined
LINKER.
## Should we only be setting LIB_GCC if LD ~ -nostdlib?
LIB_GCC=
if test "x$GCC" = "xyes" && test "x$ORDINARY_LINK" != "xyes"; then
...
...
@@ -3758,32 +3755,9 @@ fi
test "${exec_prefix}" != NONE &&
exec_prefix=`echo "${exec_prefix}" | sed 's,\([^/]\)/*$,\1,'`]
# Now get this: Some word that is part of the ${srcdir} directory name
# or the ${configuration} value might, just might, happen to be an
# identifier like `sun4' or `i386' or something, and be predefined by
# the C preprocessor to some helpful value like 1, or maybe the empty
# string. Needless to say consequent macro substitutions are less
# than conducive to the makefile finding the correct directory.
# src/Makefile.in used to treat X11 as equivalent to HAVE_X11.
# But nothing in Emacs defines X11, and everywhere else uses HAVE_X11,
# so that cannot have been doing anything.
[cpp_undefs="`echo $srcdir $configuration $canonical unix mktime register X11 |
sed -e 's/[^a-zA-Z0-9_]/ /g' -e 's/^/ /' -e 's/ *$//' \
-e 's/ */ -U/g' -e 's/-U[0-9][^ ]*//g'`"]
## Check if the C preprocessor will convert `..' to `. .'. If so, set
## CPP_NEED_TRADITIONAL to `yes' so that the code to generate Makefile
## from Makefile.c can correctly provide the arg `-traditional' to the
## C preprocessor.
AC_EGREP_CPP(yes..yes,
[yes..yes],
CPP_NEED_TRADITIONAL=no,
CPP_NEED_TRADITIONAL=yes)
AC_OUTPUT(Makefile lib-src/Makefile oldXMenu/Makefile \
doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile \
doc/lispref/Makefile src/Makefile
.c:src/Makefile.in
\
doc/lispref/Makefile src/Makefile \
lwlib/Makefile lisp/Makefile leim/Makefile, [
### Make the necessary directories, if they don't exist.
...
...
@@ -3791,41 +3765,15 @@ for dir in etc lisp ; do
test -d ${dir} || mkdir ${dir}
done
# Build src/Makefile from ${srcdir}/src/Makefile.c
# This must be done after src/config.h is built, since we rely on that file.
echo creating src/epaths.h
${MAKE-make} epaths-force
# As of 2000-11-19, newest development versions of GNU cpp preprocess
# `..' to `. .' unless invoked with -traditional
if test "x$GCC" = xyes && test "x$CPP_NEED_TRADITIONAL" = xyes; then
CPPFLAGS="$CPPFLAGS -traditional"
fi
echo creating src/Makefile
( cd src
rm -f junk.c junk1.c junk2.c
sed -e '/start of cpp stuff/q' \
< Makefile.c > junk1.c
sed -e '1,/start of cpp stuff/d'\
-e 's,/\*\*/#\(.*\)$,/* \1 */,' \
< Makefile.c > junk.c
$CPP -P $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c
cat junk1.c junk2.c > Makefile.new
rm -f junk.c junk1.c junk2.c
chmod 444 Makefile.new
mv -f Makefile.new Makefile
)
if test ! -f src/.gdbinit && test -f $srcdir/src/.gdbinit; then
echo creating src/.gdbinit
echo source $srcdir/src/.gdbinit > src/.gdbinit
fi
], [GCC="$GCC" NON_GNU_CPP="$NON_GNU_CPP" CPP="$CPP" CPP
_NEED_TRADITIONAL="$CPP_NEED_TRADITIONAL" CPPFLAGS="$CPPFLAGS" cpp_undefs="$cpp_undefs
"])
], [GCC="$GCC" NON_GNU_CPP="$NON_GNU_CPP" CPP="$CPP" CPP
FLAGS="$CPPFLAGS
"])
m4_if(dnl Do not change this comment
arch-tag: 156a4dd5-bddc-4d18-96ac-f37742cf6a5e
...
...
doc/misc/ChangeLog
View file @
478ebb73
2010-05-26 Michael Albinus <michael.albinus@gmx.de>
* eshell.texi (Built-ins): Describe, how to disable a built-in command
by an alias. (Bug#6226)
2010-05-16 Jay Belanger <jay.p.belanger@gmail.com>
* calc.texi (Manipulating Vectors): Mention that vectors can
...
...
doc/misc/eshell.texi
View file @
478ebb73
...
...
@@ -369,6 +369,17 @@ eshell/ls is a compiled Lisp function in `em-ls.el'
/
bin
/
ls
@
end
example
If
you
want
to
discard
a
given
built
-
in
command
,
you
could
declare
an
alias
,
@
ref
{
Aliases
}.
Eample
:
@
example
~
$
which
sudo
eshell
/
sudo
is
a
compiled
Lisp
function
in
`
em
-
unix
.
el
'
~ $ alias sudo '
*
sudo
$*
'
~ $ which sudo
sudo is an alias, defined as "*sudo $*"
@end example
Some of the built-in commands have a special behaviour in Eshell:
@table @code
...
...
etc/ChangeLog
View file @
478ebb73
2010-05-27 Glenn Morris <rgm@gnu.org>
* PROBLEMS: Remove old information no longer of relevance.
2010-05-24 Stefan Monnier <monnier@iro.umontreal.ca>
* NEWS: Add sections for Emacs-23.3.
...
...
etc/MACHINES
View file @
478ebb73
...
...
@@ -198,8 +198,7 @@ IBM RS/6000 (rs6000-ibm-aix*)
IBM System/390 running GNU/Linux (s390-*-linux-gnu)
As of Emacs 21.2, a 31-bit only version is supported on this
system.
As of Emacs 21.2, a 31-bit only version is supported on this system.
Intel 386 (i386-*-freebsd, i386-*-linux-gnu,
i386-*-sol2.4, i386-intsys-sysv,
...
...
@@ -247,11 +246,6 @@ Intel 386 (i386-*-freebsd, i386-*-linux-gnu,
do `gmake install MAKE=gmake'. However, more recently it is
reported that using the system Make on NetBSD 1.3.1 works ok.
If you are using System V release 4.2, you may find that `cc -E'
puts spurious spaces in `src/xmakefile'. If that happens,
specify CPP=/lib/cpp as an option when you run make.
There is no problem if you compile with GCC.
Note that use of Linux with GCC 2.4 and the DLL 4.4 libraries
requires the experimental "net 2" network patches (no relation to
Berkeley Net 2). There is a report that (some version of) Linux
...
...
@@ -491,10 +485,6 @@ System V rel 4.0.3 and 4.0.4 (usg5.4)
If you get compilation errors about wrong number of
arguments to getpgrp, define GETPGRP_NO_ARG.
The standard C preprocessor may generate xmakefile incorrectly. However,
/lib/cpp will work, so use `make CPP=/lib/cpp'. Standard cpp
seems to work OK under Dell 2.2.
Some versions 3 and earlier of V.4, on the Intel 386 and 860, had
problems in the X11 libraries. These prevent Emacs from working
with X. You can use Emacs with X provided your copy of X is based
...
...
etc/PROBLEMS
View file @
478ebb73
This diff is collapsed.
Click to expand it.
lib-src/ChangeLog
View file @
478ebb73
2010-05-27 Glenn Morris <rgm@gnu.org>
* Makefile.in (distclean): No more Makefile.c.
2010-05-22 Jan Djärv <jan.h.d@swipnet.se>
* Makefile.in (STAMP_INST_SCRIPTS, STAMP_SCRIPS): New (Bug #6246).
...
...
lib-src/Makefile.in
View file @
478ebb73
...
...
@@ -283,7 +283,7 @@ clean: mostlyclean
distclean
:
clean
-
rm
-f
TAGS
-
rm
-f
Makefile
Makefile.c
blessmail
-
rm
-f
Makefile blessmail
maintainer-clean
:
distclean
true
...
...
lisp/ChangeLog
View file @
478ebb73
...
...
@@ -3,12 +3,34 @@
* language/hebrew.el (hebrew-shape-gstring): Check if a glyph
element of GSTRING is nil.
2010-05-27 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/smie.el (smie-forward-token-function)
(smie-backward-token-function): New vars.
(smie-backward-sexp, smie-forward-sexp)
(smie-indent-hanging-p, smie-indent-calculate): Use them.
(smie-default-backward-token): Rename from smie-backward-token and
skip comments.
(smie-default-forward-token): Rename from smie-forward-token and