Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 104284. ------------------------------------------------------------ revno: 104284 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-05-18 23:59:50 -0700 message: * doc/lispref/lists.texi (Sets And Lists): Mention cl provides union etc. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2011-05-19 06:54:27 +0000 +++ doc/lispref/ChangeLog 2011-05-19 06:59:50 +0000 @@ -1,3 +1,7 @@ +2011-05-19 Glenn Morris + + * lists.texi (Sets And Lists): Mention cl provides union etc. + 2011-05-19 Nix * windows.texi (Displaying Buffers): pop-to-buffer is not a command. === modified file 'doc/lispref/lists.texi' --- doc/lispref/lists.texi 2011-01-25 04:08:28 +0000 +++ doc/lispref/lists.texi 2011-05-19 06:59:50 +0000 @@ -1266,9 +1266,9 @@ @cindex CL note---lack @code{union}, @code{intersection} @quotation @b{Common Lisp note:} Common Lisp has functions @code{union} (which -avoids duplicate elements) and @code{intersection} for set operations, -but GNU Emacs Lisp does not have them. You can write them in Lisp if -you wish. +avoids duplicate elements) and @code{intersection} for set operations. +Although standard GNU Emacs Lisp does not have them, the @file{cl} +library provides versions. @inforef{Top, Overview, cl}. @end quotation @defun memq object list ------------------------------------------------------------ revno: 104283 author: Nix committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-05-18 23:54:27 -0700 message: Misc small lispref fixes. * windows.texi (Displaying Buffers): pop-to-buffer is not a command. * text.texi (Parsing HTML): Update for function name changes. * syntax.texi (Syntax Flags): Small fix. * keymaps.texi (Active Keymaps): Typo fix. (Changing Key Bindings): Grammar fix. * frames.texi (Minibuffers and Frames): Grammar fix. (Window System Selections): x-select-enable-clipboard now defaults to t. * customize.texi (Common Keywords): * display.texi (Abstract Display): * modes.texi (Auto-Indentation): * nonascii.texi (Converting Representations): Typo fixes. * control.texi (Examples of Catch): Call it "goto" not "go to". diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2011-05-14 14:50:46 +0000 +++ doc/lispref/ChangeLog 2011-05-19 06:54:27 +0000 @@ -1,3 +1,24 @@ +2011-05-19 Nix + + * windows.texi (Displaying Buffers): pop-to-buffer is not a command. + + * text.texi (Parsing HTML): Update for function name changes. + + * syntax.texi (Syntax Flags): Small fix. + + * keymaps.texi (Active Keymaps): Typo fix. + (Changing Key Bindings): Grammar fix. + + * frames.texi (Minibuffers and Frames): Grammar fix. + (Window System Selections): x-select-enable-clipboard now defaults to t. + + * customize.texi (Common Keywords): + * display.texi (Abstract Display): + * modes.texi (Auto-Indentation): + * nonascii.texi (Converting Representations): Typo fixes. + + * control.texi (Examples of Catch): Call it "goto" not "go to". + 2011-05-14 Eli Zaretskii * nonascii.texi (Character Properties): Fix inconsistencies with === modified file 'doc/lispref/control.texi' --- doc/lispref/control.texi 2011-01-25 04:08:28 +0000 +++ doc/lispref/control.texi 2011-05-19 06:54:27 +0000 @@ -623,7 +623,7 @@ @subsection Examples of @code{catch} and @code{throw} One way to use @code{catch} and @code{throw} is to exit from a doubly -nested loop. (In most languages, this would be done with a ``go to.'') +nested loop. (In most languages, this would be done with a ``goto.'') Here we compute @code{(foo @var{i} @var{j})} for @var{i} and @var{j} varying from 0 to 9: === modified file 'doc/lispref/customize.texi' --- doc/lispref/customize.texi 2011-01-25 04:08:28 +0000 +++ doc/lispref/customize.texi 2011-05-19 06:54:27 +0000 @@ -174,7 +174,7 @@ The value of @var{package} needs to be unique and it needs to match the @var{package} value appearing in the @code{:package-version} -keyword. Since the user might see the value in a error message, a good +keyword. Since the user might see the value in an error message, a good choice is the official name of the package, such as MH-E or Gnus. @end defvar === modified file 'doc/lispref/display.texi' --- doc/lispref/display.texi 2011-05-12 07:27:35 +0000 +++ doc/lispref/display.texi 2011-05-19 06:54:27 +0000 @@ -5201,7 +5201,7 @@ Typically, you define an ewoc with @code{ewoc-create}, and then pass the resulting ewoc structure to other functions in the Ewoc package to build nodes within it, and display it in the buffer. Once it is -displayed in the buffer, other functions determine the correspondance +displayed in the buffer, other functions determine the correspondence between buffer positions and nodes, move point from one node's textual representation to another, and so forth. @xref{Abstract Display Functions}. === modified file 'doc/lispref/frames.texi' --- doc/lispref/frames.texi 2011-04-23 03:07:16 +0000 +++ doc/lispref/frames.texi 2011-05-19 06:54:27 +0000 @@ -1368,7 +1368,7 @@ However, you can also create a frame with no minibuffer. Such a frame must use the minibuffer window of some other frame. When you create the -frame, you can specify explicitly the minibuffer window to use (in some +frame, you can explicitly specify the minibuffer window to use (in some other frame). If you don't, then the minibuffer is found in the frame which is the value of the variable @code{default-minibuffer-frame}. Its value should be a frame that does have a minibuffer. @@ -2018,8 +2018,8 @@ If this is non-@code{nil}, the Emacs yank functions consult the clipboard before the primary selection, and the kill functions store in the clipboard as well as the primary selection. Otherwise they do not -access the clipboard at all. The default is @code{nil} on most systems, -but @code{t} on MS-Windows. +access the clipboard at all. The default is @code{t} on systems with +clipboards. @end defopt @node Drag and Drop === modified file 'doc/lispref/keymaps.texi' --- doc/lispref/keymaps.texi 2011-03-19 18:49:31 +0000 +++ doc/lispref/keymaps.texi 2011-05-19 06:54:27 +0000 @@ -686,7 +686,7 @@ When commands are remapped (@pxref{Remapping Commands}), @code{key-binding} normally processes command remappings so as to -returns the remapped command that will actually be executed. However, +return the remapped command that will actually be executed. However, if @var{no-remap} is non-@code{nil}, @code{key-binding} ignores remappings and returns the binding directly specified for @var{key}. @@ -1239,7 +1239,7 @@ The @code{global-set-key} and @code{local-set-key} functions are convenient interfaces for these operations (@pxref{Key Binding Commands}). You can also use @code{define-key}, a more general -function; then you must specify explicitly the map to change. +function; then you must explicitly specify the map to change. When choosing the key sequences for Lisp programs to rebind, please follow the Emacs conventions for use of various keys (@pxref{Key === modified file 'doc/lispref/modes.texi' --- doc/lispref/modes.texi 2011-05-12 07:07:06 +0000 +++ doc/lispref/modes.texi 2011-05-19 06:54:27 +0000 @@ -3256,7 +3256,7 @@ @end defvar @node Auto-Indentation -@section Auto-indention of code +@section Auto-indentation of code For programming languages, an important feature of a major mode is to provide automatic indentation. This is controlled in Emacs by === modified file 'doc/lispref/nonascii.texi' --- doc/lispref/nonascii.texi 2011-05-14 14:50:46 +0000 +++ doc/lispref/nonascii.texi 2011-05-19 06:54:27 +0000 @@ -201,7 +201,7 @@ @defun byte-to-string byte @cindex byte to string This function returns a unibyte string containing a single byte of -character data, @var{character}. It signals a error if +character data, @var{character}. It signals an error if @var{character} is not an integer between 0 and 255. @end defun === modified file 'doc/lispref/syntax.texi' --- doc/lispref/syntax.texi 2011-01-25 04:08:28 +0000 +++ doc/lispref/syntax.texi 2011-05-19 06:54:27 +0000 @@ -374,7 +374,7 @@ @item @samp{*/} This is a comment-end sequence for ``b'' style because the first -character, @samp{*}, does have the @samp{b} flag. +character, @samp{*}, has the @samp{b} flag. @item newline This is a comment-end sequence for ``a'' style, because the newline === modified file 'doc/lispref/text.texi' --- doc/lispref/text.texi 2011-05-14 08:46:11 +0000 +++ doc/lispref/text.texi 2011-05-19 06:54:27 +0000 @@ -4099,17 +4099,16 @@ @node Parsing HTML @section Parsing HTML @cindex parsing html -@cindex parsing xml - -Emacs provides an interface to the @code{libxml2} library via two -functions: @code{html-parse-buffer} and @code{xml-parse-buffer}. The -HTML function will parse ``real world'' HTML and try to return a -sensible parse tree, while the XML function is somewhat stricter about -syntax. - -They both take a two optional parameter. The first is a buffer, and -the second is a base URL to be used to expand relative URLs in the -document, if any. + +@defun libxml-parse-html-region start end &optional base-url +This function provides HTML parsing via the @code{libxml2} library. +It parses ``real world'' HTML and tries to return a sensible parse tree +regardless. + +In addition to @var{start} and @var{end} (specifying the start and end +of the region to act on), it takes an optional parameter, +@var{base-url}, which is used to expand relative URLs in the document, +if any. Here's an example demonstrating the structure of the parsed data you get out. Given this HTML document: @@ -4138,12 +4137,21 @@ Attributes are coded the same way as child nodes, but with @samp{:} as the first character. +@end defun + +@cindex parsing xml +@defun libxml-parse-xml-region start end &optional base-url + +This is much the same as @code{libxml-parse-html-region} above, but +operates on XML instead of HTML, and is correspondingly stricter about +syntax. +@end defun @node Atomic Changes @section Atomic Change Groups @cindex atomic changes - In data base terminology, an @dfn{atomic} change is an indivisible + In database terminology, an @dfn{atomic} change is an indivisible change---it can succeed entirely or it can fail entirely, but it cannot partly succeed. A Lisp program can make a series of changes to one or several buffers as an @dfn{atomic change group}, meaning that === modified file 'doc/lispref/windows.texi' --- doc/lispref/windows.texi 2011-04-23 03:07:16 +0000 +++ doc/lispref/windows.texi 2011-05-19 06:54:27 +0000 @@ -826,8 +826,8 @@ unless @var{norecord} is non-@code{nil}. @end deffn -@deffn Command pop-to-buffer buffer-or-name &optional other-window norecord -This command makes @var{buffer-or-name} the current buffer and switches +@defun pop-to-buffer buffer-or-name &optional other-window norecord +This function makes @var{buffer-or-name} the current buffer and switches to it in some window, preferably not the window previously selected. The ``popped-to'' window becomes the selected window. Its frame is given the X server's focus, if possible; see @ref{Input Focus}. The @@ -866,7 +866,7 @@ This function updates the buffer list just like @code{switch-to-buffer} unless @var{norecord} is non-@code{nil}. -@end deffn +@end defun @deffn Command replace-buffer-in-windows &optional buffer-or-name This function replaces @var{buffer-or-name} in all windows displaying ------------------------------------------------------------ revno: 104282 committer: Glenn Morris branch nick: trunk timestamp: Thu 2011-05-19 02:28:27 -0400 message: Auto-commit of generated files. diff: === modified file 'autogen/Makefile.in' --- autogen/Makefile.in 2011-05-18 10:19:25 +0000 +++ autogen/Makefile.in 2011-05-19 06:28:27 +0000 @@ -481,7 +481,6 @@ MAKEINFO = @MAKEINFO@ MKDEPDIR = @MKDEPDIR@ MKDIR_P = @MKDIR_P@ -MOUSE_SUPPORT = @MOUSE_SUPPORT@ M_FILE = @M_FILE@ NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@ @@ -505,7 +504,6 @@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ NS_OBJ = @NS_OBJ@ NS_OBJC_OBJ = @NS_OBJC_OBJ@ -NS_SUPPORT = @NS_SUPPORT@ OBJEXT = @OBJEXT@ OLDXMENU = @OLDXMENU@ OLDXMENU_DEPS = @OLDXMENU_DEPS@ @@ -632,7 +630,6 @@ TERMCAP_OBJ = @TERMCAP_OBJ@ TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ TOOLKIT_LIBW = @TOOLKIT_LIBW@ -TOOLTIP_SUPPORT = @TOOLTIP_SUPPORT@ UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ UNEXEC_OBJ = @UNEXEC_OBJ@ @@ -642,7 +639,6 @@ VMLIMIT_OBJ = @VMLIMIT_OBJ@ WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ WIDGET_OBJ = @WIDGET_OBJ@ -WINDOW_SUPPORT = @WINDOW_SUPPORT@ WINT_T_SUFFIX = @WINT_T_SUFFIX@ XFT_CFLAGS = @XFT_CFLAGS@ XFT_LIBS = @XFT_LIBS@ === modified file 'autogen/configure' --- autogen/configure 2011-05-19 00:37:36 +0000 +++ autogen/configure 2011-05-19 06:28:27 +0000 @@ -603,9 +603,6 @@ am__EXEEXT_TRUE LTLIBOBJS LIBOBJS -WINDOW_SUPPORT -TOOLTIP_SUPPORT -MOUSE_SUPPORT LIB_GCC LD_FIRSTFLAG LD_SWITCH_SYSTEM_TEMACS @@ -1118,7 +1115,6 @@ GMALLOC_OBJ HAVE_XSERVER LIB_STANDARD -NS_SUPPORT NS_OBJC_OBJ NS_OBJ TEMACS_LDFLAGS2 @@ -9460,7 +9456,6 @@ ns_frag=/dev/null NS_OBJ= NS_OBJC_OBJ= -NS_SUPPORT= if test "${HAVE_NS}" = yes; then window_system=nextstep with_xft=no @@ -9473,7 +9468,6 @@ ns_frag=$srcdir/src/ns.mk NS_OBJ="fontset.o fringe.o image.o" NS_OBJC_OBJ="nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o" - NS_SUPPORT="\${lispsource}/emacs-lisp/easymenu.elc \${lispsource}/term/ns-win.elc" fi CFLAGS="$tmp_CFLAGS" CPPFLAGS="$tmp_CPPFLAGS" @@ -9482,7 +9476,6 @@ - case "${window_system}" in x11 ) HAVE_X_WINDOWS=yes @@ -12929,7 +12922,6 @@ ### Use -lgpm if available, unless `--with-gpm=no'. HAVE_GPM=no LIBGPM= -MOUSE_SUPPORT= if test "${with_gpm}" != "no"; then ac_fn_c_check_header_mongrel "$LINENO" "gpm.h" "ac_cv_header_gpm_h" "$ac_includes_default" if test "x$ac_cv_header_gpm_h" = x""yes; then : @@ -12982,8 +12974,6 @@ $as_echo "#define HAVE_GPM 1" >>confdefs.h LIBGPM=-lgpm - ## May be reset below. - MOUSE_SUPPORT="\$(GPM_MOUSE_SUPPORT)" fi fi @@ -20810,8 +20800,6 @@ fi -TOOLTIP_SUPPORT= -WINDOW_SUPPORT= ## If we're using X11/GNUstep, define some consequences. if test "$HAVE_X_WINDOWS" = "yes" || test "$HAVE_NS" = "yes"; then @@ -20820,21 +20808,11 @@ $as_echo "#define HAVE_MOUSE 1" >>confdefs.h - MOUSE_SUPPORT="\$(REAL_MOUSE_SUPPORT)" - TOOLTIP_SUPPORT="\${lispsource}/mouse.elc" - - WINDOW_SUPPORT="\$(BASE_WINDOW_SUPPORT)" - test "$HAVE_X_WINDOWS" = "yes" && \ - WINDOW_SUPPORT="$WINDOW_SUPPORT \$(X_WINDOW_SUPPORT)" - fi - - - #### Report on what we decided to do. #### Report GTK as a toolkit, even if it doesn't use Xt. #### It makes printing result more understandable as using GTK sets ------------------------------------------------------------ revno: 104281 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-05-18 23:18:58 -0700 message: * lisp/progmodes/f90.el (f90-type-def-re): Handle "type, bind(c)". (Bug#8691) diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-05-19 06:04:16 +0000 +++ lisp/ChangeLog 2011-05-19 06:18:58 +0000 @@ -1,5 +1,8 @@ 2011-05-19 Glenn Morris + * progmodes/f90.el (f90-type-def-re): + Handle "type, bind(c)". (Bug#8691) + * emacs-lisp/autoload.el (batch-update-autoloads): Set autoload-excludes by parsing loadup.el rather than Makefiles. === modified file 'lisp/progmodes/f90.el' --- lisp/progmodes/f90.el 2011-04-16 23:30:15 +0000 +++ lisp/progmodes/f90.el 2011-05-19 06:18:58 +0000 @@ -809,8 +809,10 @@ ;; type word ;; type :: word ;; type, stuff :: word + ;; type, bind(c) :: word ;; NOT "type (" - "\\<\\(type\\)\\>\\(?:[^()\n]*::\\)?[ \t]*\\(\\sw+\\)" + "\\<\\(type\\)\\>\\(?:\\(?:[^()\n]*\\|\ +.*,[ \t]*bind[ \t]*([ \t]*c[ \t]*)[ \t]*\\)::\\)?[ \t]*\\(\\sw+\\)" "Regexp matching the definition of a derived type.") (defconst f90-typeis-re ------------------------------------------------------------ revno: 104280 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-05-18 23:04:16 -0700 message: Remove the SOME_MACHINE_LISP distinction in src/Makefile.in. See discussion in http://debbugs.gnu.org/8302 * configure.in (NS_SUPPORT, MOUSE_SUPPORT, TOOLTIP_SUPPORT) (WINDOW_SUPPORT): Remove output variables that are no longer used. * lib-src/makefile.w32-in (echolisp): Remove rule that is no longer needed. (clean): No more echolisp.tmp. * .bzrignore: Remove lib-src/echolisp.tmp. * lisp/emacs-lisp/autoload.el (batch-update-autoloads): Set autoload-excludes by parsing lisp/loadup.el rather than Makefiles. * lisp/loadup.el: Update commentary. * msdos/sed1x.inp (TOOLTIP_SUPPORT, WINDOW_SUPPORT): * msdos/sed1v2.inp (MSDOS_SUPPORT, NS_SUPPORT, MOUSE_SUPPORT) (TOOLTIP_SUPPORT, WINDOW_SUPPORT): No need to edit these any more. * src/Makefile.in (MSDOS_SUPPORT_REAL, MSDOS_SUPPORT, NS_SUPPORT) (REAL_MOUSE_SUPPORT, GPM_MOUSE_SUPPORT, MOUSE_SUPPORT, TOOLTIP_SUPPORT) (BASE_WINDOW_SUPPORT, X_WINDOW_SUPPORT, WINDOW_SUPPORT): Remove. (lisp): Set the order to that of loadup.el. (shortlisp): Make it a copy of $lisp. (SOME_MACHINE_LISP): Remove. ($(etc)/DOC): Depend just on $lisp, not $SOME_MACHINE_LISP too. Use just $shortlisp, not $SOME_MACHINE_LISP too. diff: === modified file '.bzrignore' --- .bzrignore 2011-04-22 07:34:26 +0000 +++ .bzrignore 2011-05-19 06:04:16 +0000 @@ -70,7 +70,6 @@ lib-src/ctags lib-src/ctags.c lib-src/ebrowse -lib-src/echolisp.tmp lib-src/emacsclient lib-src/etags lib-src/fakemail === modified file 'ChangeLog' --- ChangeLog 2011-05-18 05:21:07 +0000 +++ ChangeLog 2011-05-19 06:04:16 +0000 @@ -1,3 +1,8 @@ +2011-05-19 Glenn Morris + + * configure.in (NS_SUPPORT, MOUSE_SUPPORT, TOOLTIP_SUPPORT) + (WINDOW_SUPPORT): Remove output variables that are no longer used. + 2011-05-17 Paul Eggert * lib/gnulib.mk: === modified file 'configure.in' --- configure.in 2011-05-14 19:52:13 +0000 +++ configure.in 2011-05-19 06:04:16 +0000 @@ -1503,7 +1503,6 @@ ns_frag=/dev/null NS_OBJ= NS_OBJC_OBJ= -NS_SUPPORT= if test "${HAVE_NS}" = yes; then window_system=nextstep with_xft=no @@ -1516,13 +1515,11 @@ ns_frag=$srcdir/src/ns.mk NS_OBJ="fontset.o fringe.o image.o" NS_OBJC_OBJ="nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o" - NS_SUPPORT="\${lispsource}/emacs-lisp/easymenu.elc \${lispsource}/term/ns-win.elc" fi CFLAGS="$tmp_CFLAGS" CPPFLAGS="$tmp_CPPFLAGS" AC_SUBST(NS_OBJ) AC_SUBST(NS_OBJC_OBJ) -AC_SUBST(NS_SUPPORT) AC_SUBST(LIB_STANDARD) AC_SUBST_FILE(ns_frag) @@ -2476,7 +2473,6 @@ ### Use -lgpm if available, unless `--with-gpm=no'. HAVE_GPM=no LIBGPM= -MOUSE_SUPPORT= if test "${with_gpm}" != "no"; then AC_CHECK_HEADER(gpm.h, [AC_CHECK_LIB(gpm, Gpm_Open, HAVE_GPM=yes)]) @@ -2484,8 +2480,6 @@ if test "${HAVE_GPM}" = "yes"; then AC_DEFINE(HAVE_GPM, 1, [Define to 1 if you have the gpm library (-lgpm).]) LIBGPM=-lgpm - ## May be reset below. - MOUSE_SUPPORT="\$(GPM_MOUSE_SUPPORT)" fi fi AC_SUBST(LIBGPM) @@ -3421,23 +3415,11 @@ AC_SUBST(LIB_GCC) -TOOLTIP_SUPPORT= -WINDOW_SUPPORT= ## If we're using X11/GNUstep, define some consequences. if test "$HAVE_X_WINDOWS" = "yes" || test "$HAVE_NS" = "yes"; then AC_DEFINE(HAVE_WINDOW_SYSTEM, 1, [Define if you have a window system.]) AC_DEFINE(HAVE_MOUSE, 1, [Define if you have mouse support.]) - MOUSE_SUPPORT="\$(REAL_MOUSE_SUPPORT)" - TOOLTIP_SUPPORT="\${lispsource}/mouse.elc" - - WINDOW_SUPPORT="\$(BASE_WINDOW_SUPPORT)" - test "$HAVE_X_WINDOWS" = "yes" && \ - WINDOW_SUPPORT="$WINDOW_SUPPORT \$(X_WINDOW_SUPPORT)" - fi -AC_SUBST(MOUSE_SUPPORT) -AC_SUBST(TOOLTIP_SUPPORT) -AC_SUBST(WINDOW_SUPPORT) AH_TOP([/* GNU Emacs site configuration template file. === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2011-05-18 03:39:45 +0000 +++ lib-src/ChangeLog 2011-05-19 06:04:16 +0000 @@ -1,3 +1,8 @@ +2011-05-19 Glenn Morris + + * makefile.w32-in (echolisp): Remove rule that is no longer needed. + (clean): No more echolisp.tmp. + 2011-05-18 Glenn Morris * fakemail.c: Remove file. === modified file 'lib-src/makefile.w32-in' --- lib-src/makefile.w32-in 2011-05-18 03:39:45 +0000 +++ lib-src/makefile.w32-in 2011-05-19 06:04:16 +0000 @@ -269,11 +269,6 @@ $(lispsource)window.elc \ $(lispsource)version.el -# Used by batch-update-autoloads. -echolisp: - @echo $(lisp1) - @echo $(lisp2) - # This is needed the first time we build the tree, since temacs.exe # does not exist yet, and the DOC rule needs it to rebuild DOC whenever # Emacs is rebuilt. @@ -330,7 +325,6 @@ - $(DEL) ctags.c - $(DEL_TREE) $(OBJDIR) - $(DEL) stamp_BLD - - $(DEL) echolisp.tmp distclean: cleanall - $(DEL) TAGS === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-05-18 12:59:25 +0000 +++ lisp/ChangeLog 2011-05-19 06:04:16 +0000 @@ -1,3 +1,8 @@ +2011-05-19 Glenn Morris + + * emacs-lisp/autoload.el (batch-update-autoloads): + Set autoload-excludes by parsing loadup.el rather than Makefiles. + 2011-05-18 Michael Albinus * net/tramp.el (tramp-process-actions): Set "first-password-request" === modified file 'lisp/emacs-lisp/autoload.el' --- lisp/emacs-lisp/autoload.el 2011-05-04 15:38:41 +0000 +++ lisp/emacs-lisp/autoload.el 2011-05-19 06:04:16 +0000 @@ -769,52 +769,21 @@ Definitions are written to `generated-autoload-file' (which should be non-nil)." ;; For use during the Emacs build process only. + ;; Exclude those files that are preloaded on ALL platforms. + ;; These are the ones in loadup.el where "(load" is at the start + ;; of the line (crude, but it works). (unless autoload-excludes - (let* ((ldir (file-name-directory generated-autoload-file)) - (default-directory - (file-name-as-directory - (expand-file-name (if (eq system-type 'windows-nt) - "../lib-src" - "../src") ldir))) - (mfile "Makefile") - (tmpfile "echolisp.tmp") - lim) - ;; Windows uses the 'echolisp' approach because: - ;; i) It does not have $lisp as a single simple definition, so - ;; it would be harder to parse the Makefile. - ;; ii) It can, since it already has $lisp broken up into pieces - ;; that the command-line can handle. - ;; Non-Windows builds do not use the 'echolisp' approach because - ;; no-one knows (?) the maximum safe command-line length on all - ;; supported systems. $lisp is much longer there since it uses - ;; absolute paths, and it would seem a shame to split it just for this. - (when (file-readable-p mfile) - (if (eq system-type 'windows-nt) - (when (ignore-errors - (if (file-exists-p tmpfile) (delete-file tmpfile)) - ;; FIXME call-process is better, if it works. - (shell-command (format "%s echolisp > %s" - autoload-make-program tmpfile)) - (file-readable-p tmpfile)) - (with-temp-buffer - (insert-file-contents tmpfile) - ;; FIXME could be a single while loop. - (while (not (eobp)) - (setq lim (line-end-position)) - (while (re-search-forward "\\([^ ]+\\.el\\)c?\\>" lim t) - (push (expand-file-name (match-string 1)) - autoload-excludes)) - (forward-line 1)))) - (with-temp-buffer - (insert-file-contents mfile) - (when (re-search-forward "^shortlisp= " nil t) - (while (and (not lim) - (re-search-forward "\\.\\./lisp/\\([^ ]+\\.el\\)c?\\>" - nil t)) - (push (expand-file-name (match-string 1) ldir) - autoload-excludes) - (skip-chars-forward " \t") - (if (eolp) (setq lim t))))))))) + (let ((default-directory (file-name-directory generated-autoload-file)) + file) + (when (file-readable-p "loadup.el") + (with-temp-buffer + (insert-file-contents "loadup.el") + (while (re-search-forward "^(load \"\\([^\"]+\\)\"" nil t) + (setq file (match-string 1)) + (or (string-match "\\.el\\'" file) + (setq file (format "%s.el" file))) + (or (string-match "\\`site-" file) + (push (expand-file-name file) autoload-excludes))))))) (let ((args command-line-args-left)) (setq command-line-args-left nil) (apply 'update-directory-autoloads args))) === modified file 'lisp/loadup.el' --- lisp/loadup.el 2011-04-15 03:15:22 +0000 +++ lisp/loadup.el 2011-05-19 06:04:16 +0000 @@ -29,21 +29,16 @@ ;; If you add/remove Lisp files to be loaded here, consider the ;; following issues: -;; i) Any file loaded on all platforms should appear in $lisp -;; and $shortlisp in src/Makefile.in. Use the .el or .elc version as +;; i) Any file loaded on any platform should appear in $lisp and +;; $shortlisp in src/Makefile.in. Use the .el or .elc version as ;; appropriate. -;; ii) Any file that is only loaded on some platforms should appear -;; in the version of $lisp in the generated Makefile on that platform. -;; At the present time, this is achieved by use of #ifdefs. -;; It should also appear in $SOME_MACHINE_LISP on all platforms. - -;; The above steps ensure both that the Lisp files are compiled (if -;; necessary) before the emacs executable is dumped, and that they are -;; passed to make-docfile. (Any that are not processed for DOC will -;; not have doc strings in the dumped Emacs.) Because of this: - -;; iii) If the file is loaded uncompiled, it should (where possible) +;; This ensures both that the Lisp files are compiled (if necessary) +;; before the emacs executable is dumped, and that they are passed to +;; make-docfile. (Any that are not processed for DOC will not have +;; doc strings in the dumped Emacs.) Because of this: + +;; ii) If the file is loaded uncompiled, it should (where possible) ;; obey the doc-string conventions expected by make-docfile. ;;; Code: === modified file 'msdos/ChangeLog' --- msdos/ChangeLog 2011-05-07 10:24:55 +0000 +++ msdos/ChangeLog 2011-05-19 06:04:16 +0000 @@ -1,3 +1,9 @@ +2011-05-19 Glenn Morris + + * sed1x.inp (TOOLTIP_SUPPORT, WINDOW_SUPPORT): + * sed1v2.inp (MSDOS_SUPPORT, NS_SUPPORT, MOUSE_SUPPORT) + (TOOLTIP_SUPPORT, WINDOW_SUPPORT): No need to edit these any more. + 2011-05-07 Eli Zaretskii * inttypes.h: Include stdint.h. === modified file 'msdos/sed1v2.inp' --- msdos/sed1v2.inp 2011-04-30 10:31:17 +0000 +++ msdos/sed1v2.inp 2011-05-19 06:04:16 +0000 @@ -94,13 +94,11 @@ /^WIDGET_OBJ *=/s/@WIDGET_OBJ@// /^CYGWIN_OBJ *=/s/@CYGWIN_OBJ@// /^MSDOS_OBJ *=/s/= */= dosfns.o msdos.o w16select.o/ -/^MSDOS_SUPPORT *=/s/= */= $(MSDOS_SUPPORT_REAL)/ /^ns_appdir *=/s/@ns_appdir@// /^ns_appbindir *=/s/@ns_appbindir@// /^ns_appsrc *=/s/@ns_appsrc@// /^NS_OBJ *=/s/@NS_OBJ@// /^NS_OBJC_OBJ *=/s/@NS_OBJC_OBJ@// -/^NS_SUPPORT *=/s/@NS_SUPPORT@// /^GNU_OBJC_CFLAGS*=/s/@GNU_OBJC_CFLAGS@// /^LIBRESOLV *=/s/@LIBRESOLV@// /^LIBSELINUX_LIBS *=/s/@LIBSELINUX_LIBS@// @@ -111,9 +109,6 @@ /^OTHER_FILES *=/s/@OTHER_FILES@// /^XMENU_OBJ *=/s/@XMENU_OBJ@/xmenu.o/ /^FONT_OBJ *=/s/@FONT_OBJ@// -/^MOUSE_SUPPORT *=/s/@MOUSE_SUPPORT@/$(REAL_MOUSE_SUPPORT)/ -/^TOOLTIP_SUPPORT *=/s/@TOOLTIP_SUPPORT@// -/^WINDOW_SUPPORT *=/s/@WINDOW_SUPPORT@// /^LIBGPM *=/s/@LIBGPM@// /^EXEEXT *=/s/@EXEEXT@/.exe/ /^OLDXMENU *=/s/@OLDXMENU@/nothing/ === modified file 'msdos/sed1x.inp' --- msdos/sed1x.inp 2011-01-25 04:08:28 +0000 +++ msdos/sed1x.inp 2011-05-19 06:04:16 +0000 @@ -26,7 +26,5 @@ /^LIBS_SYSTEM *=/s!= *!= -lxext -lsys! /^MSDOS_X_OBJ *=/s!= *!= w16select.o termcap.o! /^FONT_OBJ *=/s!= *!= xfont.o! -/^TOOLTIP_SUPPORT *=/s!= *!= ${lispsource}tooltip.elc! -/^WINDOW_SUPPORT *=/s!= *!= $(BASE_WINDOW_SUPPORT) $(X_WINDOW_SUPPORT)! /^temacs *:/s!OLDXMENU!LIBXMENU! === modified file 'src/ChangeLog' --- src/ChangeLog 2011-05-19 00:37:36 +0000 +++ src/ChangeLog 2011-05-19 06:04:16 +0000 @@ -1,3 +1,14 @@ +2011-05-19 Glenn Morris + + * Makefile.in (MSDOS_SUPPORT_REAL, MSDOS_SUPPORT, NS_SUPPORT) + (REAL_MOUSE_SUPPORT, GPM_MOUSE_SUPPORT, MOUSE_SUPPORT, TOOLTIP_SUPPORT) + (BASE_WINDOW_SUPPORT, X_WINDOW_SUPPORT, WINDOW_SUPPORT): Remove. + (lisp): Set the order to that of loadup.el. + (shortlisp): Make it a copy of $lisp. + (SOME_MACHINE_LISP): Remove. + ($(etc)/DOC): Depend just on $lisp, not $SOME_MACHINE_LISP too. + Use just $shortlisp, not $SOME_MACHINE_LISP too. + 2011-05-18 Kenichi Handa * composite.c (CHAR_COMPOSABLE_P): Add more check for efficiency. === modified file 'src/Makefile.in' --- src/Makefile.in 2011-04-24 09:00:03 +0000 +++ src/Makefile.in 2011-05-19 06:04:16 +0000 @@ -237,18 +237,12 @@ MSDOS_OBJ = ## w16select.o termcap.o if MSDOS && HAVE_X_WINDOWS. MSDOS_X_OBJ = -MSDOS_SUPPORT_REAL = $(lispsource)/ls-lisp.elc $(lispsource)/disp-table.elc \ - $(lispsource)/dos-fns.elc $(lispsource)/dos-w32.elc $(lispsource)/dos-vars.elc \ - $(lispsource)/term/internal.elc $(lispsource)/term/pc-win.elc -## $MSDOS_SUPPORT_REAL if MSDOS. -MSDOS_SUPPORT = ns_appdir=@ns_appdir@ ns_appbindir=@ns_appbindir@ ns_appsrc=@ns_appsrc@ NS_OBJ=@NS_OBJ@ NS_OBJC_OBJ=@NS_OBJC_OBJ@ -NS_SUPPORT=@NS_SUPPORT@ ## Only set if NS_IMPL_GNUSTEP. GNU_OBJC_CFLAGS=@GNU_OBJC_CFLAGS@ @@ -258,28 +252,7 @@ ## else xfont.o FONT_OBJ=@FONT_OBJ@ -## Used if HAVE_MOUSE. -REAL_MOUSE_SUPPORT=$(lispsource)/mouse.elc $(lispsource)/select.elc \ - $(lispsource)/scroll-bar.elc -## Used if HAVE_GPM && !HAVE_MOUSE -GPM_MOUSE_SUPPORT=$(lispsource)/mouse.elc LIBGPM = @LIBGPM@ -## Either of the two preceding options, or empty. -MOUSE_SUPPORT=@MOUSE_SUPPORT@ - -## $(lispsource)/tooltip.elc if HAVE_WINDOW_SYSTEM, else empty. -TOOLTIP_SUPPORT=@TOOLTIP_SUPPORT@ - -BASE_WINDOW_SUPPORT=$(lispsource)/fringe.elc $(lispsource)/image.elc \ - $(lispsource)/international/fontset.elc $(lispsource)/dnd.elc \ - $(lispsource)/tool-bar.elc $(lispsource)/mwheel.elc - -X_WINDOW_SUPPORT=$(lispsource)/x-dnd.elc $(lispsource)/term/common-win.elc \ - $(lispsource)/term/x-win.elc $(lispsource)/dynamic-setting.elc - -## If HAVE_X_WINDOWS, both the above -## else if HAVE_WINDOW_SYSTEM (ie, HAVE_NS) just the former; else empty. -WINDOW_SUPPORT=@WINDOW_SUPPORT@ ## -lresolv, or empty. LIBRESOLV = @LIBRESOLV@ @@ -385,55 +358,60 @@ otherobj= $(TERMCAP_OBJ) $(PRE_ALLOC_OBJ) $(GMALLOC_OBJ) $(RALLOC_OBJ) \ $(POST_ALLOC_OBJ) $(VMLIMIT_OBJ) $(WIDGET_OBJ) $(LIBOBJS) -## This is the platform-specific list of Lisp files loaded into the -## dumped Emacs. It is arranged like this because it is easier to generate -## it semi-mechanically from loadup.el this way. +## This is the list of all Lisp files that might be loaded into the +## dumped Emacs. Some of them are not loaded on all platforms, but +## the DOC file on every platform uses them (because the DOC file is +## supposed to be platform-independent). +## It is arranged like this because it is easier to generate it +## semi-mechanically from loadup.el this way. +## Eg something like: +## sed -e 's/"[ )].*//' -n -e '/(load "/ s/.*load "//p' loadup.el | \ +## grep -vE 'site-|ldefs-boot' +## minus any duplicates. +## Note that you cannot just add a ".elc" extension to every file, +## since some of them are no-byte-compile (eg some language/ ones). +## +## Confusingly, term/internal is not in loadup, but is unconditionally +## loaded by pc-win, which is. ## ## Note that this list should not include lisp files which might not ## be present, like site-load.el and site-init.el; this makefile ## expects them all to be either present or buildable. ## -## Files which are loaded unconditionally (i.e., on all platforms) should -## also be in shortlisp. Files which are loaded conditionally (i.e., only -## on some platforms) should instead be in SOME_MACHINE_LISP. -## ## Place loaddefs.el first, so it gets generated first, since it is on ## the critical path (relevant in parallel compilations). lisp= \ $(lispsource)/loaddefs.el \ - $(lispsource)/abbrev.elc \ - $(lispsource)/buff-menu.elc \ - $(lispsource)/button.elc \ + $(lispsource)/loadup.el \ $(lispsource)/emacs-lisp/byte-run.elc \ - $(lispsource)/composite.elc \ - $(lispsource)/cus-face.elc \ + $(lispsource)/emacs-lisp/backquote.elc \ + $(lispsource)/subr.elc \ + $(lispsource)/version.el \ + $(lispsource)/widget.elc \ + $(lispsource)/custom.elc \ + $(lispsource)/emacs-lisp/map-ynp.elc \ $(lispsource)/cus-start.elc \ - $(lispsource)/custom.elc \ - $(lispsource)/emacs-lisp/backquote.elc \ - $(lispsource)/emacs-lisp/lisp-mode.elc \ - $(lispsource)/emacs-lisp/lisp.elc \ + $(lispsource)/international/mule.elc \ + $(lispsource)/international/mule-conf.elc \ $(lispsource)/env.elc \ + $(lispsource)/format.elc \ + $(lispsource)/bindings.elc \ + $(lispsource)/files.elc \ + $(lispsource)/cus-face.elc \ $(lispsource)/faces.elc \ - $(lispsource)/files.elc \ - $(lispsource)/format.elc \ - $(lispsource)/facemenu.elc \ - $(MOUSE_SUPPORT) \ - $(lispsource)/emacs-lisp/float-sup.elc \ - $(lispsource)/frame.elc \ + $(lispsource)/button.elc \ + $(lispsource)/startup.elc \ + $(lispsource)/minibuffer.elc \ + $(lispsource)/abbrev.elc \ + $(lispsource)/simple.elc \ $(lispsource)/help.elc \ - $(lispsource)/indent.elc \ - $(lispsource)/isearch.elc \ - $(lispsource)/rfn-eshadow.elc \ - $(lispsource)/loadup.el \ - $(lispsource)/bindings.elc \ - $(lispsource)/emacs-lisp/map-ynp.elc \ - $(lispsource)/menu-bar.elc \ - $(lispsource)/international/mule.elc \ - $(lispsource)/international/mule-conf.elc \ + $(lispsource)/jka-cmpr-hook.elc \ + $(lispsource)/epa-hook.elc \ $(lispsource)/international/mule-cmds.elc \ + $(lispsource)/case-table.elc \ $(lispsource)/international/characters.elc \ + $(lispsource)/composite.elc \ $(lispsource)/international/charprop.el \ - $(lispsource)/case-table.elc \ $(lispsource)/language/chinese.elc \ $(lispsource)/language/cyrillic.elc \ $(lispsource)/language/indian.elc \ @@ -449,7 +427,6 @@ $(lispsource)/language/japanese.el \ $(lispsource)/language/korean.el \ $(lispsource)/language/lao.el \ - $(lispsource)/language/cham.el \ $(lispsource)/language/tai-viet.el \ $(lispsource)/language/thai.el \ $(lispsource)/language/tibetan.elc \ @@ -459,72 +436,95 @@ $(lispsource)/language/georgian.el \ $(lispsource)/language/khmer.el \ $(lispsource)/language/burmese.el \ - $(lispsource)/paths.el \ - $(lispsource)/register.elc \ - $(lispsource)/replace.elc \ - $(lispsource)/simple.elc \ - $(lispsource)/minibuffer.elc \ - $(lispsource)/startup.elc \ - $(lispsource)/subr.elc \ + $(lispsource)/language/cham.el \ + $(lispsource)/indent.elc \ + $(lispsource)/window.elc \ + $(lispsource)/frame.elc \ $(lispsource)/term/tty-colors.elc \ $(lispsource)/font-core.elc \ + $(lispsource)/facemenu.elc \ $(lispsource)/emacs-lisp/syntax.elc \ $(lispsource)/font-lock.elc \ $(lispsource)/jit-lock.elc \ - $(lispsource)/textmodes/fill.elc \ + $(lispsource)/mouse.elc \ + $(lispsource)/scroll-bar.elc \ + $(lispsource)/select.elc \ + $(lispsource)/emacs-lisp/timer.elc \ + $(lispsource)/isearch.elc \ + $(lispsource)/rfn-eshadow.elc \ + $(lispsource)/menu-bar.elc \ + $(lispsource)/paths.el \ + $(lispsource)/emacs-lisp/lisp.elc \ $(lispsource)/textmodes/page.elc \ + $(lispsource)/register.elc \ $(lispsource)/textmodes/paragraphs.elc \ + $(lispsource)/emacs-lisp/lisp-mode.elc \ $(lispsource)/textmodes/text-mode.elc \ - $(lispsource)/emacs-lisp/timer.elc \ - $(lispsource)/jka-cmpr-hook.elc \ + $(lispsource)/textmodes/fill.elc \ + $(lispsource)/replace.elc \ + $(lispsource)/buff-menu.elc \ + $(lispsource)/fringe.elc \ + $(lispsource)/image.elc \ + $(lispsource)/international/fontset.elc \ + $(lispsource)/dnd.elc \ + $(lispsource)/tool-bar.elc \ + $(lispsource)/dynamic-setting.elc \ + $(lispsource)/x-dnd.elc \ + $(lispsource)/term/common-win.elc \ + $(lispsource)/term/x-win.elc \ + $(lispsource)/w32-vars.elc \ + $(lispsource)/term/w32-win.elc \ + $(lispsource)/ls-lisp.elc \ + $(lispsource)/disp-table.elc \ + $(lispsource)/dos-w32.elc \ + $(lispsource)/w32-fns.elc \ + $(lispsource)/dos-fns.elc \ + $(lispsource)/dos-vars.elc \ + $(lispsource)/term/pc-win.elc \ + $(lispsource)/term/internal.elc \ + $(lispsource)/term/ns-win.elc \ + $(lispsource)/mwheel.elc \ + $(lispsource)/emacs-lisp/float-sup.elc \ $(lispsource)/vc/vc-hooks.elc \ $(lispsource)/vc/ediff-hook.elc \ - $(lispsource)/epa-hook.elc \ - $(TOOLTIP_SUPPORT) \ - $(MSDOS_SUPPORT) \ - $(WINDOW_SUPPORT) \ - $(NS_SUPPORT) \ - $(lispsource)/widget.elc \ - $(lispsource)/window.elc \ - $(lispsource)/version.el + $(lispsource)/tooltip.elc -## List of relative names for those files from $lisp that are loaded -## unconditionally (i.e. on all platforms). Files from $lisp that -## are only loaded on some platforms should instead be placed in -## SOME_MACHINE_LISP. The only reason this variable exists is to prevent -## the make-docfile command-line getting too long for some systems. +## The same as $lisp, but using relative file names. The only reason +## this variable exists is to prevent the make-docfile command-line +## getting too long for some systems. Unfortunately, no-one has any +## idea how long "too long" is. shortlisp= \ ../lisp/loaddefs.el \ - ../lisp/abbrev.elc \ - ../lisp/buff-menu.elc \ - ../lisp/button.elc \ + ../lisp/loadup.el \ ../lisp/emacs-lisp/byte-run.elc \ - ../lisp/composite.elc \ - ../lisp/cus-face.elc \ - ../lisp/cus-start.elc \ + ../lisp/emacs-lisp/backquote.elc \ + ../lisp/subr.elc \ + ../lisp/version.el \ + ../lisp/widget.elc \ ../lisp/custom.elc \ - ../lisp/emacs-lisp/backquote.elc \ - ../lisp/emacs-lisp/lisp-mode.elc \ - ../lisp/emacs-lisp/lisp.elc \ - ../lisp/facemenu.elc \ - ../lisp/faces.elc \ - ../lisp/files.elc \ - ../lisp/emacs-lisp/float-sup.elc \ - ../lisp/format.elc \ - ../lisp/frame.elc \ - ../lisp/help.elc \ - ../lisp/indent.elc \ - ../lisp/isearch.elc \ - ../lisp/rfn-eshadow.elc \ - ../lisp/loadup.el \ - ../lisp/bindings.elc \ ../lisp/emacs-lisp/map-ynp.elc \ - ../lisp/env.elc \ + ../lisp/cus-start.elc \ ../lisp/international/mule.elc \ ../lisp/international/mule-conf.elc \ + ../lisp/env.elc \ + ../lisp/format.elc \ + ../lisp/bindings.elc \ + ../lisp/files.elc \ + ../lisp/cus-face.elc \ + ../lisp/faces.elc \ + ../lisp/button.elc \ + ../lisp/startup.elc \ + ../lisp/minibuffer.elc \ + ../lisp/abbrev.elc \ + ../lisp/simple.elc \ + ../lisp/help.elc \ + ../lisp/jka-cmpr-hook.elc \ + ../lisp/epa-hook.elc \ ../lisp/international/mule-cmds.elc \ + ../lisp/case-table.elc \ ../lisp/international/characters.elc \ - ../lisp/case-table.elc \ + ../lisp/composite.elc \ + ../lisp/international/charprop.el \ ../lisp/language/chinese.elc \ ../lisp/language/cyrillic.elc \ ../lisp/language/indian.elc \ @@ -540,7 +540,6 @@ ../lisp/language/japanese.el \ ../lisp/language/korean.el \ ../lisp/language/lao.el \ - ../lisp/language/cham.el \ ../lisp/language/tai-viet.el \ ../lisp/language/thai.el \ ../lisp/language/tibetan.elc \ @@ -550,50 +549,58 @@ ../lisp/language/georgian.el \ ../lisp/language/khmer.el \ ../lisp/language/burmese.el \ - ../lisp/menu-bar.elc \ - ../lisp/paths.el \ - ../lisp/register.elc \ - ../lisp/replace.elc \ - ../lisp/simple.elc \ - ../lisp/minibuffer.elc \ - ../lisp/startup.elc \ - ../lisp/subr.elc \ + ../lisp/language/cham.el \ + ../lisp/indent.elc \ + ../lisp/window.elc \ + ../lisp/frame.elc \ ../lisp/term/tty-colors.elc \ ../lisp/font-core.elc \ + ../lisp/facemenu.elc \ ../lisp/emacs-lisp/syntax.elc \ ../lisp/font-lock.elc \ ../lisp/jit-lock.elc \ - ../lisp/textmodes/fill.elc \ + ../lisp/mouse.elc \ + ../lisp/scroll-bar.elc \ + ../lisp/select.elc \ + ../lisp/emacs-lisp/timer.elc \ + ../lisp/isearch.elc \ + ../lisp/rfn-eshadow.elc \ + ../lisp/menu-bar.elc \ + ../lisp/paths.el \ + ../lisp/emacs-lisp/lisp.elc \ ../lisp/textmodes/page.elc \ + ../lisp/register.elc \ ../lisp/textmodes/paragraphs.elc \ + ../lisp/emacs-lisp/lisp-mode.elc \ ../lisp/textmodes/text-mode.elc \ - ../lisp/emacs-lisp/timer.elc \ + ../lisp/textmodes/fill.elc \ + ../lisp/replace.elc \ + ../lisp/buff-menu.elc \ + ../lisp/fringe.elc \ + ../lisp/image.elc \ + ../lisp/international/fontset.elc \ + ../lisp/dnd.elc \ + ../lisp/tool-bar.elc \ + ../lisp/dynamic-setting.elc \ + ../lisp/x-dnd.elc \ + ../lisp/term/common-win.elc \ + ../lisp/term/x-win.elc \ + ../lisp/w32-vars.elc \ + ../lisp/term/w32-win.elc \ + ../lisp/ls-lisp.elc \ + ../lisp/disp-table.elc \ + ../lisp/dos-w32.elc \ + ../lisp/w32-fns.elc \ + ../lisp/dos-fns.elc \ + ../lisp/dos-vars.elc \ + ../lisp/term/pc-win.elc \ + ../lisp/term/internal.elc \ + ../lisp/term/ns-win.elc \ + ../lisp/mwheel.elc \ + ../lisp/emacs-lisp/float-sup.elc \ ../lisp/vc/vc-hooks.elc \ ../lisp/vc/ediff-hook.elc \ - ../lisp/jka-cmpr-hook.elc \ - ../lisp/epa-hook.elc \ - ../lisp/widget.elc \ - ../lisp/window.elc \ - ../lisp/version.el - -## Like $shortlisp, but includes only those files from $lisp that are loaded -## conditionally (i.e., only on some platforms). -## Confusingly, term/internal is not in loadup, but is unconditionally -## loaded by pc-win, which is. -SOME_MACHINE_LISP = ../lisp/mouse.elc \ - ../lisp/select.elc ../lisp/scroll-bar.elc \ - ../lisp/ls-lisp.elc ../lisp/dos-fns.elc \ - ../lisp/w32-fns.elc ../lisp/dos-w32.elc \ - ../lisp/disp-table.elc ../lisp/dos-vars.elc ../lisp/w32-vars.elc \ - ../lisp/tooltip.elc ../lisp/image.elc \ - ../lisp/fringe.elc ../lisp/dnd.elc \ - ../lisp/mwheel.elc ../lisp/tool-bar.elc \ - ../lisp/x-dnd.elc ../lisp/dynamic-setting.elc \ - ../lisp/international/fontset.elc \ - ../lisp/term/common-win.elc \ - ../lisp/term/x-win.elc \ - ../lisp/term/pc-win.elc ../lisp/term/internal.elc \ - ../lisp/term/ns-win.elc ../lisp/term/w32-win.elc + ../lisp/tooltip.elc ## Construct full set of libraries to be linked. ## Note that SunOS needs -lm to come before -lc; otherwise, you get @@ -612,6 +619,9 @@ ## Does anyone ever pay attention to the load-path-shadows output here? ## The dumped Emacs is as functional and more efficient than ## bootstrap-emacs, so we replace the latter with the former. +## Strictly speaking, emacs does not depend directly on all of $lisp, +## since not all pieces are used on all platforms. But DOC depends +## on all of $lisp, and emacs depends on DOC, so it is ok to use $lisp here. emacs$(EXEEXT): temacs$(EXEEXT) $(etc)/DOC $(lisp) if test "$(CANNOT_DUMP)" = "yes"; then \ ln -f temacs$(EXEEXT) emacs$(EXEEXT); \ @@ -630,16 +640,15 @@ ## $(SOME_MACHINE_OBJECTS). Since a file is processed when it is mentioned ## for the first time, this prevents any variation between configurations ## in the contents of the DOC file. -## Likewise for $(SOME_MACHINE_LISP). ## Most of this Makefile refers to Lisp files via $(lispsource), so ## we also use $(lisp) rather than $(shortlisp) for the dependency since ## the Makefile uses string equality to decide when we talk about identical ## files. Apparently we pass $(shortlisp) rather than $(lisp) to make-docfile ## only in order to reduce the command line length. --Stef -$(etc)/DOC: $(libsrc)/make-docfile$(EXEEXT) $(obj) $(lisp) $(SOME_MACHINE_LISP) +$(etc)/DOC: $(libsrc)/make-docfile$(EXEEXT) $(obj) $(lisp) -rm -f $(etc)/DOC $(libsrc)/make-docfile -d $(srcdir) $(SOME_MACHINE_OBJECTS) $(obj) > $(etc)/DOC - $(libsrc)/make-docfile -a $(etc)/DOC -d $(srcdir) $(SOME_MACHINE_LISP) $(shortlisp) + $(libsrc)/make-docfile -a $(etc)/DOC -d $(srcdir) $(shortlisp) $(libsrc)/make-docfile$(EXEEXT): cd $(libsrc); $(MAKE) $(MFLAGS) make-docfile$(EXEEXT) @@ -797,7 +806,7 @@ THEFILE=$< EMACS=$(bootstrap_exe) ## Since the .el.elc rule cannot specify an extra dependency, we do it here. -$(lisp) $(SOME_MACHINE_LISP): $(BOOTSTRAPEMACS) +$(lisp): $(BOOTSTRAPEMACS) ## VCSWITNESS points to the file that holds info about the current checkout. ## We use it as a heuristic to decide when to rebuild loaddefs.el. ------------------------------------------------------------ revno: 104279 [merge] committer: Kenichi Handa branch nick: trunk timestamp: Thu 2011-05-19 09:53:09 +0900 message: Make find_automatic_composition more efficient. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-05-18 11:32:07 +0000 +++ src/ChangeLog 2011-05-19 00:37:36 +0000 @@ -1,3 +1,9 @@ +2011-05-18 Kenichi Handa + + * composite.c (CHAR_COMPOSABLE_P): Add more check for efficiency. + (BACKWARD_CHAR): Wrap the arg STOP by parenthesis. + (find_automatic_composition): Mostly rewrite for efficiency. + 2011-05-18 Juanma Barranquero * makefile.w32-in: Update dependencies. === modified file 'src/composite.c' --- src/composite.c 2011-05-12 07:07:06 +0000 +++ src/composite.c 2011-05-18 14:11:50 +0000 @@ -972,11 +972,12 @@ category Z? or C? are not composable except for ZWNJ and ZWJ. */ #define CHAR_COMPOSABLE_P(C) \ - ((C) == 0x200C || (C) == 0x200D \ - || (_work_val = CHAR_TABLE_REF (Vunicode_category_table, (C)), \ - (SYMBOLP (_work_val) \ - && (_work_char = SDATA (SYMBOL_NAME (_work_val))[0]) != 'C' \ - && _work_char != 'Z'))) + ((C) > ' ' \ + && ((C) == 0x200C || (C) == 0x200D \ + || (_work_val = CHAR_TABLE_REF (Vunicode_category_table, (C)), \ + (SYMBOLP (_work_val) \ + && (_work_char = SDATA (SYMBOL_NAME (_work_val))[0]) != 'C' \ + && _work_char != 'Z')))) /* Update cmp_it->stop_pos to the next position after CHARPOS (and BYTEPOS) where character composition may happen. If BYTEPOS is @@ -1471,7 +1472,7 @@ /* Update the members of POSITION to the previous character boundary. */ #define BACKWARD_CHAR(POSITION, STOP) \ do { \ - if ((POSITION).pos == STOP) \ + if ((POSITION).pos == (STOP)) \ (POSITION).p = GPT_ADDR; \ do { \ (POSITION).pos_byte--; \ @@ -1481,178 +1482,198 @@ } while (0) /* This is like find_composition, but find an automatic composition - instead. If found, set *GSTRING to the glyph-string representing - the composition, and return 1. Otherwise, return 0. */ + instead. It is assured that POS is not within a static + composition. If found, set *GSTRING to the glyph-string + representing the composition, and return 1. Otherwise, *GSTRING to + Qnil, and return 0. */ static int -find_automatic_composition (EMACS_INT pos, EMACS_INT limit, EMACS_INT *start, EMACS_INT *end, Lisp_Object *gstring, Lisp_Object string) +find_automatic_composition (EMACS_INT pos, EMACS_INT limit, + EMACS_INT *start, EMACS_INT *end, + Lisp_Object *gstring, Lisp_Object string) { EMACS_INT head, tail, stop; - /* Limit to check a composition after POS. */ + /* Forward limit position of checking a composition taking a + looking-back count into account. */ EMACS_INT fore_check_limit; - struct position_record orig, cur; - - /* FIXME: It's not obvious whether these two variables need initialization. - If they do, please supply initial values. - If not, please remove this comment. */ - struct position_record check IF_LINT (= {0}), prev IF_LINT (= {0}); - - Lisp_Object check_val, val, elt; + struct position_record cur, prev; int c; Lisp_Object window; struct window *w; + int need_adjustment = 0; window = Fget_buffer_window (Fcurrent_buffer (), Qnil); if (NILP (window)) return 0; w = XWINDOW (window); - orig.pos = pos; + cur.pos = pos; if (NILP (string)) { head = BEGV, tail = ZV, stop = GPT; - orig.pos_byte = CHAR_TO_BYTE (orig.pos); - orig.p = BYTE_POS_ADDR (orig.pos_byte); + cur.pos_byte = CHAR_TO_BYTE (cur.pos); + cur.p = BYTE_POS_ADDR (cur.pos_byte); } else { head = 0, tail = SCHARS (string), stop = -1; - orig.pos_byte = string_char_to_byte (string, orig.pos); - orig.p = SDATA (string) + orig.pos_byte; + cur.pos_byte = string_char_to_byte (string, cur.pos); + cur.p = SDATA (string) + cur.pos_byte; } - if (limit < pos) - fore_check_limit = min (tail, pos + MAX_AUTO_COMPOSITION_LOOKBACK); + if (limit < 0) + /* Finding a composition covering the character after POS is the + same as setting LIMIT to POS. */ + limit = pos; + if (limit <= pos) + fore_check_limit = min (tail, pos + 1 + MAX_AUTO_COMPOSITION_LOOKBACK); else fore_check_limit = min (tail, limit + MAX_AUTO_COMPOSITION_LOOKBACK); - cur = orig; - - retry: - check_val = Qnil; - /* At first, check if POS is composable. */ - c = STRING_CHAR (cur.p); - if (! CHAR_COMPOSABLE_P (c)) - { - if (limit < 0) - return 0; - if (limit >= cur.pos) - goto search_forward; - } - else - { - val = CHAR_TABLE_REF (Vcomposition_function_table, c); - if (! NILP (val)) - check_val = val, check = cur; - else - while (cur.pos + 1 < fore_check_limit) - { - EMACS_INT b, e; - - FORWARD_CHAR (cur, stop); - if (get_property_and_range (cur.pos, Qcomposition, &val, &b, &e, - Qnil) - && COMPOSITION_VALID_P (b, e, val)) - { - fore_check_limit = cur.pos; - break; - } - c = STRING_CHAR (cur.p); - if (! CHAR_COMPOSABLE_P (c)) - break; - val = CHAR_TABLE_REF (Vcomposition_function_table, c); - if (NILP (val)) - continue; - check_val = val, check = cur; - break; - } - cur = orig; - } - /* Rewind back to the position where we can safely search forward - for compositions. */ - while (cur.pos > head) - { - EMACS_INT b, e; - - BACKWARD_CHAR (cur, stop); - if (get_property_and_range (cur.pos, Qcomposition, &val, &b, &e, Qnil) - && COMPOSITION_VALID_P (b, e, val)) - break; + + /* Provided that we have these possible compositions now: + + POS: 1 2 3 4 5 6 7 8 9 + |-A-| + |-B-|-C-|--D--| + + Here, it is known that characters after positions 1 and 9 can + never be composed (i.e. ! CHAR_COMPOSABLE_P (CH)), and + composition A is an invalid one because it's partially covered by + the valid composition C. And to know whether a composition is + valid or not, the only way is to start searching forward from a + position that can not be a tail part of composition (it's 2 in + the above case). + + Now we have these cases (1 through 4): + + -- character after POS is ... -- + not composable composable + LIMIT <= POS (1) (3) + POS < LIMIT (2) (4) + + Among them, in case (2), we simply search forward from POS. + + In the other cases, we at first rewind back to the position where + the previous character is not composable or the beginning of + buffer (string), then search compositions forward. In case (1) + and (3) we repeat this process until a composition is found. */ + + while (1) + { c = STRING_CHAR (cur.p); if (! CHAR_COMPOSABLE_P (c)) - break; - val = CHAR_TABLE_REF (Vcomposition_function_table, c); - if (! NILP (val)) - check_val = val, check = cur; - } - prev = cur; - /* Now search forward. */ - search_forward: - *gstring = Qnil; - if (! NILP (check_val) || limit >= orig.pos) - { - if (NILP (check_val)) - cur = orig; - else - cur = check; + { + if (limit <= pos) /* case (1) */ + { + do { + if (cur.pos == limit) + return 0; + BACKWARD_CHAR (cur, stop); + c = STRING_CHAR (cur.p); + } while (! CHAR_COMPOSABLE_P (c)); + fore_check_limit = cur.pos + 1; + } + else /* case (2) */ + /* No need of rewinding back. */ + goto search_forward; + } + + /* Rewind back to the position where we can safely search + forward for compositions. It is assured that the character + at cur.pos is composable. */ + while (head < cur.pos) + { + prev = cur; + BACKWARD_CHAR (cur, stop); + c = STRING_CHAR (cur.p); + if (! CHAR_COMPOSABLE_P (c)) + { + cur = prev; + break; + } + } + + search_forward: + /* Now search forward. */ + *gstring = Qnil; + prev = cur; /* remember the start of searching position. */ while (cur.pos < fore_check_limit) { - int need_adjustment = 0; - - if (NILP (check_val)) - { - c = STRING_CHAR (cur.p); - check_val = CHAR_TABLE_REF (Vcomposition_function_table, c); - } - for (; CONSP (check_val); check_val = XCDR (check_val)) - { - elt = XCAR (check_val); - if (VECTORP (elt) && ASIZE (elt) == 3 && NATNUMP (AREF (elt, 1)) - && cur.pos - XFASTINT (AREF (elt, 1)) >= head) + Lisp_Object val; + + c = STRING_CHAR (cur.p); + for (val = CHAR_TABLE_REF (Vcomposition_function_table, c); + CONSP (val); val = XCDR (val)) + { + Lisp_Object elt = XCAR (val); + + if (VECTORP (elt) && ASIZE (elt) == 3 && NATNUMP (AREF (elt, 1))) { - check.pos = cur.pos - XFASTINT (AREF (elt, 1)); - if (check.pos == cur.pos) - check.pos_byte = cur.pos_byte; - else - check.pos_byte = CHAR_TO_BYTE (check.pos); - val = autocmp_chars (elt, check.pos, check.pos_byte, - tail, w, NULL, string); + EMACS_INT check_pos = cur.pos - XFASTINT (AREF (elt, 1)); + struct position_record check; + + if (check_pos < head + || (limit <= pos ? pos < check_pos + : limit <= check_pos)) + continue; + for (check = cur; check_pos < check.pos; ) + BACKWARD_CHAR (check, stop); + *gstring = autocmp_chars (elt, check.pos, check.pos_byte, + tail, w, NULL, string); need_adjustment = 1; - if (! NILP (val)) - { - *gstring = val; + if (NILP (*gstring)) + { + /* As we have called Lisp, there's a possibility + that buffer/string is relocated. */ + if (NILP (string)) + cur.p = BYTE_POS_ADDR (cur.pos_byte); + else + cur.p = SDATA (string) + cur.pos_byte; + } + else + { + /* We found a candidate of a target composition. */ *start = check.pos; *end = check.pos + LGSTRING_CHAR_LEN (*gstring); - if (*start <= orig.pos ? *end > orig.pos - : limit >= orig.pos) + if (pos < limit + ? pos < *end + : *start <= pos && pos < *end) + /* This is the target composition. */ return 1; cur.pos = *end; - cur.pos_byte = CHAR_TO_BYTE (cur.pos); + if (NILP (string)) + { + cur.pos_byte = CHAR_TO_BYTE (cur.pos); + cur.p = BYTE_POS_ADDR (cur.pos_byte); + } + else + { + cur.pos_byte = string_char_to_byte (string, cur.pos); + cur.p = SDATA (string) + cur.pos_byte; + } break; } } } - if (need_adjustment) - { - /* As we have called Lisp, there's a possibility that - buffer/string is relocated. */ - if (NILP (string)) - cur.p = BYTE_POS_ADDR (cur.pos_byte); - else - cur.p = SDATA (string) + cur.pos_byte; - } - if (! CONSP (check_val)) + if (! CONSP (val)) + /* We found no composition here. */ FORWARD_CHAR (cur, stop); - check_val = Qnil; } - } - if (! NILP (*gstring)) - return (limit >= 0 || (*start <= orig.pos && *end > orig.pos)); - if (limit >= 0 && limit < orig.pos && prev.pos > head) - { + + if (pos < limit) /* case (2) and (4)*/ + return 0; + if (! NILP (*gstring)) + return 1; + if (prev.pos == head) + return 0; cur = prev; + if (need_adjustment) + { + if (NILP (string)) + cur.p = BYTE_POS_ADDR (cur.pos_byte); + else + cur.p = SDATA (string) + cur.pos_byte; + } BACKWARD_CHAR (cur, stop); - orig = cur; - fore_check_limit = orig.pos; - goto retry; } return 0; } ------------------------------------------------------------ revno: 104278 author: Teodor Zlatanov committer: Katsumi Yamaoka branch nick: trunk timestamp: Wed 2011-05-18 22:16:26 +0000 message: gnus.texi (Gnus Registry Setup): Rename from "Setup". (Store custom flags and keywords): Mention `gnus-registry-user-format-function-M' and `gnus-registry-user-format-function-M2'. gnus-registry.el (gnus-registry-user-format-function-M): Use `mapconcat'. (gnus-registry-user-format-function-M2): Use to see the full text of the marks. Make "," the mark text separator. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2011-05-18 05:21:07 +0000 +++ doc/misc/ChangeLog 2011-05-18 22:16:26 +0000 @@ -1,3 +1,10 @@ +2011-05-18 Teodor Zlatanov + + * gnus.texi (Gnus Registry Setup): Rename from "Setup". + (Store custom flags and keywords): Mention + `gnus-registry-user-format-function-M' and + `gnus-registry-user-format-function-M2'. + 2011-05-17 Paul Eggert * texinfo.tex: Sync from gnulib, version 2011-05-11.16. === modified file 'doc/misc/gnus.texi' --- doc/misc/gnus.texi 2011-05-17 02:30:53 +0000 +++ doc/misc/gnus.texi 2011-05-18 22:16:26 +0000 @@ -25906,15 +25906,15 @@ @end enumerate @menu -* Setup:: +* Gnus Registry Setup:: * Fancy splitting to parent:: * Registry Article Refer Method:: * Store custom flags and keywords:: * Store arbitrary data:: @end menu -@node Setup -@subsection Setup +@node Gnus Registry Setup +@subsection Gnus Registry Setup Fortunately, setting up the Gnus registry is pretty easy: @@ -26086,6 +26086,21 @@ will offer the available marks for completion. @end defun +You can use @code{defalias} to install a summary line formatting +function that will show the registry marks. There are two flavors of +this function, either showing the marks as single characters, using +their @code{:char} property, or showing the marks as full strings. + +@lisp +;; show the marks as single characters (see the :char property in +;; `gnus-registry-marks'): +;; (defalias 'gnus-user-format-function-M 'gnus-registry-user-format-function-M) + +;; show the marks by name (see `gnus-registry-marks'): +;; (defalias 'gnus-user-format-function-M 'gnus-registry-user-format-function-M2) +@end lisp + + @node Store arbitrary data @subsection Store arbitrary data === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-05-18 14:17:34 +0000 +++ lisp/gnus/ChangeLog 2011-05-18 22:16:26 +0000 @@ -1,5 +1,10 @@ 2011-05-18 Teodor Zlatanov + * gnus-registry.el (gnus-registry-user-format-function-M): + Use `mapconcat'. + (gnus-registry-user-format-function-M2): Use to see the full text of + the marks. Make "," the mark text separator. + * nntp.el (nntp-send-authinfo): Use the "force" token for NNTP authentication with auth-source. === modified file 'lisp/gnus/gnus-registry.el' --- lisp/gnus/gnus-registry.el 2011-05-13 04:12:37 +0000 +++ lisp/gnus/gnus-registry.el 2011-05-18 22:16:26 +0000 @@ -57,6 +57,16 @@ ;; You should also consider using the nnregistry backend to look up ;; articles. See the Gnus manual for more information. +;; Finally, you can put %uM in your summary line format to show the +;; registry marks if you do this: + +;; show the marks as single characters (see the :char property in +;; `gnus-registry-marks'): +;; (defalias 'gnus-user-format-function-M 'gnus-registry-user-format-function-M) + +;; show the marks by name (see `gnus-registry-marks'): +;; (defalias 'gnus-user-format-function-M 'gnus-registry-user-format-function-M2) + ;; TODO: ;; - get the correct group on spool actions @@ -887,22 +897,26 @@ nil (cons "Registry Marks" gnus-registry-misc-menus)))))) -;;; use like this: -;;; (defalias 'gnus-user-format-function-M -;;; 'gnus-registry-user-format-function-M) +;; use like this: +;; (defalias 'gnus-user-format-function-M 'gnus-registry-user-format-function-M) (defun gnus-registry-user-format-function-M (headers) - (let* ((id (mail-header-message-id headers)) - (marks (when id (gnus-registry-get-id-key id 'mark)))) - (apply 'concat (mapcar (lambda (mark) - (let ((c - (plist-get - (cdr-safe - (assoc mark gnus-registry-marks)) - :char))) - (if c - (list c) - nil))) - marks)))) + "Show the marks for an article by the :char property" + (let* ((id (mail-header-message-id headers)) + (marks (when id (gnus-registry-get-id-key id 'mark)))) + (mapconcat (lambda (mark) + (plist-get + (cdr-safe + (assoc mark gnus-registry-marks)) + :char)) + marks ""))) + +;; use like this: +;; (defalias 'gnus-user-format-function-M 'gnus-registry-user-format-function-M2) +(defun gnus-registry-user-format-function-M2 (headers) + "Show the marks for an article by name" + (let* ((id (mail-header-message-id headers)) + (marks (when id (gnus-registry-get-id-key id 'mark)))) + (mapconcat (lambda (mark) (symbol-name mark)) marks ","))) (defun gnus-registry-read-mark () "Read a mark name from the user with completion." ------------------------------------------------------------ revno: 104277 author: Teodor Zlatanov committer: Katsumi Yamaoka branch nick: trunk timestamp: Wed 2011-05-18 14:17:34 +0000 message: nntp.el (nntp-send-authinfo): Use the "force" token for NNTP authentication with auth-source. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-05-17 02:32:50 +0000 +++ lisp/gnus/ChangeLog 2011-05-18 14:17:34 +0000 @@ -1,3 +1,8 @@ +2011-05-18 Teodor Zlatanov + + * nntp.el (nntp-send-authinfo): Use the "force" token for NNTP + authentication with auth-source. + 2011-05-17 Glenn Morris * gnus-group.el (gnus-import-other-newsrc-file): === modified file 'lisp/gnus/nntp.el' --- lisp/gnus/nntp.el 2011-05-16 14:46:30 +0000 +++ lisp/gnus/nntp.el 2011-05-18 14:17:34 +0000 @@ -1227,17 +1227,20 @@ (require 'netrc) (let* ((list (netrc-parse nntp-authinfo-file)) (alist (netrc-machine list nntp-address "nntp")) - (force (or (netrc-get alist "force") nntp-authinfo-force)) (auth-info (nth 0 (auth-source-search :max 1 ;; TODO: allow the virtual server name too :host nntp-address :port '("119" "nntp")))) (auth-user (plist-get auth-info :user)) + (auth-force (plist-get auth-info :force)) (auth-passwd (plist-get auth-info :secret)) (auth-passwd (if (functionp auth-passwd) (funcall auth-passwd) auth-passwd)) + (force (or (netrc-get alist "force") + nntp-authinfo-force + auth-force)) (user (or ;; this is preferred to netrc-* auth-user ------------------------------------------------------------ revno: 104276 committer: Michael Albinus branch nick: trunk timestamp: Wed 2011-05-18 14:59:25 +0200 message: * net/tramp.el (tramp-process-actions): Set "first-password-request" property for the correct connection in case of multihops. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-05-18 11:53:59 +0000 +++ lisp/ChangeLog 2011-05-18 12:59:25 +0000 @@ -1,3 +1,8 @@ +2011-05-18 Michael Albinus + + * net/tramp.el (tramp-process-actions): Set "first-password-request" + property for the correct connection in case of multihops. + 2011-05-18 Glenn Morris * emacs-lisp/authors.el (authors-fixed-entries): Remove fakemail.c. === modified file 'lisp/net/tramp.el' --- lisp/net/tramp.el 2011-05-17 12:47:55 +0000 +++ lisp/net/tramp.el 2011-05-18 12:59:25 +0000 @@ -3105,8 +3105,13 @@ connection buffer." ;; Preserve message for `progress-reporter'. (tramp-compat-with-temp-message "" - ;; Enable auth-source and password-cache. - (tramp-set-connection-property vec "first-password-request" t) + ;; Enable auth-source and password-cache. We must use + ;; tramp-current-* variables in case we have several hops. + (tramp-set-connection-property + (tramp-dissect-file-name + (tramp-make-tramp-file-name + tramp-current-method tramp-current-user tramp-current-host "")) + "first-password-request" t) (save-restriction (let (exit) (while (not exit) @@ -3544,16 +3549,16 @@ ;; Try with Tramp's current method. (if (fboundp 'auth-source-search) (setq auth-info - (tramp-compat-funcall - 'auth-source-search - :max 1 - :user (or tramp-current-user t) - :host tramp-current-host - :port tramp-current-method) - auth-passwd (plist-get (nth 0 auth-info) :secret) - auth-passwd (if (functionp auth-passwd) - (funcall auth-passwd) - auth-passwd)) + (tramp-compat-funcall + 'auth-source-search + :max 1 + :user (or tramp-current-user t) + :host tramp-current-host + :port tramp-current-method) + auth-passwd (plist-get (nth 0 auth-info) :secret) + auth-passwd (if (functionp auth-passwd) + (funcall auth-passwd) + auth-passwd)) (tramp-compat-funcall 'auth-source-user-or-password "password" tramp-current-host tramp-current-method))) ------------------------------------------------------------ revno: 104275 committer: Juanma Barranquero branch nick: trunk timestamp: Wed 2011-05-18 13:53:59 +0200 message: lisp/ChangeLog: Fix typos. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-05-18 03:42:33 +0000 +++ lisp/ChangeLog 2011-05-18 11:53:59 +0000 @@ -1,6 +1,6 @@ 2011-05-18 Glenn Morris - * emacs-lisp/authors.el (authors-fixed-entries): Remove fakemail.c + * emacs-lisp/authors.el (authors-fixed-entries): Remove fakemail.c. * mail/sendmail.el (sendmail-program): Fall back to just "sendmail". Rationalize calendar handling of day and month abbrev-arrays. @@ -109,7 +109,7 @@ (feedmail-debug-sit-for, feedmail-queue-express-hook): New options. (feedmail-sender-line, feedmail-from-line) (feedmail-fiddle-headers-upwardly, feedmail-enable-spray) - (feedmail-spray-this-address, ) + (feedmail-spray-this-address) (feedmail-spray-address-fiddle-plex-list) (feedmail-queue-use-send-time-for-date) (feedmail-queue-use-send-time-for-message-id) @@ -194,20 +194,20 @@ 2011-05-13 Ulf Jasper - * net/newst-treeview.el (newsticker-treeview-face): Changed default + * net/newst-treeview.el (newsticker-treeview-face): Change default family from helvetica to sans. - (newsticker-treeview-tool-bar-map): Moved tool-bar icons to + (newsticker-treeview-tool-bar-map): Move tool-bar icons to etc/images/newsticker. - * net/newst-reader.el (newsticker-feed-face): Changed default + * net/newst-reader.el (newsticker-feed-face): Change default family from helvetica to sans. * net/newst-plainview.el (newsticker-new-item-face) (newsticker-old-item-face, newsticker-immortal-item-face) (newsticker-obsolete-item-face, newsticker-date-face) - (newsticker-statistics-face): Changed default family from + (newsticker-statistics-face): Change default family from helvetica to sans. - (newsticker--plainview-tool-bar-map): Moved tool-bar icons to + (newsticker--plainview-tool-bar-map): Move tool-bar icons to etc/images/newsticker. * net/newst-backend.el (newsticker--do-run-auto-mark-filter), @@ -338,7 +338,7 @@ * textmodes/reftex-dcr.el (reftex-view-crossref): at at -> at a 2011-05-10 Glenn Morris - Stefan Monnier + Stefan Monnier * files.el (hack-one-local-variable-eval-safep): Consider "eval: (foo-mode)" to be safe. (Bug#8613) ------------------------------------------------------------ revno: 104274 committer: Juanma Barranquero branch nick: trunk timestamp: Wed 2011-05-18 13:32:07 +0200 message: src/makefile.w32-in: Update dependencies. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-05-18 03:00:08 +0000 +++ src/ChangeLog 2011-05-18 11:32:07 +0000 @@ -1,3 +1,7 @@ +2011-05-18 Juanma Barranquero + + * makefile.w32-in: Update dependencies. + 2011-05-18 Christoph Scholtes * menu.c: Include limits.h (fixes the MS-Windows build broken by === modified file 'src/makefile.w32-in' --- src/makefile.w32-in 2011-05-07 04:00:12 +0000 +++ src/makefile.w32-in 2011-05-18 11:32:07 +0000 @@ -397,6 +397,7 @@ $(BLD)/alloc.$(O) : \ $(SRC)/alloc.c \ $(CONFIG_H) \ + $(EMACS_ROOT)/nt/inc/unistd.h \ $(EMACS_ROOT)/nt/inc/sys/time.h \ $(LISP_H) \ $(PROCESS_H) \ @@ -432,12 +433,14 @@ $(BLD)/bidi.$(O) : \ $(SRC)/bidi.c \ $(CONFIG_H) \ + $(EMACS_ROOT)/nt/inc/sys/time.h \ $(LISP_H) \ $(SRC)/bidimirror.h \ $(SRC)/biditype.h \ $(SRC)/buffer.h \ $(SRC)/character.h \ $(SRC)/dispextern.h \ + $(SRC)/systime.h \ $(SRC)/w32gui.h $(BLD)/buffer.$(O) : \ @@ -468,11 +471,13 @@ $(BLD)/bytecode.$(O) : \ $(SRC)/bytecode.c \ $(CONFIG_H) \ + $(EMACS_ROOT)/nt/inc/sys/time.h \ $(LISP_H) \ $(SRC)/buffer.h \ $(SRC)/character.h \ $(SRC)/dispextern.h \ $(SRC)/syntax.h \ + $(SRC)/systime.h \ $(SRC)/w32gui.h \ $(SRC)/window.h @@ -496,6 +501,7 @@ $(BLD)/callproc.$(O) : \ $(SRC)/callproc.c \ $(CONFIG_H) \ + $(EMACS_ROOT)/nt/inc/unistd.h \ $(EMACS_ROOT)/nt/inc/sys/file.h \ $(EMACS_ROOT)/nt/inc/sys/ioctl.h \ $(EMACS_ROOT)/nt/inc/sys/time.h \ @@ -560,6 +566,7 @@ $(BLD)/character.$(O) : \ $(SRC)/character.c \ $(CONFIG_H) \ + $(EMACS_ROOT)/lib/intprops.h \ $(LISP_H) \ $(SRC)/buffer.h \ $(SRC)/character.h \ @@ -609,6 +616,7 @@ $(BLD)/coding.$(O) : \ $(SRC)/coding.c \ $(CONFIG_H) \ + $(EMACS_ROOT)/nt/inc/sys/time.h \ $(LISP_H) \ $(SRC)/buffer.h \ $(SRC)/ccl.h \ @@ -618,6 +626,7 @@ $(SRC)/composite.h \ $(SRC)/dispextern.h \ $(SRC)/frame.h \ + $(SRC)/systime.h \ $(SRC)/termhooks.h \ $(SRC)/w32gui.h \ $(SRC)/window.h @@ -625,6 +634,7 @@ $(BLD)/composite.$(O) : \ $(SRC)/composite.c \ $(CONFIG_H) \ + $(EMACS_ROOT)/nt/inc/sys/time.h \ $(LISP_H) \ $(SRC)/buffer.h \ $(SRC)/ccl.h \ @@ -635,6 +645,7 @@ $(SRC)/font.h \ $(SRC)/frame.h \ $(SRC)/intervals.h \ + $(SRC)/systime.h \ $(SRC)/termhooks.h \ $(SRC)/w32gui.h \ $(SRC)/window.h @@ -684,6 +695,7 @@ $(BLD)/dispnew.$(O) : \ $(SRC)/dispnew.c \ $(CONFIG_H) \ + $(EMACS_ROOT)/nt/inc/unistd.h \ $(EMACS_ROOT)/nt/inc/sys/time.h \ $(LISP_H) \ $(PROCESS_H) \ @@ -758,6 +770,7 @@ $(BLD)/emacs.$(O) : \ $(SRC)/emacs.c \ $(CONFIG_H) \ + $(EMACS_ROOT)/nt/inc/unistd.h \ $(EMACS_ROOT)/nt/inc/sys/file.h \ $(EMACS_ROOT)/nt/inc/sys/ioctl.h \ $(EMACS_ROOT)/nt/inc/sys/time.h \ @@ -873,6 +886,7 @@ $(BLD)/font.$(O) : \ $(SRC)/font.c \ $(CONFIG_H) \ + $(EMACS_ROOT)/nt/inc/sys/time.h \ $(LISP_H) \ $(SRC)/buffer.h \ $(SRC)/ccl.h \ @@ -883,6 +897,7 @@ $(SRC)/font.h \ $(SRC)/fontset.h \ $(SRC)/frame.h \ + $(SRC)/systime.h \ $(SRC)/w32gui.h \ $(SRC)/w32term.h \ $(SRC)/window.h @@ -961,6 +976,7 @@ $(BLD)/gnutls.$(O) : \ $(SRC)/gnutls.c \ $(CONFIG_H) \ + $(EMACS_ROOT)/nt/inc/unistd.h \ $(LISP_H) \ $(PROCESS_H) \ $(SRC)/w32.h @@ -1015,6 +1031,7 @@ $(SRC)/insdel.c \ $(CONFIG_H) \ $(EMACS_ROOT)/nt/inc/sys/time.h \ + $(EMACS_ROOT)/lib/intprops.h \ $(LISP_H) \ $(SRC)/atimer.h \ $(SRC)/blockinput.h \ @@ -1048,6 +1065,7 @@ $(BLD)/keyboard.$(O) : \ $(SRC)/keyboard.c \ $(CONFIG_H) \ + $(EMACS_ROOT)/nt/inc/unistd.h \ $(EMACS_ROOT)/nt/inc/sys/ioctl.h \ $(EMACS_ROOT)/nt/inc/sys/time.h \ $(LISP_H) \ @@ -1198,6 +1216,7 @@ $(CONFIG_H) \ $(EMACS_ROOT)/nt/inc/grp.h \ $(EMACS_ROOT)/nt/inc/pwd.h \ + $(EMACS_ROOT)/nt/inc/unistd.h \ $(EMACS_ROOT)/nt/inc/sys/file.h \ $(EMACS_ROOT)/nt/inc/sys/socket.h \ $(EMACS_ROOT)/nt/inc/sys/time.h \ @@ -1243,6 +1262,7 @@ $(CONFIG_H) \ $(EMACS_ROOT)/nt/inc/langinfo.h \ $(EMACS_ROOT)/nt/inc/nl_types.h \ + $(EMACS_ROOT)/nt/inc/unistd.h \ $(EMACS_ROOT)/nt/inc/sys/file.h \ $(EMACS_ROOT)/nt/inc/sys/time.h \ $(LISP_H) \ @@ -1262,6 +1282,7 @@ $(BLD)/w32console.$(O) : \ $(SRC)/w32console.c \ $(CONFIG_H) \ + $(EMACS_ROOT)/nt/inc/sys/time.h \ $(LISP_H) \ $(SRC)/character.h \ $(SRC)/coding.h \ @@ -1269,6 +1290,7 @@ $(SRC)/dispextern.h \ $(SRC)/disptab.h \ $(SRC)/frame.h \ + $(SRC)/systime.h \ $(SRC)/termchar.h \ $(SRC)/termhooks.h \ $(SRC)/w32gui.h \ @@ -1277,6 +1299,7 @@ $(BLD)/print.$(O) : \ $(SRC)/print.c \ $(CONFIG_H) \ + $(EMACS_ROOT)/nt/inc/unistd.h \ $(EMACS_ROOT)/nt/inc/sys/time.h \ $(EMACS_ROOT)/lib/ftoastr.h \ $(EMACS_ROOT)/lib/intprops.h \ @@ -1305,6 +1328,7 @@ $(SRC)/process.c \ $(CONFIG_H) \ $(EMACS_ROOT)/nt/inc/netdb.h \ + $(EMACS_ROOT)/nt/inc/unistd.h \ $(EMACS_ROOT)/nt/inc/arpa/inet.h \ $(EMACS_ROOT)/nt/inc/netinet/in.h \ $(EMACS_ROOT)/nt/inc/sys/file.h \ @@ -1414,6 +1438,7 @@ $(BLD)/syntax.$(O) : \ $(SRC)/syntax.c \ $(CONFIG_H) \ + $(EMACS_ROOT)/nt/inc/sys/time.h \ $(LISP_H) \ $(SRC)/buffer.h \ $(SRC)/category.h \ @@ -1425,6 +1450,7 @@ $(SRC)/keymap.h \ $(SRC)/regex.h \ $(SRC)/syntax.h \ + $(SRC)/systime.h \ $(SRC)/w32gui.h $(BLD)/sysdep.$(O) : \ @@ -1433,6 +1459,7 @@ $(EMACS_ROOT)/nt/inc/grp.h \ $(EMACS_ROOT)/nt/inc/netdb.h \ $(EMACS_ROOT)/nt/inc/pwd.h \ + $(EMACS_ROOT)/nt/inc/unistd.h \ $(EMACS_ROOT)/nt/inc/sys/file.h \ $(EMACS_ROOT)/nt/inc/sys/ioctl.h \ $(EMACS_ROOT)/nt/inc/sys/socket.h \ @@ -1513,11 +1540,13 @@ $(BLD)/textprop.$(O) : \ $(SRC)/textprop.c \ $(CONFIG_H) \ + $(EMACS_ROOT)/nt/inc/sys/time.h \ $(LISP_H) \ $(SRC)/buffer.h \ $(SRC)/composite.h \ $(SRC)/dispextern.h \ $(SRC)/intervals.h \ + $(SRC)/systime.h \ $(SRC)/w32gui.h \ $(SRC)/window.h @@ -1530,10 +1559,12 @@ $(BLD)/undo.$(O) : \ $(SRC)/undo.c \ $(CONFIG_H) \ + $(EMACS_ROOT)/nt/inc/sys/time.h \ $(LISP_H) \ $(SRC)/buffer.h \ $(SRC)/commands.h \ $(SRC)/dispextern.h \ + $(SRC)/systime.h \ $(SRC)/w32gui.h \ $(SRC)/window.h @@ -1577,6 +1608,7 @@ $(BLD)/xdisp.$(O) : \ $(SRC)/xdisp.c \ $(CONFIG_H) \ + $(EMACS_ROOT)/nt/inc/unistd.h \ $(EMACS_ROOT)/nt/inc/sys/time.h \ $(LISP_H) \ $(PROCESS_H) \ @@ -1689,6 +1721,7 @@ $(BLD)/w32term.$(O) : \ $(SRC)/w32term.c \ $(CONFIG_H) \ + $(EMACS_ROOT)/nt/inc/unistd.h \ $(EMACS_ROOT)/nt/inc/sys/ioctl.h \ $(EMACS_ROOT)/nt/inc/sys/time.h \ $(LISP_H) \ @@ -1768,6 +1801,7 @@ $(BLD)/w32font.$(O) : \ $(SRC)/w32font.c \ $(CONFIG_H) \ + $(EMACS_ROOT)/nt/inc/sys/time.h \ $(LISP_H) \ $(SRC)/ccl.h \ $(SRC)/character.h \ @@ -1778,6 +1812,7 @@ $(SRC)/font.h \ $(SRC)/fontset.h \ $(SRC)/frame.h \ + $(SRC)/systime.h \ $(SRC)/w32font.h \ $(SRC)/w32gui.h \ $(SRC)/w32term.h @@ -1785,6 +1820,7 @@ $(BLD)/w32uniscribe.$(O) : \ $(SRC)/w32uniscribe.c \ $(CONFIG_H) \ + $(EMACS_ROOT)/nt/inc/sys/time.h \ $(LISP_H) \ $(SRC)/ccl.h \ $(SRC)/character.h \ @@ -1794,6 +1830,7 @@ $(SRC)/font.h \ $(SRC)/fontset.h \ $(SRC)/frame.h \ + $(SRC)/systime.h \ $(SRC)/w32font.h \ $(SRC)/w32gui.h \ $(SRC)/w32term.h ------------------------------------------------------------ revno: 104273 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-05-18 06:19:25 -0400 message: Auto-commit of generated files. diff: === modified file 'autogen/Makefile.in' --- autogen/Makefile.in 2011-05-06 10:19:05 +0000 +++ autogen/Makefile.in 2011-05-18 10:19:25 +0000 @@ -48,7 +48,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/gnulib.mk COPYING @gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36_TRUE@am__append_1 = gettext.h -@gl_GNULIB_ENABLED_verify_TRUE@am__append_2 = verify.h subdir = lib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ @@ -83,10 +82,10 @@ libgnu_a_AR = $(AR) $(ARFLAGS) am__DEPENDENCIES_1 = am__libgnu_a_SOURCES_DIST = allocator.c careadlinkat.c dtoastr.c \ - gettext.h ignore-value.h verify.h + gettext.h am__objects_1 = am_libgnu_a_OBJECTS = allocator.$(OBJEXT) careadlinkat.$(OBJEXT) \ - dtoastr.$(OBJEXT) $(am__objects_1) $(am__objects_1) + dtoastr.$(OBJEXT) $(am__objects_1) libgnu_a_OBJECTS = $(am_libgnu_a_OBJECTS) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -208,6 +207,7 @@ GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@ GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ GNULIB_GRANTPT = @GNULIB_GRANTPT@ +GNULIB_GROUP_MEMBER = @GNULIB_GROUP_MEMBER@ GNULIB_IMAXABS = @GNULIB_IMAXABS@ GNULIB_IMAXDIV = @GNULIB_IMAXDIV@ GNULIB_LCHMOD = @GNULIB_LCHMOD@ @@ -354,6 +354,7 @@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ HAVE_GRANTPT = @HAVE_GRANTPT@ +HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@ HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ HAVE_LCHMOD = @HAVE_LCHMOD@ HAVE_LCHOWN = @HAVE_LCHOWN@ @@ -737,13 +738,13 @@ EXTRA_DIST = allocator.h $(top_srcdir)/./arg-nonnull.h \ $(top_srcdir)/./c++defs.h careadlinkat.h md5.c md5.h dosname.h \ ftoastr.c ftoastr.h filemode.c filemode.h getloadavg.c \ - getopt.c getopt.in.h getopt1.c getopt_int.h intprops.h \ - inttypes.in.h lstat.c mktime-internal.h mktime.c readlink.c \ - stat.c stdarg.in.h stdbool.in.h stddef.in.h stdint.in.h \ - stdio.in.h stdlib.in.h strftime.c strftime.h strtol.c \ - strtoul.c strtoull.c strtoimax.c strtoumax.c symlink.c \ - sys_stat.in.h time.in.h time_r.c unistd.in.h \ - $(top_srcdir)/./warn-on-use.h + getopt.c getopt.in.h getopt1.c getopt_int.h ignore-value.h \ + intprops.h inttypes.in.h lstat.c mktime-internal.h mktime.c \ + readlink.c stat.c stdarg.in.h stdbool.in.h stddef.in.h \ + stdint.in.h stdio.in.h stdlib.in.h strftime.c strftime.h \ + strtol.c strtoul.c strtoull.c strtoimax.c strtoumax.c \ + symlink.c sys_stat.in.h time.in.h time_r.c unistd.in.h \ + verify.h $(top_srcdir)/./warn-on-use.h MOSTLYCLEANDIRS = sys MOSTLYCLEANFILES = core *.stackdump arg-nonnull.h arg-nonnull.h-t \ c++defs.h c++defs.h-t getopt.h getopt.h-t inttypes.h \ @@ -754,7 +755,7 @@ noinst_LIBRARIES = libgnu.a DEFAULT_INCLUDES = -I. -I../src -I$(top_srcdir)/src libgnu_a_SOURCES = allocator.c careadlinkat.c dtoastr.c \ - $(am__append_1) ignore-value.h $(am__append_2) + $(am__append_1) libgnu_a_LIBADD = $(gl_LIBOBJS) libgnu_a_DEPENDENCIES = $(gl_LIBOBJS) EXTRA_libgnu_a_SOURCES = md5.c ftoastr.c filemode.c getloadavg.c \ @@ -1499,6 +1500,7 @@ -e 's|@''GNULIB_GETLOGIN_R''@|$(GNULIB_GETLOGIN_R)|g' \ -e 's|@''GNULIB_GETPAGESIZE''@|$(GNULIB_GETPAGESIZE)|g' \ -e 's|@''GNULIB_GETUSERSHELL''@|$(GNULIB_GETUSERSHELL)|g' \ + -e 's|@''GNULIB_GROUP_MEMBER''@|$(GNULIB_GROUP_MEMBER)|g' \ -e 's|@''GNULIB_LCHOWN''@|$(GNULIB_LCHOWN)|g' \ -e 's|@''GNULIB_LINK''@|$(GNULIB_LINK)|g' \ -e 's|@''GNULIB_LINKAT''@|$(GNULIB_LINKAT)|g' \ @@ -1537,6 +1539,7 @@ -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \ -e 's|@''HAVE_GETLOGIN''@|$(HAVE_GETLOGIN)|g' \ -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \ + -e 's|@''HAVE_GROUP_MEMBER''@|$(HAVE_GROUP_MEMBER)|g' \ -e 's|@''HAVE_LCHOWN''@|$(HAVE_LCHOWN)|g' \ -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \ -e 's|@''HAVE_LINKAT''@|$(HAVE_LINKAT)|g' \ === modified file 'autogen/configure' --- autogen/configure 2011-05-15 10:19:52 +0000 +++ autogen/configure 2011-05-18 10:19:25 +0000 @@ -947,6 +947,7 @@ HAVE_LINKAT HAVE_LINK HAVE_LCHOWN +HAVE_GROUP_MEMBER HAVE_GETPAGESIZE HAVE_GETLOGIN HAVE_GETHOSTNAME @@ -984,6 +985,7 @@ GNULIB_LINKAT GNULIB_LINK GNULIB_LCHOWN +GNULIB_GROUP_MEMBER GNULIB_GETUSERSHELL GNULIB_GETPAGESIZE GNULIB_GETLOGIN_R @@ -14390,6 +14392,7 @@ GNULIB_GETLOGIN_R=0; GNULIB_GETPAGESIZE=0; GNULIB_GETUSERSHELL=0; + GNULIB_GROUP_MEMBER=0; GNULIB_LCHOWN=0; GNULIB_LINK=0; GNULIB_LINKAT=0; @@ -14427,6 +14430,7 @@ HAVE_GETHOSTNAME=1; HAVE_GETLOGIN=1; HAVE_GETPAGESIZE=1; + HAVE_GROUP_MEMBER=1; HAVE_LCHOWN=1; HAVE_LINK=1; HAVE_LINKAT=1; @@ -15923,6 +15927,81 @@ UINT64_MAX_EQ_ULONG_MAX='defined _LP64'; + + + + + + + + + + + + + + if test $gl_cv_have_include_next = yes; then + gl_cv_next_inttypes_h='<'inttypes.h'>' + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +$as_echo_n "checking absolute name of ... " >&6; } +if test "${gl_cv_next_inttypes_h+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + + if test $ac_cv_header_inttypes_h = yes; then + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_inttypes_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n '\#/inttypes.h#{ + s#.*"\(.*/inttypes.h\)".*#\1# + s#^/[^/]#//&# + p + q + }'`'"' + else + gl_cv_next_inttypes_h='<'inttypes.h'>' + fi + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_inttypes_h" >&5 +$as_echo "$gl_cv_next_inttypes_h" >&6; } + fi + NEXT_INTTYPES_H=$gl_cv_next_inttypes_h + + if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then + # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' + gl_next_as_first_directive='<'inttypes.h'>' + else + # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' + gl_next_as_first_directive=$gl_cv_next_inttypes_h + fi + NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H=$gl_next_as_first_directive + + + + + + + + +$as_echo "#define GL_TRIGGER_STDC_LIMIT_MACROS 1" >>confdefs.h + + + + + + GNULIB_FCHMODAT=0; GNULIB_FSTATAT=0; GNULIB_FUTIMENS=0; @@ -17214,80 +17293,6 @@ - - - - - - - - - - - if test $gl_cv_have_include_next = yes; then - gl_cv_next_inttypes_h='<'inttypes.h'>' - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -$as_echo_n "checking absolute name of ... " >&6; } -if test "${gl_cv_next_inttypes_h+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - - if test $ac_cv_header_inttypes_h = yes; then - - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac - gl_cv_next_inttypes_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n '\#/inttypes.h#{ - s#.*"\(.*/inttypes.h\)".*#\1# - s#^/[^/]#//&# - p - q - }'`'"' - else - gl_cv_next_inttypes_h='<'inttypes.h'>' - fi - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_inttypes_h" >&5 -$as_echo "$gl_cv_next_inttypes_h" >&6; } - fi - NEXT_INTTYPES_H=$gl_cv_next_inttypes_h - - if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then - # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' - gl_next_as_first_directive='<'inttypes.h'>' - else - # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' - gl_next_as_first_directive=$gl_cv_next_inttypes_h - fi - NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H=$gl_next_as_first_directive - - - - - - - - -$as_echo "#define GL_TRIGGER_STDC_LIMIT_MACROS 1" >>confdefs.h - - - - - - - - if test $ac_cv_func_lstat = yes; then if test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then @@ -18076,717 +18081,6 @@ - if test $ac_cv_type_long_long_int = yes; then - HAVE_LONG_LONG_INT=1 - else - HAVE_LONG_LONG_INT=0 - fi - - - if test $ac_cv_type_unsigned_long_long_int = yes; then - HAVE_UNSIGNED_LONG_LONG_INT=1 - else - HAVE_UNSIGNED_LONG_LONG_INT=0 - fi - - - - if test $ac_cv_header_wchar_h = yes; then - HAVE_WCHAR_H=1 - else - HAVE_WCHAR_H=0 - fi - - - if test $ac_cv_header_inttypes_h = yes; then - HAVE_INTTYPES_H=1 - else - HAVE_INTTYPES_H=0 - fi - - - if test $ac_cv_header_sys_types_h = yes; then - HAVE_SYS_TYPES_H=1 - else - HAVE_SYS_TYPES_H=0 - fi - - - - - - - - - - - - if test $gl_cv_have_include_next = yes; then - gl_cv_next_stdint_h='<'stdint.h'>' - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -$as_echo_n "checking absolute name of ... " >&6; } -if test "${gl_cv_next_stdint_h+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - - if test $ac_cv_header_stdint_h = yes; then - - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac - gl_cv_next_stdint_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n '\#/stdint.h#{ - s#.*"\(.*/stdint.h\)".*#\1# - s#^/[^/]#//&# - p - q - }'`'"' - else - gl_cv_next_stdint_h='<'stdint.h'>' - fi - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdint_h" >&5 -$as_echo "$gl_cv_next_stdint_h" >&6; } - fi - NEXT_STDINT_H=$gl_cv_next_stdint_h - - if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then - # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' - gl_next_as_first_directive='<'stdint.h'>' - else - # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' - gl_next_as_first_directive=$gl_cv_next_stdint_h - fi - NEXT_AS_FIRST_DIRECTIVE_STDINT_H=$gl_next_as_first_directive - - - - - if test $ac_cv_header_stdint_h = yes; then - HAVE_STDINT_H=1 - else - HAVE_STDINT_H=0 - fi - - - if test $ac_cv_header_stdint_h = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stdint.h conforms to C99" >&5 -$as_echo_n "checking whether stdint.h conforms to C99... " >&6; } -if test "${gl_cv_header_working_stdint_h+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - gl_cv_header_working_stdint_h=no - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -#define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ mode */ -#define __STDC_CONSTANT_MACROS 1 /* to make it work also in C++ mode */ -#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */ -#include -/* Dragonfly defines WCHAR_MIN, WCHAR_MAX only in . */ -#if !(defined WCHAR_MIN && defined WCHAR_MAX) -#error "WCHAR_MIN, WCHAR_MAX not defined in " -#endif - - - /* BSD/OS 4.0.1 has a bug: , and must be - included before . */ - #include - #include - #if HAVE_WCHAR_H - # include - # include - # include - #endif - - -#ifdef INT8_MAX -int8_t a1 = INT8_MAX; -int8_t a1min = INT8_MIN; -#endif -#ifdef INT16_MAX -int16_t a2 = INT16_MAX; -int16_t a2min = INT16_MIN; -#endif -#ifdef INT32_MAX -int32_t a3 = INT32_MAX; -int32_t a3min = INT32_MIN; -#endif -#ifdef INT64_MAX -int64_t a4 = INT64_MAX; -int64_t a4min = INT64_MIN; -#endif -#ifdef UINT8_MAX -uint8_t b1 = UINT8_MAX; -#else -typedef int b1[(unsigned char) -1 != 255 ? 1 : -1]; -#endif -#ifdef UINT16_MAX -uint16_t b2 = UINT16_MAX; -#endif -#ifdef UINT32_MAX -uint32_t b3 = UINT32_MAX; -#endif -#ifdef UINT64_MAX -uint64_t b4 = UINT64_MAX; -#endif -int_least8_t c1 = INT8_C (0x7f); -int_least8_t c1max = INT_LEAST8_MAX; -int_least8_t c1min = INT_LEAST8_MIN; -int_least16_t c2 = INT16_C (0x7fff); -int_least16_t c2max = INT_LEAST16_MAX; -int_least16_t c2min = INT_LEAST16_MIN; -int_least32_t c3 = INT32_C (0x7fffffff); -int_least32_t c3max = INT_LEAST32_MAX; -int_least32_t c3min = INT_LEAST32_MIN; -int_least64_t c4 = INT64_C (0x7fffffffffffffff); -int_least64_t c4max = INT_LEAST64_MAX; -int_least64_t c4min = INT_LEAST64_MIN; -uint_least8_t d1 = UINT8_C (0xff); -uint_least8_t d1max = UINT_LEAST8_MAX; -uint_least16_t d2 = UINT16_C (0xffff); -uint_least16_t d2max = UINT_LEAST16_MAX; -uint_least32_t d3 = UINT32_C (0xffffffff); -uint_least32_t d3max = UINT_LEAST32_MAX; -uint_least64_t d4 = UINT64_C (0xffffffffffffffff); -uint_least64_t d4max = UINT_LEAST64_MAX; -int_fast8_t e1 = INT_FAST8_MAX; -int_fast8_t e1min = INT_FAST8_MIN; -int_fast16_t e2 = INT_FAST16_MAX; -int_fast16_t e2min = INT_FAST16_MIN; -int_fast32_t e3 = INT_FAST32_MAX; -int_fast32_t e3min = INT_FAST32_MIN; -int_fast64_t e4 = INT_FAST64_MAX; -int_fast64_t e4min = INT_FAST64_MIN; -uint_fast8_t f1 = UINT_FAST8_MAX; -uint_fast16_t f2 = UINT_FAST16_MAX; -uint_fast32_t f3 = UINT_FAST32_MAX; -uint_fast64_t f4 = UINT_FAST64_MAX; -#ifdef INTPTR_MAX -intptr_t g = INTPTR_MAX; -intptr_t gmin = INTPTR_MIN; -#endif -#ifdef UINTPTR_MAX -uintptr_t h = UINTPTR_MAX; -#endif -intmax_t i = INTMAX_MAX; -uintmax_t j = UINTMAX_MAX; - -#include /* for CHAR_BIT */ -#define TYPE_MINIMUM(t) \ - ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ TYPE_MAXIMUM (t))) -#define TYPE_MAXIMUM(t) \ - ((t) ((t) 0 < (t) -1 \ - ? (t) -1 \ - : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1))) -struct s { - int check_PTRDIFF: - PTRDIFF_MIN == TYPE_MINIMUM (ptrdiff_t) - && PTRDIFF_MAX == TYPE_MAXIMUM (ptrdiff_t) - ? 1 : -1; - /* Detect bug in FreeBSD 6.0 / ia64. */ - int check_SIG_ATOMIC: - SIG_ATOMIC_MIN == TYPE_MINIMUM (sig_atomic_t) - && SIG_ATOMIC_MAX == TYPE_MAXIMUM (sig_atomic_t) - ? 1 : -1; - int check_SIZE: SIZE_MAX == TYPE_MAXIMUM (size_t) ? 1 : -1; - int check_WCHAR: - WCHAR_MIN == TYPE_MINIMUM (wchar_t) - && WCHAR_MAX == TYPE_MAXIMUM (wchar_t) - ? 1 : -1; - /* Detect bug in mingw. */ - int check_WINT: - WINT_MIN == TYPE_MINIMUM (wint_t) - && WINT_MAX == TYPE_MAXIMUM (wint_t) - ? 1 : -1; - - /* Detect bugs in glibc 2.4 and Solaris 10 stdint.h, among others. */ - int check_UINT8_C: - (-1 < UINT8_C (0)) == (-1 < (uint_least8_t) 0) ? 1 : -1; - int check_UINT16_C: - (-1 < UINT16_C (0)) == (-1 < (uint_least16_t) 0) ? 1 : -1; - - /* Detect bugs in OpenBSD 3.9 stdint.h. */ -#ifdef UINT8_MAX - int check_uint8: (uint8_t) -1 == UINT8_MAX ? 1 : -1; -#endif -#ifdef UINT16_MAX - int check_uint16: (uint16_t) -1 == UINT16_MAX ? 1 : -1; -#endif -#ifdef UINT32_MAX - int check_uint32: (uint32_t) -1 == UINT32_MAX ? 1 : -1; -#endif -#ifdef UINT64_MAX - int check_uint64: (uint64_t) -1 == UINT64_MAX ? 1 : -1; -#endif - int check_uint_least8: (uint_least8_t) -1 == UINT_LEAST8_MAX ? 1 : -1; - int check_uint_least16: (uint_least16_t) -1 == UINT_LEAST16_MAX ? 1 : -1; - int check_uint_least32: (uint_least32_t) -1 == UINT_LEAST32_MAX ? 1 : -1; - int check_uint_least64: (uint_least64_t) -1 == UINT_LEAST64_MAX ? 1 : -1; - int check_uint_fast8: (uint_fast8_t) -1 == UINT_FAST8_MAX ? 1 : -1; - int check_uint_fast16: (uint_fast16_t) -1 == UINT_FAST16_MAX ? 1 : -1; - int check_uint_fast32: (uint_fast32_t) -1 == UINT_FAST32_MAX ? 1 : -1; - int check_uint_fast64: (uint_fast64_t) -1 == UINT_FAST64_MAX ? 1 : -1; - int check_uintptr: (uintptr_t) -1 == UINTPTR_MAX ? 1 : -1; - int check_uintmax: (uintmax_t) -1 == UINTMAX_MAX ? 1 : -1; - int check_size: (size_t) -1 == SIZE_MAX ? 1 : -1; -}; - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - if test "$cross_compiling" = yes; then : - gl_cv_header_working_stdint_h=yes - -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -#define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ mode */ -#define __STDC_CONSTANT_MACROS 1 /* to make it work also in C++ mode */ -#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */ -#include - - - /* BSD/OS 4.0.1 has a bug: , and must be - included before . */ - #include - #include - #if HAVE_WCHAR_H - # include - # include - # include - #endif - - -#include -#include -#define MVAL(macro) MVAL1(macro) -#define MVAL1(expression) #expression -static const char *macro_values[] = - { -#ifdef INT8_MAX - MVAL (INT8_MAX), -#endif -#ifdef INT16_MAX - MVAL (INT16_MAX), -#endif -#ifdef INT32_MAX - MVAL (INT32_MAX), -#endif -#ifdef INT64_MAX - MVAL (INT64_MAX), -#endif -#ifdef UINT8_MAX - MVAL (UINT8_MAX), -#endif -#ifdef UINT16_MAX - MVAL (UINT16_MAX), -#endif -#ifdef UINT32_MAX - MVAL (UINT32_MAX), -#endif -#ifdef UINT64_MAX - MVAL (UINT64_MAX), -#endif - NULL - }; - -int -main () -{ - - const char **mv; - for (mv = macro_values; *mv != NULL; mv++) - { - const char *value = *mv; - /* Test whether it looks like a cast expression. */ - if (strncmp (value, "((unsigned int)"/*)*/, 15) == 0 - || strncmp (value, "((unsigned short)"/*)*/, 17) == 0 - || strncmp (value, "((unsigned char)"/*)*/, 16) == 0 - || strncmp (value, "((int)"/*)*/, 6) == 0 - || strncmp (value, "((signed short)"/*)*/, 15) == 0 - || strncmp (value, "((signed char)"/*)*/, 14) == 0) - return mv - macro_values + 1; - } - return 0; - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - gl_cv_header_working_stdint_h=yes -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdint_h" >&5 -$as_echo "$gl_cv_header_working_stdint_h" >&6; } - fi - if test "$gl_cv_header_working_stdint_h" = yes; then - STDINT_H= - else - for ac_header in sys/inttypes.h sys/bitypes.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - if test $ac_cv_header_sys_inttypes_h = yes; then - HAVE_SYS_INTTYPES_H=1 - else - HAVE_SYS_INTTYPES_H=0 - fi - - if test $ac_cv_header_sys_bitypes_h = yes; then - HAVE_SYS_BITYPES_H=1 - else - HAVE_SYS_BITYPES_H=0 - fi - - - - - if test $APPLE_UNIVERSAL_BUILD = 0; then - - - for gltype in ptrdiff_t size_t ; do - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5 -$as_echo_n "checking for bit size of $gltype... " >&6; } -if { as_var=gl_cv_bitsizeof_${gltype}; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "sizeof ($gltype) * CHAR_BIT" "result" " - /* BSD/OS 4.0.1 has a bug: , and must be - included before . */ - #include - #include - #if HAVE_WCHAR_H - # include - # include - # include - #endif - -#include "; then : - -else - result=unknown -fi - - eval gl_cv_bitsizeof_${gltype}=\$result - -fi -eval ac_res=\$gl_cv_bitsizeof_${gltype} - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval result=\$gl_cv_bitsizeof_${gltype} - if test $result = unknown; then - result=0 - fi - GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'` - cat >>confdefs.h <<_ACEOF -#define BITSIZEOF_${GLTYPE} $result -_ACEOF - - eval BITSIZEOF_${GLTYPE}=\$result - done - - - fi - - - for gltype in sig_atomic_t wchar_t wint_t ; do - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5 -$as_echo_n "checking for bit size of $gltype... " >&6; } -if { as_var=gl_cv_bitsizeof_${gltype}; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "sizeof ($gltype) * CHAR_BIT" "result" " - /* BSD/OS 4.0.1 has a bug: , and must be - included before . */ - #include - #include - #if HAVE_WCHAR_H - # include - # include - # include - #endif - -#include "; then : - -else - result=unknown -fi - - eval gl_cv_bitsizeof_${gltype}=\$result - -fi -eval ac_res=\$gl_cv_bitsizeof_${gltype} - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval result=\$gl_cv_bitsizeof_${gltype} - if test $result = unknown; then - result=0 - fi - GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'` - cat >>confdefs.h <<_ACEOF -#define BITSIZEOF_${GLTYPE} $result -_ACEOF - - eval BITSIZEOF_${GLTYPE}=\$result - done - - - - - for gltype in sig_atomic_t wchar_t wint_t ; do - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gltype is signed" >&5 -$as_echo_n "checking whether $gltype is signed... " >&6; } -if { as_var=gl_cv_type_${gltype}_signed; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - /* BSD/OS 4.0.1 has a bug: , and must be - included before . */ - #include - #include - #if HAVE_WCHAR_H - # include - # include - # include - #endif - - int verify[2 * (($gltype) -1 < ($gltype) 0) - 1]; -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - result=yes -else - result=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - eval gl_cv_type_${gltype}_signed=\$result - -fi -eval ac_res=\$gl_cv_type_${gltype}_signed - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval result=\$gl_cv_type_${gltype}_signed - GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'` - if test "$result" = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_SIGNED_${GLTYPE} 1 -_ACEOF - - eval HAVE_SIGNED_${GLTYPE}=1 - else - eval HAVE_SIGNED_${GLTYPE}=0 - fi - done - - - gl_cv_type_ptrdiff_t_signed=yes - gl_cv_type_size_t_signed=no - if test $APPLE_UNIVERSAL_BUILD = 0; then - - - for gltype in ptrdiff_t size_t ; do - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5 -$as_echo_n "checking for $gltype integer literal suffix... " >&6; } -if { as_var=gl_cv_type_${gltype}_suffix; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 -else - eval gl_cv_type_${gltype}_suffix=no - eval result=\$gl_cv_type_${gltype}_signed - if test "$result" = yes; then - glsufu= - else - glsufu=u - fi - for glsuf in "$glsufu" ${glsufu}l ${glsufu}ll ${glsufu}i64; do - case $glsuf in - '') gltype1='int';; - l) gltype1='long int';; - ll) gltype1='long long int';; - i64) gltype1='__int64';; - u) gltype1='unsigned int';; - ul) gltype1='unsigned long int';; - ull) gltype1='unsigned long long int';; - ui64)gltype1='unsigned __int64';; - esac - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - /* BSD/OS 4.0.1 has a bug: , and must be - included before . */ - #include - #include - #if HAVE_WCHAR_H - # include - # include - # include - #endif - - extern $gltype foo; - extern $gltype1 foo; -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - eval gl_cv_type_${gltype}_suffix=\$glsuf -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - eval result=\$gl_cv_type_${gltype}_suffix - test "$result" != no && break - done -fi -eval ac_res=\$gl_cv_type_${gltype}_suffix - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'` - eval result=\$gl_cv_type_${gltype}_suffix - test "$result" = no && result= - eval ${GLTYPE}_SUFFIX=\$result - cat >>confdefs.h <<_ACEOF -#define ${GLTYPE}_SUFFIX $result -_ACEOF - - done - - - fi - - - for gltype in sig_atomic_t wchar_t wint_t ; do - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5 -$as_echo_n "checking for $gltype integer literal suffix... " >&6; } -if { as_var=gl_cv_type_${gltype}_suffix; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 -else - eval gl_cv_type_${gltype}_suffix=no - eval result=\$gl_cv_type_${gltype}_signed - if test "$result" = yes; then - glsufu= - else - glsufu=u - fi - for glsuf in "$glsufu" ${glsufu}l ${glsufu}ll ${glsufu}i64; do - case $glsuf in - '') gltype1='int';; - l) gltype1='long int';; - ll) gltype1='long long int';; - i64) gltype1='__int64';; - u) gltype1='unsigned int';; - ul) gltype1='unsigned long int';; - ull) gltype1='unsigned long long int';; - ui64)gltype1='unsigned __int64';; - esac - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - /* BSD/OS 4.0.1 has a bug: , and must be - included before . */ - #include - #include - #if HAVE_WCHAR_H - # include - # include - # include - #endif - - extern $gltype foo; - extern $gltype1 foo; -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - eval gl_cv_type_${gltype}_suffix=\$glsuf -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - eval result=\$gl_cv_type_${gltype}_suffix - test "$result" != no && break - done -fi -eval ac_res=\$gl_cv_type_${gltype}_suffix - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'` - eval result=\$gl_cv_type_${gltype}_suffix - test "$result" = no && result= - eval ${GLTYPE}_SUFFIX=\$result - cat >>confdefs.h <<_ACEOF -#define ${GLTYPE}_SUFFIX $result -_ACEOF - - done - - - - STDINT_H=stdint.h - fi - - if test -n "$STDINT_H"; then - GL_GENERATE_STDINT_H_TRUE= - GL_GENERATE_STDINT_H_FALSE='#' -else - GL_GENERATE_STDINT_H_TRUE='#' - GL_GENERATE_STDINT_H_FALSE= -fi - - - - @@ -21778,10 +21072,6 @@ as_fn_error "conditional \"GL_GENERATE_STDDEF_H\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${GL_GENERATE_STDINT_H_TRUE}" && test -z "${GL_GENERATE_STDINT_H_FALSE}"; then - as_fn_error "conditional \"GL_GENERATE_STDINT_H\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${gl_GNULIB_ENABLED_dosname_TRUE}" && test -z "${gl_GNULIB_ENABLED_dosname_FALSE}"; then as_fn_error "conditional \"gl_GNULIB_ENABLED_dosname\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 ------------------------------------------------------------ revno: 104272 committer: Eli Zaretskii branch nick: trunk timestamp: Wed 2011-05-18 01:21:07 -0400 message: Fix last commit. diff: === modified file 'ChangeLog' --- ChangeLog 2011-05-18 05:02:49 +0000 +++ ChangeLog 2011-05-18 05:21:07 +0000 @@ -1,11 +1,11 @@ 2011-05-17 Paul Eggert - lib/gnulib.mk: - lib/intprops.h: - lib/unistd.in.h: - m4/inttypes.m4: - m4/stdint.m4: - m4/unistd_h.m4: Sync from gnulib. + * lib/gnulib.mk: + * lib/intprops.h: + * lib/unistd.in.h: + * m4/inttypes.m4: + * m4/stdint.m4: + * m4/unistd_h.m4: Sync from gnulib. 2011-05-14 Glenn Morris === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2011-05-18 05:02:49 +0000 +++ doc/misc/ChangeLog 2011-05-18 05:21:07 +0000 @@ -1,6 +1,6 @@ 2011-05-17 Paul Eggert - texinfo.tex: Sync from gnulib, version 2011-05-11.16. + * texinfo.tex: Sync from gnulib, version 2011-05-11.16. 2011-05-17 Glenn Morris ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.