Commit 0bd50841 authored by Miles Bader's avatar Miles Bader

Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-294
parents 98fe991d 9fb1ba80
2007-12-06 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* configure.in: Add AC_CONFIG_SRCDIR which was lost in the previous
change.
2007-12-04 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* configure.in: Give package name and verision to AC_INIT.
2007-12-03 Magnus Henoch <mange@freemail.hu>
* configure.in: Use PKG_CHECK_MODULES to check for D-Bus.
* configure: Regenerate.
2007-12-03 Michael Albinus <michael.albinus@gmx.de>
* configure.in: No need for DBUS_INFO anymore.
* configure: Regenerate.
* Makefile.in (INFO_FILES): Use dbus unconditionally.
2007-12-02 Michael Albinus <michael.albinus@gmx.de>
* configure.in: Add D-Bus checks. D-Bus is disabled by default.
* configure: Regenerate.
* Makefile.in (INFO_FILES): Add dbus.
2007-12-02 Romain Francoise <romain@orebokech.com>
* make-dist: Fix last change.
2007-11-28 Petr Salinger <Petr.Salinger@seznam.cz> (tiny change)
* configure.in: Add support for gnu-kfreebsd.
2007-11-28 Glenn Morris <rgm@gnu.org>
* make-dist: Add etc/nxml.
2007-11-24 Romain Francoise <romain@orebokech.com>
* Makefile.in (INFO_FILES): Add nxml-mode.
2007-11-23 Romain Francoise <romain@orebokech.com>
* make-dist: Include nXML. Don't try to copy FTP, it was removed on
2007/10/17. Don't special-case alloca.c which is no longer in CVS.
2007-11-20 Andreas Schwab <schwab@suse.de>
* configure.in: Always include <resolv.h> when checking for
res_init.
2007-11-17 Andreas Schwab <schwab@suse.de>
* update-subdirs: Atomically update subdirs.el.
2007-11-17 Glenn Morris <rgm@gnu.org>
* Makefile.in (check-declare): New target.
2007-11-07 Glenn Morris <rgm@gnu.org>
* configure.in: Deprecate Mac Carbon port.
......
......@@ -138,11 +138,11 @@ man1dir=$(mandir)/man1
# since there are now many packages documented with the texinfo
# system, it is inappropriate to imply that it is part of Emacs.
infodir=@infodir@
INFO_FILES=ada-mode autotype calc ccmode cl dired-x ebrowse ediff efaq \
eintr elisp emacs emacs-mime erc eshell eudc flymake forms \
gnus idlwave info message mh-e newsticker org pcl-cvs pgg \
rcirc reftex remember sc ses sieve speedbar tramp vip viper \
widget woman smtpmail url
INFO_FILES=ada-mode autotype calc ccmode cl dbus dired-x ebrowse ediff \
efaq eintr elisp emacs emacs-mime erc eshell eudc flymake \
forms gnus idlwave info message mh-e newsticker nxml-mode \
org pcl-cvs pgg rcirc reftex remember sc ses sieve speedbar \
tramp vip viper widget woman smtpmail url
# Directory for local state files for all programs.
localstatedir=@localstatedir@
......@@ -424,7 +424,7 @@ install-arch-dep: mkdir
## Note that the Makefiles in the etc directory are potentially useful
## in an installed Emacs, so should not be excluded.
## installuser:
## installuser:
## http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg01672.html
## Nuisance because i) it needs to be the user running install, so
## configure can't set it; ii) can't (?) use the result of rule
......@@ -811,3 +811,13 @@ bootstrap-clean-before-fast: FRC
-(cd doc/lispref && $(MAKE) $(MFLAGS) clean)
-(cd doc/lispintro && $(MAKE) $(MFLAGS) clean)
(cd leim; $(MAKE) $(MFLAGS) clean)
.PHONY: check-declare
check-declare:
@if [ ! -e $(srcdir)/src/emacs ]; then \
echo "You must build Emacs to use this command"; \
exit 1; \
fi
(cd leim; $(MAKE) $(MFLAGS) $@)
(cd lisp; $(MAKE) $(MFLAGS) $@)
2007-12-05 Glenn Morris <rgm@gnu.org>
* admin.el (set-version): Handle configure.in. Adapt for doc/
directory layout for manuals.
2007-12-01 Reiner Steib <Reiner.Steib@gmx.de>
* FOR-RELEASE: Remove Gnus send mail problem. Other Gnus bugs
have been fixed in Gnus CVS but have not yet been synched to
Emacs.
2007-11-17 Glenn Morris <rgm@gnu.org>
* admin.el (process-lines): Move to ../lisp/subr.el.
2007-10-23 Glenn Morris <rgm@gnu.org>
* MAINTAINERS: Move here from ../.
......
......@@ -89,23 +89,31 @@ http://lists.gnu.org/archive/html/emacs-devel/2007-05/msg00209.html
** menu indications of key bindings for remapped commands
http://lists.gnu.org/archive/html/emacs-devel/2007-05/msg01339.html
** tromey@redhat.com: two View-mode "quit" bugs
http://lists.gnu.org/archive/html/emacs-devel/2007-07/msg00103.html
** rms: gnus-dired.el is a mistake. Those features should not
be part of Gnus. They should be moved to some other part of Emacs.
** C-x v v no longer works the way it used to
http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg00785.html
** sdl.web@gmail.com, 28 Oct: window-system in face definition
** Gnus archive groups are not shown at all if they are not at the default level.
Fixed in Gnus CVS, but the patch has not been synched to Emacs yet:
http://thread.gmane.org/gmane.emacs.gnus.general/65622/focus=65757
** vc-diff no longer works the way it used to
http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg01753.html
(vc-revert also needs the repository now with CVS)
** Extra question asked when doing a reply in Gnus
Fixed in Gnus CVS, but the patch has not been synched to Emacs yet:
http://thread.gmane.org/gmane.emacs.gnus.general/65627/65768
** sdl.web@gmail.com, 28 Oct: window-system in face definition
** 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
** add README files for etc/gnus, etc/images/smilies/medium,grayscale
update etc/images README files with any new images
** Fix or document the shortcoming of easymenu and :suffix.
http://lists.gnu.org/archive/html/emacs-devel/2007-11/msg01857.html
* DOCUMENTATION
......
......@@ -29,23 +29,6 @@
;;; Code:
(defun process-lines (program &rest args)
"Execute PROGRAM with ARGS, returning its output as a list of lines.
Signal an error if the program returns with a non-zero exit status."
(with-temp-buffer
(let ((status (apply 'call-process program nil (current-buffer) nil args)))
(unless (eq status 0)
(error "%s exited with status %s" program status))
(goto-char (point-min))
(let (lines)
(while (not (eobp))
(setq lines (cons (buffer-substring-no-properties
(line-beginning-position)
(line-end-position))
lines))
(forward-line 1))
(nreverse lines)))))
(defun add-release-logs (root version)
"Add \"Version VERSION released.\" change log entries in ROOT.
Root must be the root of an Emacs source tree."
......@@ -85,10 +68,14 @@ Root must be the root of an Emacs source tree."
(set-version-in-file root "README" version
(rx (and "version" (1+ space)
(submatch (1+ (in "0-9."))))))
(set-version-in-file root "man/emacs.texi" version
(set-version-in-file root "configure.in" version
(rx (and "AC_INIT" (1+ (not (in ?,)))
?, (0+ space)
(submatch (1+ (in "0-9."))))))
(set-version-in-file root "doc/emacs/emacs.texi" version
(rx (and "EMACSVER" (1+ space)
(submatch (1+ (in "0-9."))))))
(set-version-in-file root "lispref/elisp.texi" version
(set-version-in-file root "doc/lispref/elisp.texi" version
(rx (and "EMACSVER" (1+ space)
(submatch (1+ (in "0-9."))))))
(set-version-in-file root "lib-src/makefile.w32-in" version
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61.
# Generated by GNU Autoconf 2.61 for emacs 23.0.50.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
......@@ -570,11 +570,11 @@ MAKEFLAGS=
SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME=
PACKAGE_TARNAME=
PACKAGE_VERSION=
PACKAGE_STRING=
PACKAGE_BUGREPORT=
PACKAGE_NAME='emacs'
PACKAGE_TARNAME='emacs'
PACKAGE_VERSION='23.0.50'
PACKAGE_STRING='emacs 23.0.50'
PACKAGE_BUGREPORT=''
ac_unique_file="src/lisp.h"
ac_config_libobj_dir=src
......@@ -692,6 +692,8 @@ RSVG_CFLAGS
RSVG_LIBS
GTK_CFLAGS
GTK_LIBS
DBUS_CFLAGS
DBUS_LIBS
XFT_CFLAGS
XFT_LIBS
FREETYPE_CFLAGS
......@@ -783,7 +785,7 @@ sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE}'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
infodir='${datarootdir}/info'
htmldir='${docdir}'
dvidir='${docdir}'
......@@ -1247,7 +1249,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures this package to adapt to many kinds of systems.
\`configure' configures emacs 23.0.50 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1295,7 +1297,7 @@ Fine tuning of the installation directories:
--infodir=DIR info documentation [DATAROOTDIR/info]
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
--docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
--docdir=DIR documentation root [DATAROOTDIR/doc/emacs]
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
......@@ -1320,7 +1322,9 @@ _ACEOF
fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of emacs 23.0.50:";;
esac
cat <<\_ACEOF
Optional Features:
......@@ -1366,6 +1370,7 @@ Optional Packages:
--without-xaw3d don't use Xaw3d
--without-xim don't use X11 XIM
--without-carbon don't use Carbon GUI on Mac OS X
--without-dbus don't use D-Bus
--with-x use the X Window System
Some influential environment variables:
......@@ -1442,7 +1447,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
configure
emacs configure 23.0.50
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
......@@ -1456,7 +1461,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by $as_me, which was
It was created by emacs $as_me 23.0.50, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
......@@ -1792,6 +1797,14 @@ fi
......@@ -1807,6 +1820,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_config_headers="$ac_config_headers src/config.h:src/config.in"
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
# Use a double $ so make ignores it.
......@@ -2028,6 +2042,12 @@ if test "${with_carbon+set}" = set; then
fi
# Check whether --with-dbus was given.
if test "${with_dbus+set}" = set; then
withval=$with_dbus;
fi
# Check whether --enable-carbon-app was given.
if test "${enable_carbon_app+set}" = set; then
enableval=$enable_carbon_app; carbon_appdir_x=${enableval}
......@@ -2278,6 +2298,19 @@ case "${canonical}" in
esac
;;
## FreeBSD kernel + glibc based userland
*-*-kfreebsd*gnu* )
opsys=gnu-kfreebsd
case "${canonical}" in
alpha*-*-kfreebsd*) machine=alpha ;;
ia64-*-kfreebsd*) machine=ia64 ;;
sparc64-*-kfreebsd*) machine=sparc ;;
powerpc-*-kfreebsd*) machine=macppc ;;
i[3456]86-*-kfreebsd*) machine=intel386 ;;
amd64-*-kfreebsd*|x86_64-*-kfreebsd*) machine=amdx86-64 ;;
esac
;;
## NetBSD ports
*-*-netbsd* )
opsys=netbsd
......@@ -12012,6 +12045,113 @@ _ACEOF
fi
fi
HAVE_DBUS=no
if test "${with_dbus}" = "yes"; then
succeeded=no
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
case $PKG_CONFIG in
[\\/]* | ?:[\\/]*)
ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
{ echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
echo "${ECHO_T}$PKG_CONFIG" >&6; }
else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
fi
fi
if test "$PKG_CONFIG" = "no" ; then
HAVE_DBUS=no
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
{ echo "$as_me:$LINENO: checking for dbus-1 >= 1.0" >&5
echo $ECHO_N "checking for dbus-1 >= 1.0... $ECHO_C" >&6; }
if $PKG_CONFIG --exists "dbus-1 >= 1.0" 2>&5; then
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
succeeded=yes
{ echo "$as_me:$LINENO: checking DBUS_CFLAGS" >&5
echo $ECHO_N "checking DBUS_CFLAGS... $ECHO_C" >&6; }
DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= 1.0"|sed -e 's,///*,/,g'`
{ echo "$as_me:$LINENO: result: $DBUS_CFLAGS" >&5
echo "${ECHO_T}$DBUS_CFLAGS" >&6; }
{ echo "$as_me:$LINENO: checking DBUS_LIBS" >&5
echo $ECHO_N "checking DBUS_LIBS... $ECHO_C" >&6; }
DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 >= 1.0"|sed -e 's,///*,/,g'`
{ echo "$as_me:$LINENO: result: $DBUS_LIBS" >&5
echo "${ECHO_T}$DBUS_LIBS" >&6; }
else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
DBUS_CFLAGS=""
DBUS_LIBS=""
## If we have a custom action on failure, don't print errors, but
## do set a variable so people can do so.
DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-1 >= 1.0"`
fi
else
echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
echo "*** See http://www.freedesktop.org/software/pkgconfig"
fi
fi
if test $succeeded = yes; then
HAVE_DBUS=yes
else
HAVE_DBUS=no
fi
if test "$HAVE_DBUS" = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_DBUS 1
_ACEOF
fi
fi
HAVE_XAW3D=no
if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then
if test "$with_xaw3d" != no; then
......@@ -18962,13 +19102,11 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <sys/types.h> /* for off_t */
#include <stdio.h>
#include <stdio.h>
int
main ()
{
int (*fp) (FILE *, off_t, int) = fseeko;
return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
;
return 0;
}
......@@ -19008,13 +19146,11 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#define _LARGEFILE_SOURCE 1
#include <sys/types.h> /* for off_t */
#include <stdio.h>
#include <stdio.h>
int
main ()
{
int (*fp) (FILE *, off_t, int) = fseeko;
return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
;
return 0;
}
......@@ -20046,52 +20182,19 @@ fi
# Do we have res_init, for detecting changes in /etc/resolv.conf?
resolv=no
{ echo "$as_me:$LINENO: checking for res_init" >&5
echo $ECHO_N "checking for res_init... $ECHO_C" >&6; }
if test "${ac_cv_func_res_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Define res_init to an innocuous variant, in case <limits.h> declares res_init.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
#define res_init innocuous_res_init
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char res_init (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
#undef res_init
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char res_init ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined __stub_res_init || defined __stub___res_init
choke me
#endif
#include <netinet/in.h>
#include <arpa/nameser.h>
#include <resolv.h>
int
main ()
{
return res_init ();
return res_init();
;
return 0;
}
......@@ -20114,25 +20217,16 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
ac_cv_func_res_init=yes
have_res_init=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_res_init=no
have_res_init=no
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_res_init" >&5
echo "${ECHO_T}$ac_cv_func_res_init" >&6; }
if test $ac_cv_func_res_init = yes; then
have_res_init=yes
else
have_res_init=no
fi
if test "$have_res_init" = no; then
OLIBS="$LIBS"
LIBS="$LIBS -lresolv"
......@@ -20150,7 +20244,7 @@ cat >>conftest.$ac_ext <<_ACEOF
int
main ()
{
res_init();
return res_init();
;
return 0;
}
......@@ -24356,6 +24450,11 @@ Read the emacs-devel archives for more information."
echo
fi
if test "$HAVE_DBUS" = yes && test "${opsys}" != "gnu-linux"; then
echo "D-Bus integration has been tested for GNU/Linux only."
echo
fi
# Remove any trailing slashes in these variables.
test "${prefix}" != NONE &&
......@@ -24785,7 +24884,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by $as_me, which was
This file was extended by emacs $as_me 23.0.50, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -24838,7 +24937,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
config.status
emacs config.status 23.0.50
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
......@@ -25102,6 +25201,8 @@ RSVG_CFLAGS!$RSVG_CFLAGS$ac_delim
RSVG_LIBS!$RSVG_LIBS$ac_delim
GTK_CFLAGS!$GTK_CFLAGS$ac_delim
GTK_LIBS!$GTK_LIBS$ac_delim
DBUS_CFLAGS!$DBUS_CFLAGS$ac_delim
DBUS_LIBS!$DBUS_LIBS$ac_delim
XFT_CFLAGS!$XFT_CFLAGS$ac_delim
XFT_LIBS!$XFT_LIBS$ac_delim
FREETYPE_CFLAGS!$FREETYPE_CFLAGS$ac_delim
......@@ -25121,8 +25222,6 @@ KMEM_GROUP!$KMEM_GROUP$ac_delim
GETLOADAVG_LIBS!$GETLOADAVG_LIBS$ac_delim
GETOPT_H!$GETOPT_H$ac_delim
GETOPTOBJS!$GETOPTOBJS$ac_delim
version!$version$ac_delim