Commit d235ca2f authored by Miles Bader's avatar Miles Bader
Browse files

Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-324
parents 3709a060 02cbe062
2008-01-29 Dan Nicolaescu <dann@ics.uci.edu>
* configure.in (xtensa): Match more configurations.
* configure: Regenerate.
2008-01-27 Dan Nicolaescu <dann@ics.uci.edu>
* configure.in: Update comment.
2008-01-26 Glenn Morris <rgm@gnu.org>
* configure.in (--without-gcc): By default, neither off nor on.
(--with-carbon): Tone down rhetoric in help text.
2008-01-25 Glenn Morris <rgm@gnu.org>
* configure.in: Correct usage of OPTION_DEFAULT_ON,
OPTION_DEFAULT_OFF so that the defaults are as they used to be.
Default `Carbon' to off (it's unsupported).
2008-01-24 Glenn Morris <rgm@gnu.org>
* configure.in: Standardize dbus-related messages.
2008-01-23 Michael Olson <mwolson@gnu.org>
* configure.in (pkg-config-prog): Remove initial whitespace.
2008-01-23 Tom Tromey <tromey@redhat.com>
* configure.in (OPTION_DEFAULT_ON, OPTION_DEFAULT_OFF): New macros.
(EMACS_ARG_Y, EMACS_ARG_N): Remove.
Update all users.
2008-01-21 Dan Nicolaescu <dann@ics.uci.edu>
* config.guess, config.sub: Updated from master source.
2008-01-17 Andreas Schwab <schwab@suse.de>
* configure.in (HAVE_LIB64_DIR): Rename from HAVE_X86_64_LIB64_DIR.
2008-01-17 Glenn Morris <rgm@gnu.org>
* configure.in (HAVE_X86_64_LIB64_DIR): Also set on s390x systems.
2008-01-16 Dan Nicolaescu <dann@ics.uci.edu>
* configure.in: Remove more references to unsupported systems.
2008-01-16 Sven Joachim <svenjoac@gmx.de>
* make-dist: Add --lzma.
2008-01-16 Glenn Morris <rgm@gnu.org>
* Makefile.in (maybe_bootstrap): Remove texinfo message, since
configure checks for this.
2008-01-13 Dan Nicolaescu <dann@ics.uci.edu>
* configure.in: Remove more references to unsupported systems.
2008-01-06 Romain Francoise <romain@orebokech.com>
* configure.in: Delete extra semicolons.
......
......@@ -802,7 +802,6 @@ maybe_bootstrap:
if [ \( "$$bar" = '$(srcdir)/lisp/*.elc' \) -o \( "$$bar" = '' \) ]; then \
echo "Your tree does not include the compiled Lisp files."; \
echo "You need to do \`make bootstrap' to build Emacs."; \
echo "Emacs now requires Texinfo version 4.2."; \
exit 1;\
fi
......
......@@ -3,10 +3,9 @@ of their use. Feel free to add more macros and more categories.
** Distinguishing OSes **
MAC_OS Compiling for some version of Mac OS?
MAC_OS8 Compiling for Mac OS version 8. Requires MAC_OS?
MAC_OSX Compiling for Mac OS X? Is that also valid for Darwin?
MAC_OS_X ?? Apparently only used once in mac.c.
MAC_OS Compiling for the `mac' window-system.
MAC_OS8 Compiling for Mac OS Classic (v8 or v9).
MAC_OSX Compiling for Mac OS X. Not bare Darwin.
CYGWIN Compiling the Cygwin port.
__CYGWIN__ Ditto
MSDOS Compiling the MS-DOS port.
......@@ -44,25 +43,9 @@ REL_ALLOC Compile in the relocatable memory allocator ralloc.c.
SYSTEM_MALLOC Use the system library's malloc.
** All references to these symbols should be removed, all their definitions are gone **
ALLIANT
ALLIANT_2800
ALTOS
APOLLO
APOLLO_SR10
RTU
STRIDE
UNIPLUS
GOULD
NU
pyramid
sps7
tahoe
tek4300
__DGUX
DGUX
romp
ibmrt
NEWSOS5
** Temporarily put defines from removed files here, check if these macros need to be documented or removed because they are not used anymore. **
......@@ -77,7 +60,6 @@ BAUD_CONVERT
BROKEN_FIONREAD
BROKEN_SELECT_NON_X
BROKEN_SIGIO
BROKEN_START
BROKEN_TIOCGETC
BROKEN_TIOCGWINSZ
BSD4_2
......@@ -110,9 +92,6 @@ DOT_GLOBAL_START
DUMMIES
EEOF
ELF
ERROR0
ERROR1
ERROR2
EXEC_HDR_TYPE
EXEC_MAGIC
EXEC_PAGESIZE
......@@ -122,6 +101,7 @@ FIRST_PTY_LETTER
FREE_RETURN_TYPE
FSCALE
F_SETOWN_BUG
F_SETOWN_SOCK_NEG
GC_MARK_STACK
GC_SETJMP_WORKS
GETPGRP_NO_ARG
......@@ -166,8 +146,6 @@ IRIS
IRIS_4D
IRIX6_5
IRIX_FORCE_32_BITS
ISC4_0
ISI68K
KEEP_OLD_PADDR
KEEP_OLD_TEXT_SCNPTR
KERNEL_FILE
......@@ -190,19 +168,15 @@ LIB_X11_LIB
LINKER
LOAD_AVE_CVT
LOAD_AVE_TYPE
LONG_ALIGN
L_SET
MAIL_PROGRAM_NAME
MAIL_USE_FLOCK
MAKE_PARALLEL
MAXNAMLEN
MEMMOVE_MISSING
MEMORY_IN_STRING_H
MKDIR_PROTOTYPE
MOTIF
M_TERMINFO
NARROWPROTO
NBPC
NEED_ERRNO
NEED_NET_ERRNO_H
NEED_PTEM_H
......@@ -221,14 +195,13 @@ NO_PTY_H
NO_REMAP
NO_SIOCTL_H
NO_SOCKETS_IN_FILE_SYSTEM
NO_SOCK_SIGIO
NO_TERMIO
NO_UNION_TYPE
NO_UNION_TYPE
NSIG
NSIG_MINIMUM
OBJECTS_MACHINE
OLDXMENU_OPTIONS
OLD_PROGRAM_H
OLD_SECTION_H
ORDINARY_LINK
OSF1
O_NDELAY
......@@ -239,16 +212,12 @@ PNTR_COMPARISON_TYPE
POSIX_SIGNALS
PREFER_VSUSP
PTY_ITERATION
PTY_MAJOR
PTY_MINOR
PTY_NAME_SPRINTF
PTY_OPEN
PTY_TTY_NAME_SPRINTF
PURESIZE
READ
REL_ALLOC
RISCiX
RISCiX_1_1
RUN_TIME_REMAP
SECTION_ALIGNMENT
SEEK
......@@ -266,7 +235,6 @@ SKTPAIR
SMAIL
START_FILES
SUNOS4
SUNOS4_SHARED_LIBRARIES
SUNOS_LOCALTIME_BUG
SVR4
SWITCH_ENUM_BUG
......@@ -281,7 +249,6 @@ S_IFLNK
S_IFMT
S_IREAD
S_IWRITE
TAHOE_REGISTER_BUG
TERMCAP
TERMINFO
TEXT_END
......@@ -290,8 +257,6 @@ TEXT_START_ADDR
THIS_IS_MAKEFILE
TPIX
ULIMIT_BREAK_VALUE
UMAX
UMAX4_2
UNEXEC
USE_DL_STUBS
USE_GETOBAUD
......@@ -303,20 +268,17 @@ USG5_3
USG5_4
USG_JOBCTRL
USG_SHARED_LIBRARIES
V3x
VIRT_ADDR_VARIES
WORDS_BIG_ENDIAN
WORD_MACHINE
WRITE
X11R4
XENIX
XICCC
XINT
XSET
XUINT
X_DEFAULT_FONT
_ABIN32
_CX_UX
_MIPS_SZLONG
_POSIX_SOURCE
__main
......@@ -325,15 +287,10 @@ _setjmp
_sobuf
aix386
alloca
amdahl_uts
aouthdr
celerity
clipper
convex
data_start
drem
dsize
elxsi
emacs
entry
etext
......@@ -348,17 +305,12 @@ jmp_buf
longjmp
m68000
m68k
m88k
magic
mc68000
mips
orion
sel
subprocesses
sun
sun_68881
sun_fpa
sun_soft
text_start
# arch-tag: bc80061a-1168-4911-9766-46aaf2640250
......@@ -96,29 +96,23 @@ minimized. I don't know what is left to do here.
** sdl.web@gmail.com, 30 Oct: ps-lpr-switches has no effect
** Stephen.Berman@gmx.net: minibuffer and current-local-map
** timh@insightful.com, 9 Nov: X-coding-system incompatibility, and workaround
** Get rid of old-style backquotes in cc-vars.el.
ttn has a patch:
http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg02052.html
** Fix or document the shortcoming of easymenu and :suffix.
http://lists.gnu.org/archive/html/emacs-devel/2007-11/msg01857.html
** Fix problem with mode-name in SGML mode.
If mode-name stays non-string, add NEWS entry and doc fix.
http://lists.gnu.org/archive/html/emacs-devel/2007-11/msg02048.html
** pot@gnu.org, 17 Dec: strange From line maker rmail-reply loop
** multi-tty does not work correctly.
If the server is started from a tty frame and emacsclient creates an
X11 frame, the tty frame gets confused, it thinks it is an X11 frame
when trying to do a C-z. This worked with server.el version 1.136, it
broke after that.
http://lists.gnu.org/archive/html/emacs-devel/2007-12/msg00545.html
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
* DOCUMENTATION
......
......@@ -21,8 +21,8 @@ For each step, check for possible errors.
5. rm configure; make bootstrap
6. Commit configure, README, etc/AUTHORS, lisp/finder-inf.el,
lisp/version.el, man/emacs.texi, lispref/elisp.texi,
6. Commit configure, README, doc/emacs/emacs.texi,
doc/lispref/elisp.texi, etc/AUTHORS, lisp/version.el,
mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings,
mac/src/Emacs.r, nt/emacs.rc. Copy lisp/loaddefs.el to
lisp/ldefs-boot.el and commit lisp/ldefs-boot.el. For a release,
......@@ -73,9 +73,9 @@ For each step, check for possible errors.
ftp://alpha.gnu.org/gnu/emacs/pretest/ for a pretest, at
ftp://ftp.gnu.org/gnu/emacs/ for a release.
14. For a pretest, let Richard Stallman <rms@gnu.org> know about the new pretest and
tell him to announce it using the announcement you prepared. Remind
him to set a Reply-to header to <emacs-pretest-bug@gnu.org>.
14. For a pretest, let Richard Stallman <rms@gnu.org> know about the new
pretest and tell him to announce it using the announcement you prepared.
Remind him to set a Reply-to header to <emacs-pretest-bug@gnu.org>.
15. Shortly before the release, cut the branch with the following commands:
......
Some lisp/emacs-lisp/ Features and Where They Are Documented
Copyright (C) 2007 Free Software Foundation, Inc.
Copyright (C) 2007, 2008 Free Software Foundation, Inc.
See the end of the file for license conditions.
* Status Key
......@@ -102,6 +104,24 @@ Copyright (C) 2007 Free Software Foundation, Inc.
* Etc
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.
Local variables:
mode: outline
End:
-*- coding: utf-8; mode: text; -*-
Copyright (C) 2007, 2008 Free Software Foundation, Inc.
See the end of the file for license conditions.
From README.multi-tty in the multi-tty branch.
Some of this information may be out of date.
......
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006, 2007
# Free Software Foundation, Inc.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
timestamp='2007-02-26'
timestamp='2008-01-08'
# 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
......@@ -56,8 +56,8 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
......@@ -330,7 +330,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
i86pc:SunOS:5.*:*)
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:6*:*)
......@@ -532,7 +532,7 @@ EOF
echo rs6000-ibm-aix3.2
fi
exit ;;
*:AIX:*:[45])
*:AIX:*:[456])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
......@@ -791,12 +791,18 @@ EOF
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
x86:Interix*:[3456]*)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
EM64T:Interix*:[3456]* | authenticamd:Interix*:[3456]*)
echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
*:Interix*:[3456]*)
case ${UNAME_MACHINE} in
x86)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
EM64T | authenticamd)
echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
IA64)
echo ia64-unknown-interix${UNAME_RELEASE}
exit ;;
esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
......@@ -830,7 +836,14 @@ EOF
echo ${UNAME_MACHINE}-pc-minix
exit ;;
arm*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
eval $set_cc_for_build
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_EABI__
then
echo ${UNAME_MACHINE}-unknown-linux-gnu
else
echo ${UNAME_MACHINE}-unknown-linux-gnueabi
fi
exit ;;
avr32*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
......@@ -951,8 +964,8 @@ EOF
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
xtensa:Linux:*:*)
echo xtensa-unknown-linux-gnu
xtensa*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
......
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006, 2007
# Free Software Foundation, Inc.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
timestamp='2007-02-26'
timestamp='2008-01-16'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
......@@ -72,8 +72,8 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\
GNU config.sub ($timestamp)
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
......@@ -369,10 +369,14 @@ case $basic_machine in
| v850-* | v850e-* | vax-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
| xstormy16-* | xtensa-* \
| xstormy16-* | xtensa*-* \
| ymp-* \
| z8k-*)
;;
# Recognize the basic CPU types without company name, with glob match.
xtensa*)
basic_machine=$basic_machine-unknown
;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
386bsd)
......@@ -443,6 +447,14 @@ case $basic_machine in
basic_machine=ns32k-sequent
os=-dynix
;;
blackfin)
basic_machine=bfin-unknown
os=-linux
;;
blackfin-*)
basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
os=-linux
;;
c90)
basic_machine=c90-cray
os=-unicos
......@@ -475,8 +487,8 @@ case $basic_machine in
basic_machine=craynv-cray
os=-unicosmp
;;
cr16c)
basic_machine=cr16c-unknown
cr16)
basic_machine=cr16-unknown
os=-elf
;;
crds | unos)
......@@ -668,6 +680,14 @@ case $basic_machine in
basic_machine=m68k-isi
os=-sysv
;;
m68knommu)
basic_machine=m68k-unknown
os=-linux
;;
m68knommu-*)
basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
os=-linux
;;
m88k-omron*)
basic_machine=m88k-omron
;;
......@@ -683,6 +703,10 @@ case $basic_machine in
basic_machine=i386-pc
os=-mingw32
;;
mingw32ce)
basic_machine=arm-unknown
os=-mingw32ce
;;
miniframe)
basic_machine=m68000-convergent
;;
......@@ -809,6 +833,14 @@ case $basic_machine in
basic_machine=i860-intel
os=-osf
;;
parisc)
basic_machine=hppa-unknown
os=-linux
;;
parisc-*)
basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
os=-linux
;;
pbd)
basic_machine=sparc-tti
;;
......@@ -1017,6 +1049,10 @@ case $basic_machine in
basic_machine=tic6x-unknown
os=-coff
;;
tile*)
basic_machine=tile-unknown
os=-linux-gnu
;;
tx39)
basic_machine=mipstx39-unknown
;;
......
This diff is collapsed.
......@@ -43,48 +43,68 @@ gamedir='${localstatedir}/games/emacs'
gameuser=games
dnl Autoconf is so much less fun under VMS, maybe
dnl because everything is less fun under VMS. --ttn
AC_DEFUN([EMACS_ARG_Y],[dnl
AC_ARG_WITH([$1],[AS_HELP_STRING([--with-$1],[$2])],[$3],[$4])dnl
dnl OPTION_DEFAULT_OFF(NAME, HELP-STRING)
dnl Create a new --with option that defaults to being disabled.
dnl NAME is the base name of the option. The shell variable with_NAME
dnl will be set to either the user's value (if the option is
dnl specified; 'yes' for a plain --with-NAME) or to 'no' (if the
dnl option is not specified). Note that the shell variable name is
dnl constructed as autoconf does, by replacing non-alphanumeric
dnl characters with "_".
dnl HELP-STRING is the help text for the option.
AC_DEFUN([OPTION_DEFAULT_OFF], [dnl
AC_ARG_WITH([$1],[AS_HELP_STRING([--with-$1],[$2])],[],[dnl
m4_bpatsubst([with_$1], [[^0-9a-z]], [_])=no])dnl
])dnl
AC_DEFUN([EMACS_ARG_N],[dnl
AC_ARG_WITH([$1],[AS_HELP_STRING([--without-$1],[$2])],[$3],[$4])dnl
dnl OPTION_DEFAULT_ON(NAME, HELP-STRING)
dnl Create a new --with option that defaults to being enabled. NAME
dnl is the base name of the option. The shell variable with_NAME
dnl will be set either to 'no' (for a plain --without-NAME) or to
dnl 'yes' (if the option is not specified). Note that the shell
dnl variable name is constructed as autoconf does, by replacing
dnl non-alphanumeric characters with "_".
dnl HELP-STRING is the help text for the option.
AC_DEFUN([OPTION_DEFAULT_ON], [dnl
AC_ARG_WITH([$1],[AS_HELP_STRING([--without-$1],[$2])],[],[dnl
m4_bpatsubst([with_$1], [[^0-9a-z]], [_])=yes])dnl
])dnl
EMACS_ARG_N([gcc],[don't use GCC to compile Emacs if GCC is found])
dnl By default, neither off nor on.
AC_ARG_WITH([gcc],
[AS_HELP_STRING([--without-gcc],
[don't use GCC to compile Emacs even if GCC is found])])
EMACS_ARG_N([pop],[don't support POP mail retrieval with movemail],
[if test "$withval" = yes; then