From: Paul Eggert Date: Mon, 17 Jan 2011 19:01:01 +0000 (-0800) Subject: Merge from mainline. X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~1322^2~230 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a3e44e793796153ff1534be9c74fcab50b45de30;p=emacs.git Merge from mainline. --- a3e44e793796153ff1534be9c74fcab50b45de30 diff --cc ChangeLog index 3d9782015ec,28d5fe8713f..cd9104759d0 --- a/ChangeLog +++ b/ChangeLog @@@ -1,109 -1,11 +1,117 @@@ - 2011-01-14 Paul Eggert ++2011-01-17 Paul Eggert + + * Makefile.in (GNULIB_MODULES): Change ftoastr to dtoastr. + This avoids building ftoastr and ldtoastr, which aren't needed. See + . + + * .bzrignore: Add .h files that are host-dependent. + Add lib/.deps/, lib/arg-nonnull.h, lib/c++defs.h, lib/getopt.h, + lib/time.h, lib/unistd.h, lib/warn-on-use.h. These are + host-dependent and are built as part of an ordinary 'make', and + should not be checked in. + + * lib/Makefile.in: Regenerate. + * lib/COPYING: New file, a copy of COPYING. + + * configure: Regenerate. + * configure.in (AC_USE_SYSTEM_EXTENSIONS): Remove: gnulib does this. + + Regenerate. + * lib/getopt.c, lib/getopt.in.h, lib/getopt1.c, lib/getopt_int.h: + * lib/gettext.h, lib/unistd.in.h, m4/unistd_h.m4: + New files, copied from gnulib by gnulib-tool. + * aclocal.m4, configure, lib/Makefile.in, m4/getopt.m4: + * m4/gnulib-cache.m4, m4/gnulib-comp.m4, src/config.in: + Regenerate. + + Use gnulib's getopt-gnu module. + * Makefile.in (GNULIB_MODULES): Add getopt-gnu. + (AUTOCONF_INPUTS): Remove getopt.m4; aclocal.m4 is a good-enough + representative of the dependencies. + * configure.in: Do not configure getopt, as gnulib does that now. + * make-dist: Do not worry about lib-src/getopt.h, as gnulib handles + getopt now, in lib. + + Regenerate. + * arg-nonnull.h, c++defs.h, lib/mktime-internal.h, lib/mktime.c: + * lib/stddef.in.h, lib/time.h, lib/time.in.h, lib/time_r.c: + * m4/extensions.m4, m4/include_next.m4, m4/mktime.m4: + * m4/multiarch.m4, m4/stddef_h.m4, m4/time_h.m4, m4/time_r.m4: + * m4/extensions.m4, m4/include_next.m4, m4/mktime.m4, m4/multiarch.m4: + * m4/stddef_h.m4, m4/time_h.m4, m4/time_r.m4, m4/warn-on-use.m4: + * m4/wchar_t.m4, warn-on-use.h: + New files, copied from gnulib by gnulib-tool. + * aclocal.m4, configure, lib/Makefile.in, lib/gnulib.mk: + * m4/gnulib-cache.m4, m4/gnulib-comp.m4, src/config.in: + Regenerate. + + Use gnulib's mktime module. + * Makefile.in (GNULIB_MODULES): Add mktime. + * configure.in: Remove code no longer needed, as gnulib now does it. + (AC_CHECK_FUNCS): Remove mktime. + (AC_FUNC_MKTIME, BROKEN_MKTIME): Remove. + (__restrict): Remove, as this now gets in the way of the C99 + support for 'restrict' pulled in by the gnulib mktime module. + Code should now use 'restrict' and not '__restrict". + (mktime): Remove. + * make-dist: Put gnulib-generated files arg-nonnull.h, c++defs.h, + and warn-on-use.h into the distribution. + + Regenerate. + * lib/dtoastr.c, lib/ftoastr.c, lib/ftoastr.h, lib/intprops.h: + * lib/ldtoastr.c, m4/c-strtod.m4: + New files, copied from gnulib by gnulib-tool. + * lib/dummy.c: Remove. + * aclocal.m4, configure, lib/Makefile.in, lib/gnulib.mk: + * m4/gnulib-cache.m4, m4/gnulib-comp.m4, src/config.in: + Regenerate. + + Use gnulib's ftoastr module. + * Makefile.in (GNULIB_MODULES): Add ftoastr. Remove dummy. + + Regenerate. + * aclocal.m4, compile, depcomp, lib/Makefile.in, lib/dummy.c: + * lib/gnulib.mk, m4/00gnulib.m4, m4/gnulib-cache.m4: + * m4/gnulib-common.m4, m4/gnulib-comp.m4, m4/gnulib-tool.m4, missing: + New files, generated automatically, with 'make sync-from-gnulib' + followed by 'make'. + * configure, lisp/dired.el, src/config.in: Regenerate. + + Automate syncing from gnulib. + * INSTALL, README: Document new subdirectory 'lib'. + * Makefile.in (SUBDIR): Add lib. + (SUBDIR_MAKEFILES): Add lib/Makefile. + (lib-src, src, TAGS, tags): Depend on lib. + (gnulib_srcdir, GNULIB_MODULES, GNULIB_TOOL_FLAGS): New macros. + ($(gnulib_srcdir)): New rule. + (sync-from-gnulib): New rule, which is .PHONY. + (lib): New rule, which is like lib-src. + (Makefile): Depend on lib/Makefile.in. + (AUTOCONF_INPUTS): Depend on aclocal.m4. + (ACLOCAL_INPUTS, AUTOMAKE_INPUTS): New macros. + ($(srcdir)/aclocal.m4, $(srcdir)/lib/Makefile.in): New rules. + (am--refresh): New rule, to pacify Automake. + (mostlyclean, clean, distclean, bootstrap-clean, maintainer-clean): + Clean lib, too. + (top_maintainer_clean): New macro, to remove gnulib-tool and Automake + droppings. + (maintainer-clean, extraclean): Use it. + * configure.in: Initialize for automake and gnulib, by invoking + AM_INIT_AUTOMAKE, AM_PROG_CC_C_O, gl_EARLY, and gl_INIT. Output + lib/Makefile, too. Use automake to build gnulib, as gnulib works + more conveniently with automake. + * lib/Makefile.am: New file. + * make-dist: Also put into the distribution aclocal.m4, + compile, depcomp, missing, and the files under lib/. + + 2011-01-15 Glenn Morris + + * Makefile.in (epaths-force): No more arch-tag to edit. + + 2011-01-15 Chong Yidong + + * configure.in: Bump min libxml2 version to 2.6.17 (Bug#7603). + 2011-01-14 Paul Eggert * make-dist: Distribute test/ files too. diff --cc admin/ChangeLog index 5b714193ab1,7faf6804c3c..ca310c1b8f1 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@@ -1,14 -1,10 +1,21 @@@ - 2011-01-14 Paul Eggert ++2011-01-17 Paul Eggert + + Update copyright notes to match recent gnulib-related changes. + * notes/copyright: Add aclocal.m4, m4/*.m4, lib/Makefile.in, + arg-nonnull.h, c++defs.h, compile, depcomp, missing, + warn-on-use.h, lib/*.[ch], lib/gnulib.mk. Remove src/mktime.c, + lib-src/getopt1.c, lib-src/getopt_int.h (files are now in lib and + are subsumed by the lib/*.[ch] rule). Remove m4/getopt.m4 (now + subsumed by m4/*.m4 rule). config.guess, config.sub, and + doc/man/texinfo.tex are now copied in from gnulib. + + 2011-01-15 Glenn Morris + + * charsets/cp51932.awk, charsets/eucjp-ms.awk: No longer print arch-tag. + + * bzrmerge.el (bzrmerge-missing): Add another skip indicator. + (bzrmerge-resolve): Also ignore cl-loaddefs.el. + 2011-01-14 Glenn Morris * admin.el (set-copyright): Also handle \year in refcards/*.tex. diff --cc lib-src/gettext.h index 4a5941f86dc,9f9e3569203..00000000000 deleted file mode 100644,100644 --- a/lib-src/gettext.h +++ /dev/null @@@ -1,82 -1,80 +1,0 @@@ --/* Convenience header for conditional use of GNU . -- Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2004, -- 2005, 2006, 2007 Free Software Foundation, Inc. -- -- This program 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. -- -- This program 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 this program; if not, write to the Free Software Foundation, -- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -- --#ifndef _LIBGETTEXT_H --#define _LIBGETTEXT_H 1 -- --/* NLS can be disabled through the configure --disable-nls option. */ --#if ENABLE_NLS -- --/* Get declarations of GNU message catalog functions. */ --# include -- --#else -- --/* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which -- chokes if dcgettext is defined as a macro. So include it now, to make -- later inclusions of a NOP. We don't include -- as well because people using "gettext.h" will not include , -- and also including would fail on SunOS 4, whereas -- is OK. */ --#if defined(__sun) --# include --#endif -- --/* Many header files from the libstdc++ coming with g++ 3.3 or newer include -- , which chokes if dcgettext is defined as a macro. So include -- it now, to make later inclusions of a NOP. */ --#if defined(__cplusplus) && defined(__GNUG__) && (__GNUC__ >= 3) --# include --# if (__GLIBC__ >= 2) || _GLIBCXX_HAVE_LIBINTL_H --# include --# endif --#endif -- --/* Disabled NLS. -- The casts to 'const char *' serve the purpose of producing warnings -- for invalid uses of the value returned from these functions. -- On pre-ANSI systems without 'const', the config.h file is supposed to -- contain "#define const". */ --# define gettext(Msgid) ((const char *) (Msgid)) --# define dgettext(Domainname, Msgid) ((const char *) (Msgid)) --# define dcgettext(Domainname, Msgid, Category) ((const char *) (Msgid)) --# define ngettext(Msgid1, Msgid2, N) \ -- ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2)) --# define dngettext(Domainname, Msgid1, Msgid2, N) \ -- ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2)) --# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \ -- ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2)) --# define textdomain(Domainname) ((const char *) (Domainname)) --# define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname)) --# define bind_textdomain_codeset(Domainname, Codeset) ((const char *) (Codeset)) -- --#endif -- --/* A pseudo function call that serves as a marker for the automated -- extraction of messages, but does not call gettext(). The run-time -- translation is done at a different place in the code. -- The argument, String, should be a literal string. Concatenated strings -- and other string expressions won't work. -- The macro's expansion is not parenthesized, so that it is suitable as -- initializer for static 'char[]' or 'const char[]' variables. */ --#define gettext_noop(String) String -- --#endif /* _LIBGETTEXT_H */ -- - /* arch-tag: 3d01bb8e-82e3-4674-9812-de4c4224f7d1 - (do not change this comment) */ diff --cc lisp/dired.el index 8a7aec6c88b,8a7aec6c88b..13d0a8ff390 --- a/lisp/dired.el +++ b/lisp/dired.el @@@ -3562,7 -3562,7 +3562,7 @@@ Ask means pop up a menu for the user t ;;;;;; dired-run-shell-command dired-do-shell-command dired-do-async-shell-command ;;;;;; dired-clean-directory dired-do-print dired-do-touch dired-do-chown ;;;;;; dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff --;;;;;; dired-diff) "dired-aux" "dired-aux.el" "5fc17781c25dbe16b7e170aed0ad4d62") ++;;;;;; dired-diff) "dired-aux" "dired-aux.el" "adcb55a439048f158f47c5c96b3dad09") ;;; Generated autoloads from dired-aux.el (autoload 'dired-diff "dired-aux" "\ @@@ -4021,7 -4021,7 +4021,7 @@@ true then the type of the file linked t ;;;*** ;;;### (autoloads (dired-do-relsymlink dired-jump) "dired-x" "dired-x.el" --;;;;;; "0f63715e54b0d001955bdc3680cadcd0") ++;;;;;; "6d47e23fbd9236014786c50618e99f09") ;;; Generated autoloads from dired-x.el (autoload 'dired-jump "dired-x" "\ diff --cc lisp/emacs-lisp/cl-loaddefs.el index 65ca305285c,65ca305285c..0936dddd674 --- a/lisp/emacs-lisp/cl-loaddefs.el +++ b/lisp/emacs-lisp/cl-loaddefs.el @@@ -10,7 -10,7 +10,7 @@@ ;;;;;; ceiling* floor* isqrt lcm gcd cl-progv-before cl-set-frame-visible-p ;;;;;; cl-map-overlays cl-map-intervals cl-map-keymap-recursively ;;;;;; notevery notany every some mapcon mapcan mapl maplist map --;;;;;; cl-mapcar-many equalp coerce) "cl-extra" "cl-extra.el" "0fa13e08069009fb44873beae11aab93") ++;;;;;; cl-mapcar-many equalp coerce) "cl-extra" "cl-extra.el" "ff6f0444d029166d2ed5da298f39854e") ;;; Generated autoloads from cl-extra.el (autoload 'coerce "cl-extra" "\ @@@ -754,7 -754,7 +754,7 @@@ surrounded by (block NAME ...) ;;;;;; find nsubstitute-if-not nsubstitute-if nsubstitute substitute-if-not ;;;;;; substitute-if substitute delete-duplicates remove-duplicates ;;;;;; delete-if-not delete-if delete* remove-if-not remove-if remove* --;;;;;; replace fill reduce) "cl-seq" "cl-seq.el" "06b7f4180b3e40db2e6dae228c3265a8") ++;;;;;; replace fill reduce) "cl-seq" "cl-seq.el" "c17ab899d56f8fa132d0471ce6896a10") ;;; Generated autoloads from cl-seq.el (autoload 'reduce "cl-seq" "\ diff --cc lisp/htmlfontify.el index b5c2aad23bf,bcbb3aca6b4..6603404d10b --- a/lisp/htmlfontify.el +++ b/lisp/htmlfontify.el @@@ -2349,7 -2350,7 +2350,7 @@@ You may also want to set `hfy-page-head ;;;### (autoloads (hfy-fallback-colour-values htmlfontify-load-rgb-file) --;;;;;; "hfy-cmap" "hfy-cmap.el" "5314c2706e20292f96206daa0eb96caa") ++;;;;;; "hfy-cmap" "hfy-cmap.el" "f7f81749b08e0aec14aac431f8b5ac8b") ;;; Generated autoloads from hfy-cmap.el (autoload 'htmlfontify-load-rgb-file "hfy-cmap" "\ diff --cc lisp/mail/rmail.el index 9bfcdea14ce,9bfcdea14ce..472df32927a --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@@ -4263,7 -4263,7 +4263,7 @@@ encoded string (and the same mask) wil ;;; Start of automatically extracted autoloads. ;;;### (autoloads (rmail-edit-current-message) "rmailedit" "rmailedit.el" --;;;;;; "bdbcacaef237aab5ca6c8653dc52a044") ++;;;;;; "1602595714ff15197cf32727d6765c31") ;;; Generated autoloads from rmailedit.el (autoload 'rmail-edit-current-message "rmailedit" "\ @@@ -4275,7 -4275,7 +4275,7 @@@ Edit the contents of this message ;;;### (autoloads (rmail-next-labeled-message rmail-previous-labeled-message ;;;;;; rmail-read-label rmail-kill-label rmail-add-label) "rmailkwd" --;;;;;; "rmailkwd.el" "46ac83afa76e3aa88eacf73237bd703e") ++;;;;;; "rmailkwd.el" "061943b8a3dfd5695715b36736827950") ;;; Generated autoloads from rmailkwd.el (autoload 'rmail-add-label "rmailkwd" "\ @@@ -4318,7 -4318,7 +4318,7 @@@ With prefix argument N moves forward N ;;;*** --;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "724fa72db9b6c804f7f69ad1da83fd39") ++;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "783deb7c855767051af119f1bfd8d84e") ;;; Generated autoloads from rmailmm.el (autoload 'rmail-mime "rmailmm" "\ @@@ -4344,7 -4344,7 +4344,7 @@@ attachments as specfied by `rmail-mime- ;;;*** ;;;### (autoloads (set-rmail-inbox-list) "rmailmsc" "rmailmsc.el" --;;;;;; "fd5e2a8dc4f74ea2275525d7a2766bea") ++;;;;;; "f1d9be06745c78b90224da788f61c2d9") ;;; Generated autoloads from rmailmsc.el (autoload 'set-rmail-inbox-list "rmailmsc" "\ @@@ -4360,7 -4360,7 +4360,7 @@@ This applies only to the current sessio ;;;### (autoloads (rmail-sort-by-labels rmail-sort-by-lines rmail-sort-by-correspondent ;;;;;; rmail-sort-by-recipient rmail-sort-by-author rmail-sort-by-subject --;;;;;; rmail-sort-by-date) "rmailsort" "rmailsort.el" "446f2e852393e72030b85a1a9230c7ac") ++;;;;;; rmail-sort-by-date) "rmailsort" "rmailsort.el" "8b20167ea495d683f83f980833e948e0") ;;; Generated autoloads from rmailsort.el (autoload 'rmail-sort-by-date "rmailsort" "\ @@@ -4419,7 -4419,7 +4419,7 @@@ If prefix argument REVERSE is non-nil, ;;;### (autoloads (rmail-summary-by-senders rmail-summary-by-topic ;;;;;; rmail-summary-by-regexp rmail-summary-by-recipients rmail-summary-by-labels --;;;;;; rmail-summary) "rmailsum" "rmailsum.el" "267d6f740d6697a631dacbd86f583374") ++;;;;;; rmail-summary) "rmailsum" "rmailsum.el" "b1d2ca7470a7d8baffe9e90a15a5b5e0") ;;; Generated autoloads from rmailsum.el (autoload 'rmail-summary "rmailsum" "\ @@@ -4467,7 -4467,7 +4467,7 @@@ SENDERS is a string of regexps separate ;;;*** ;;;### (autoloads (unforward-rmail-message undigestify-rmail-message) --;;;;;; "undigest" "undigest.el" "2869c38a0051d0acab1a5968627fa57d") ++;;;;;; "undigest" "undigest.el" "1b5181e02606e49ede71604472250cc3") ;;; Generated autoloads from undigest.el (autoload 'undigestify-rmail-message "undigest" "\ diff --cc lisp/ps-print.el index 4b89a72c315,4b89a72c315..3c4d03af782 --- a/lisp/ps-print.el +++ b/lisp/ps-print.el @@@ -6659,7 -6659,7 +6659,7 @@@ If FACE is not a valid face name, use d ;; But autoload them here to make the separation invisible. ;;;### (autoloads (ps-mule-end-job ps-mule-begin-job ps-mule-initialize --;;;;;; ps-multibyte-buffer) "ps-mule" "ps-mule.el" "0bd9e024b9d49ac10c708171ec319d9a") ++;;;;;; ps-multibyte-buffer) "ps-mule" "ps-mule.el" "84d550158bdd60da7af54df17b7a38f7") ;;; Generated autoloads from ps-mule.el (defvar ps-multibyte-buffer nil "\ diff --cc src/ChangeLog index 2265f12138e,75ce2788915..8f3c4056495 --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,38 -1,11 +1,46 @@@ - 2011-01-11 Paul Eggert ++2011-01-17 Paul Eggert + + Give a name FLOAT_TO_STRING_BUFSIZE to the constant 350. + * lisp.h (FLOAT_TO_STRING_BUFSIZE): New macro. + * data.c (Fnumber_to_string): Use it. + * print.c (float_to_string, print_object): Likewise. + + Include unilaterally. + * alloc.c, atimer.c, buffer.c, callproc.c, dired.c, dispnew.c, doc.c: + * doprnt.c, editfns.c, emacs.c, fileio.c, filelock.c, fns.c: + * getloadavg.c, getpagesize.h, gmalloc.c, image.c, keyboard.c: + * lread.c, process.c, process.h, ralloc.c, regex.c, sysdep.c: + * systty.h, term.c, termcap.c, xfns.c, xrdb.c, xselect.c, xsmfns.c: + * xterm.c: + Include without worrying about HAVE_UNISTD_H, since + unistd.h is always present now, possibly supplied by gnulib. + + * mktime.c: Remove; moving to ../lib. + + Use gnulib's mktime module. + * deps.mk (mktime.o): Remove rule. + + Use gnulib's ftoastr module. + * print.c: Include ftoastr.h. + (FLT_RADIX, DBL_MANT_DIG, DBL_DIG, DBL_MIN, DOUBLE_DIGITS_BOUND): + Remove; no longer needed. + (float_to_string): Use dtoastr rather than rolling our own code, + which had an off-by-one bug on non-IEEE hosts. + + Automate syncing from gnulib. + * Makefile.in (lib): New macro. + (ALL_CFLAGS): Add -I$(lib) -I$(srcdir)/../lib. + ($(lib)/libgnu.a): New rule. + (temacs$(EXEEXT)): Also link $(lib)/libgnu.a. + + 2011-01-15 Martin Rudalics + + * window.c (inhibit_point_swap): New variable. + (Fselect_window): If inhibit_point_swap is nonzero, avoid swapping + point this time. + (Fset_window_configuration): Set inhibit_point_swap to 1 instead + of setting selected_window to nil (Bug#7728). + 2011-01-11 Tassilo Horn * image.c (imagemagick_load_image, Finit_image_library): Free