Now on revision 105965. Conflicting tags: mh-e-doc-8.3 mh-e-8.3 ------------------------------------------------------------ revno: 105965 fixes bug(s): http://debbugs.gnu.org/9628 committer: Jan D. branch nick: trunk timestamp: Fri 2011-09-30 09:42:26 +0200 message: * nsterm.m (windowDidResize): Call x_set_window_size only when ns_in_resize is true. Otherwise set pixelwidth/height and call change_frame_size. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-09-30 07:25:15 +0000 +++ src/ChangeLog 2011-09-30 07:42:26 +0000 @@ -1,3 +1,9 @@ +2011-09-30 Jan Djärv + + * nsterm.m (windowDidResize): Call x_set_window_size only when + ns_in_resize is true. Otherwise set pixelwidth/height and + call change_frame_size (Bug#9628). + 2011-09-30 Paul Eggert Port --enable-checking=all to Fedora 14 x86-64. === modified file 'src/nsterm.m' --- src/nsterm.m 2011-08-29 19:09:16 +0000 +++ src/nsterm.m 2011-09-30 07:42:26 +0000 @@ -5357,7 +5357,23 @@ a "windowDidResize" which calls x_set_window_size). */ #ifndef NS_IMPL_GNUSTEP if (cols > 0 && rows > 0) - x_set_window_size (emacsframe, 0, cols, rows); + { + if (ns_in_resize) + x_set_window_size (emacsframe, 0, cols, rows); + else + { + NSWindow *window = [self window]; + NSRect wr = [window frame]; + FRAME_PIXEL_WIDTH (emacsframe) = (int)wr.size.width + - emacsframe->border_width; + FRAME_PIXEL_HEIGHT (emacsframe) = (int)wr.size.height + - FRAME_NS_TITLEBAR_HEIGHT (emacsframe) + - FRAME_TOOLBAR_HEIGHT (emacsframe); + change_frame_size (emacsframe, rows, cols, 0, 0, 1); + SET_FRAME_GARBAGED (emacsframe); + cancel_mouse_face (emacsframe); + } + } #endif ns_send_appdefined (-1); ------------------------------------------------------------ revno: 105964 committer: Eli Zaretskii branch nick: trunk timestamp: Fri 2011-09-30 10:25:15 +0300 message: src/ChangeLog: Minor typos fixed. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-09-30 07:16:38 +0000 +++ src/ChangeLog 2011-09-30 07:25:15 +0000 @@ -24,7 +24,7 @@ 2011-09-29 Eli Zaretskii - * sysdep.c (snprintf) [EOVERFLOW]: If EOVERFLOW is not defined, + * sysdep.c (snprintf) [!EOVERFLOW]: If EOVERFLOW is not defined, use EDOM. 2011-09-28 Eli Zaretskii @@ -45,8 +45,8 @@ * xdisp.c (handle_invisible_prop): If invisible text ends on a newline, reseat the iterator instead of bidi-iterating there one character at a time. (Bug#9610) - (BUFFER_POS_REACHED_P, move_it_in_display_line_to): Bail when past - TO_CHARPOS if the bidi iterator is at base embedding level. + (BUFFER_POS_REACHED_P, move_it_in_display_line_to): Bail out when + past TO_CHARPOS if the bidi iterator is at base embedding level. 2011-09-27 Andreas Schwab @@ -83,9 +83,9 @@ value is now t. Doc fix. * indent.c (Fvertical_motion): Compute and apply the overshoot - logic when moving up, not only when moving down. Fix the + logic also when moving up, not only when moving down. Fix the confusing name and values of the it_overshoot_expected variable; - logic changes accordingly. (Bug#9254) (Bug#9549) + logic changed accordingly. (Bug#9254) (Bug#9549) * xdisp.c (pos_visible_p): Produce correct pixel coordinates when CHARPOS is covered by a display string which includes newlines. @@ -101,7 +101,7 @@ 2011-09-24 Jim Meyering - do not ignore write error for any output size + Do not ignore write error for any output size. The previous change was incomplete. While it makes emacs --batch detect the vast majority of stdout write failures, errors were still ignored whenever the output size is ------------------------------------------------------------ revno: 105963 committer: Paul Eggert branch nick: trunk timestamp: Fri 2011-09-30 00:16:38 -0700 message: Port --enable-checking=all to Fedora 14 x86-64. * charset.c (syms_of_charset): Also account for glibc malloc's internal overhead when calculating the initial malloc maximum. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-09-30 03:25:46 +0000 +++ src/ChangeLog 2011-09-30 07:16:38 +0000 @@ -1,5 +1,9 @@ 2011-09-30 Paul Eggert + Port --enable-checking=all to Fedora 14 x86-64. + * charset.c (syms_of_charset): Also account for glibc malloc's + internal overhead when calculating the initial malloc maximum. + Port --enable-checking=all to Fedora 14 x86. * alloc.c (XMALLOC_OVERRUN_CHECK_OVERHEAD, XMALLOC_OVERRUN_CHECK_SIZE): Move to lisp.h. === modified file 'src/charset.c' --- src/charset.c 2011-09-30 03:25:46 +0000 +++ src/charset.c 2011-09-30 07:16:38 +0000 @@ -2337,7 +2337,9 @@ mmap for larger allocations, and these don't work well across dumped systems. */ enum { - initial_malloc_max = (1 << 16) - 1 - XMALLOC_OVERRUN_CHECK_OVERHEAD, + glibc_malloc_overhead = 3 * sizeof (size_t) - 1, + initial_malloc_max = + (1 << 16) - 1 - glibc_malloc_overhead - XMALLOC_OVERRUN_CHECK_OVERHEAD, charset_table_size_init = initial_malloc_max / sizeof (struct charset) }; ------------------------------------------------------------ revno: 105962 committer: Paul Eggert branch nick: trunk timestamp: Thu 2011-09-29 20:25:46 -0700 message: Port --enable-checking=all to Fedora 14 x86. * alloc.c (XMALLOC_OVERRUN_CHECK_OVERHEAD, XMALLOC_OVERRUN_CHECK_SIZE): Move to lisp.h. (xmalloc_put_size, xmalloc_get_size, overrun_check_malloc) (overrun_check_realloc, overrun_check_free): Use XMALLOC_OVERRUN_SIZE_SIZE, not sizeof (size_t). That way, xmalloc returns a properly-aligned pointer even if XMALLOC_OVERRUN_CHECK is defined. The old debugging code happened to align OK on typical 64-bit hosts, but not on Fedora 14 x86. * charset.c (syms_of_charset): Take XMALLOC_OVERRUN_CHECK_OVERHEAD into account when calculating the initial malloc maximum. * lisp.h (XMALLOC_OVERRUN_CHECK_OVERHEAD, XMALLOC_OVERRUN_CHECK_SIZE): Move here from alloc.c, so that charset.c can use it too. Properly align; the old code wasn't right for common 32-bit hosts when configured with --enable-checking=all. (XMALLOC_BASE_ALIGNMENT, COMMON_MULTIPLE, XMALLOC_HEADER_ALIGNMENT) (XMALLOC_OVERRUN_SIZE_SIZE): New macros. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-09-29 12:00:18 +0000 +++ src/ChangeLog 2011-09-30 03:25:46 +0000 @@ -1,3 +1,23 @@ +2011-09-30 Paul Eggert + + Port --enable-checking=all to Fedora 14 x86. + * alloc.c (XMALLOC_OVERRUN_CHECK_OVERHEAD, XMALLOC_OVERRUN_CHECK_SIZE): + Move to lisp.h. + (xmalloc_put_size, xmalloc_get_size, overrun_check_malloc) + (overrun_check_realloc, overrun_check_free): + Use XMALLOC_OVERRUN_SIZE_SIZE, not sizeof (size_t). + That way, xmalloc returns a properly-aligned pointer even if + XMALLOC_OVERRUN_CHECK is defined. The old debugging code happened + to align OK on typical 64-bit hosts, but not on Fedora 14 x86. + * charset.c (syms_of_charset): Take XMALLOC_OVERRUN_CHECK_OVERHEAD + into account when calculating the initial malloc maximum. + * lisp.h (XMALLOC_OVERRUN_CHECK_OVERHEAD, XMALLOC_OVERRUN_CHECK_SIZE): + Move here from alloc.c, so that charset.c can use it too. + Properly align; the old code wasn't right for common 32-bit hosts + when configured with --enable-checking=all. + (XMALLOC_BASE_ALIGNMENT, COMMON_MULTIPLE, XMALLOC_HEADER_ALIGNMENT) + (XMALLOC_OVERRUN_SIZE_SIZE): New macros. + 2011-09-29 Eli Zaretskii * sysdep.c (snprintf) [EOVERFLOW]: If EOVERFLOW is not defined, === modified file 'src/alloc.c' --- src/alloc.c 2011-09-09 01:06:52 +0000 +++ src/alloc.c 2011-09-30 03:25:46 +0000 @@ -482,27 +482,10 @@ xsignal (Qnil, Vmemory_signal_data); } - -#ifndef XMALLOC_OVERRUN_CHECK -#define XMALLOC_OVERRUN_CHECK_OVERHEAD 0 -#else +#ifdef XMALLOC_OVERRUN_CHECK /* Check for overrun in malloc'ed buffers by wrapping a header and trailer - around each block. - - The header consists of 16 fixed bytes followed by sizeof (size_t) bytes - containing the original block size in little-endian order, - while the trailer consists of 16 fixed bytes. - - The header is used to detect whether this block has been allocated - through these functions -- as it seems that some low-level libc - functions may bypass the malloc hooks. -*/ - - -#define XMALLOC_OVERRUN_CHECK_SIZE 16 -#define XMALLOC_OVERRUN_CHECK_OVERHEAD \ - (2 * XMALLOC_OVERRUN_CHECK_SIZE + sizeof (size_t)) + around each block. */ static char const xmalloc_overrun_check_header[XMALLOC_OVERRUN_CHECK_SIZE] = { '\x9a', '\x9b', '\xae', '\xaf', @@ -522,9 +505,9 @@ xmalloc_put_size (unsigned char *ptr, size_t size) { int i; - for (i = 0; i < sizeof (size_t); i++) + for (i = 0; i < XMALLOC_OVERRUN_SIZE_SIZE; i++) { - *--ptr = size & (1 << CHAR_BIT) - 1; + *--ptr = size & ((1 << CHAR_BIT) - 1); size >>= CHAR_BIT; } } @@ -534,8 +517,8 @@ { size_t size = 0; int i; - ptr -= sizeof (size_t); - for (i = 0; i < sizeof (size_t); i++) + ptr -= XMALLOC_OVERRUN_SIZE_SIZE; + for (i = 0; i < XMALLOC_OVERRUN_SIZE_SIZE; i++) { size <<= CHAR_BIT; size += *ptr++; @@ -579,7 +562,7 @@ if (val && check_depth == 1) { memcpy (val, xmalloc_overrun_check_header, XMALLOC_OVERRUN_CHECK_SIZE); - val += XMALLOC_OVERRUN_CHECK_SIZE + sizeof (size_t); + val += XMALLOC_OVERRUN_CHECK_SIZE + XMALLOC_OVERRUN_SIZE_SIZE; xmalloc_put_size (val, size); memcpy (val + size, xmalloc_overrun_check_trailer, XMALLOC_OVERRUN_CHECK_SIZE); @@ -603,7 +586,7 @@ if (val && check_depth == 1 && memcmp (xmalloc_overrun_check_header, - val - XMALLOC_OVERRUN_CHECK_SIZE - sizeof (size_t), + val - XMALLOC_OVERRUN_CHECK_SIZE - XMALLOC_OVERRUN_SIZE_SIZE, XMALLOC_OVERRUN_CHECK_SIZE) == 0) { size_t osize = xmalloc_get_size (val); @@ -611,8 +594,8 @@ XMALLOC_OVERRUN_CHECK_SIZE)) abort (); memset (val + osize, 0, XMALLOC_OVERRUN_CHECK_SIZE); - val -= XMALLOC_OVERRUN_CHECK_SIZE + sizeof (size_t); - memset (val, 0, XMALLOC_OVERRUN_CHECK_SIZE + sizeof (size_t)); + val -= XMALLOC_OVERRUN_CHECK_SIZE + XMALLOC_OVERRUN_SIZE_SIZE; + memset (val, 0, XMALLOC_OVERRUN_CHECK_SIZE + XMALLOC_OVERRUN_SIZE_SIZE); } val = (unsigned char *) realloc ((POINTER_TYPE *)val, size + overhead); @@ -620,7 +603,7 @@ if (val && check_depth == 1) { memcpy (val, xmalloc_overrun_check_header, XMALLOC_OVERRUN_CHECK_SIZE); - val += XMALLOC_OVERRUN_CHECK_SIZE + sizeof (size_t); + val += XMALLOC_OVERRUN_CHECK_SIZE + XMALLOC_OVERRUN_SIZE_SIZE; xmalloc_put_size (val, size); memcpy (val + size, xmalloc_overrun_check_trailer, XMALLOC_OVERRUN_CHECK_SIZE); @@ -640,7 +623,7 @@ if (val && check_depth == 1 && memcmp (xmalloc_overrun_check_header, - val - XMALLOC_OVERRUN_CHECK_SIZE - sizeof (size_t), + val - XMALLOC_OVERRUN_CHECK_SIZE - XMALLOC_OVERRUN_SIZE_SIZE, XMALLOC_OVERRUN_CHECK_SIZE) == 0) { size_t osize = xmalloc_get_size (val); @@ -648,12 +631,12 @@ XMALLOC_OVERRUN_CHECK_SIZE)) abort (); #ifdef XMALLOC_CLEAR_FREE_MEMORY - val -= XMALLOC_OVERRUN_CHECK_SIZE + sizeof (size_t); + val -= XMALLOC_OVERRUN_CHECK_SIZE + XMALLOC_OVERRUN_SIZE_SIZE; memset (val, 0xff, osize + XMALLOC_OVERRUN_CHECK_OVERHEAD); #else memset (val + osize, 0, XMALLOC_OVERRUN_CHECK_SIZE); - val -= XMALLOC_OVERRUN_CHECK_SIZE + sizeof (size_t); - memset (val, 0, XMALLOC_OVERRUN_CHECK_SIZE + sizeof (size_t)); + val -= XMALLOC_OVERRUN_CHECK_SIZE + XMALLOC_OVERRUN_SIZE_SIZE; + memset (val, 0, XMALLOC_OVERRUN_CHECK_SIZE + XMALLOC_OVERRUN_SIZE_SIZE); #endif } === modified file 'src/charset.c' --- src/charset.c 2011-08-05 02:15:35 +0000 +++ src/charset.c 2011-09-30 03:25:46 +0000 @@ -2337,7 +2337,7 @@ mmap for larger allocations, and these don't work well across dumped systems. */ enum { - initial_malloc_max = (1 << 16) - 1, + initial_malloc_max = (1 << 16) - 1 - XMALLOC_OVERRUN_CHECK_OVERHEAD, charset_table_size_init = initial_malloc_max / sizeof (struct charset) }; === modified file 'src/lisp.h' --- src/lisp.h 2011-09-11 00:41:48 +0000 +++ src/lisp.h 2011-09-30 03:25:46 +0000 @@ -3568,6 +3568,54 @@ extern int immediate_quit; /* Nonzero means ^G can quit instantly */ +/* Overhead for overrun check in malloc'ed buffers. The check + operates by wrapping a header and trailer around each block. + + The header consists of XMALLOC_OVERRUN_CHECK_SIZE fixed bytes + followed by XMALLOC_OVERRUN_SIZE_SIZE bytes containing the original + block size in little-endian order. The trailer consists of + XMALLOC_OVERRUN_CHECK_SIZE fixed bytes. + + The header is used to detect whether this block has been allocated + through these functions, as some low-level libc functions may + bypass the malloc hooks. */ + +#ifndef XMALLOC_OVERRUN_CHECK +# define XMALLOC_OVERRUN_CHECK_OVERHEAD 0 +#else + +# define XMALLOC_OVERRUN_CHECK_SIZE 16 +# define XMALLOC_OVERRUN_CHECK_OVERHEAD \ + (2 * XMALLOC_OVERRUN_CHECK_SIZE + XMALLOC_OVERRUN_SIZE_SIZE) + +/* Define XMALLOC_OVERRUN_SIZE_SIZE so that (1) it's large enough to + hold a size_t value and (2) the header size is a multiple of the + alignment that Emacs needs for C types and for USE_LSB_TAG. */ +# define XMALLOC_BASE_ALIGNMENT \ + offsetof ( \ + struct { \ + union { long double d; intmax_t i; void *p; } u; \ + char c; \ + }, \ + c) +# ifdef USE_LSB_TAG +/* A common multiple of the positive integers A and B. Ideally this + would be the least common multiple, but there's no way to do that + as a constant expression in C, so do the best that we can easily do. */ +# define COMMON_MULTIPLE(a, b) \ + ((a) % (b) == 0 ? (a) : (b) % (a) == 0 ? (b) : (a) * (b)) +# define XMALLOC_HEADER_ALIGNMENT \ + COMMON_MULTIPLE (1 << GCTYPEBITS, XMALLOC_BASE_ALIGNMENT) +# else +# define XMALLOC_HEADER_ALIGNMENT XMALLOC_BASE_ALIGNMENT +# endif +# define XMALLOC_OVERRUN_SIZE_SIZE \ + (((XMALLOC_OVERRUN_CHECK_SIZE + sizeof (size_t) \ + + XMALLOC_HEADER_ALIGNMENT - 1) \ + / XMALLOC_HEADER_ALIGNMENT * XMALLOC_HEADER_ALIGNMENT) \ + - XMALLOC_OVERRUN_CHECK_SIZE) +#endif + extern POINTER_TYPE *xmalloc (size_t); extern POINTER_TYPE *xrealloc (POINTER_TYPE *, size_t); extern void xfree (POINTER_TYPE *); ------------------------------------------------------------ revno: 105961 committer: Eli Zaretskii branch nick: trunk timestamp: Thu 2011-09-29 17:19:11 +0300 message: Fix last commit. diff: === modified file '.bzrignore' --- .bzrignore 2011-09-29 14:17:42 +0000 +++ .bzrignore 2011-09-29 14:19:11 +0000 @@ -62,7 +62,7 @@ lib/time.h lib/unistd.h lib/warn-on-use.h -lib/.in-h +lib/alloca.in-h lib/getopt.in-h lib/signal.in-h lib/signal.h ------------------------------------------------------------ revno: 105960 committer: Eli Zaretskii branch nick: trunk timestamp: Thu 2011-09-29 17:17:42 +0300 message: Add a few more MS-DOS specific files to .bzrignore. .bzrignore: Add lib/SYS, lib/alloca.in-h, lib/signal.in-h. diff: === modified file '.bzrignore' --- .bzrignore 2011-09-29 12:13:54 +0000 +++ .bzrignore 2011-09-29 14:17:42 +0000 @@ -58,10 +58,13 @@ lib/stdint.h lib/stdlib.h lib/sys/ +lib/SYS lib/time.h lib/unistd.h lib/warn-on-use.h +lib/.in-h lib/getopt.in-h +lib/signal.in-h lib/signal.h lib/stdbool.in-h lib/stddef.in-h === modified file 'ChangeLog' --- ChangeLog 2011-09-29 12:18:08 +0000 +++ ChangeLog 2011-09-29 14:17:42 +0000 @@ -1,6 +1,7 @@ 2011-09-29 Eli Zaretskii - * .bzrignore: Add ./GNUmakefile.unix. + * .bzrignore: Add ./GNUmakefile.unix, lib/SYS, lib/alloca.in-h, + lib/signal.in-h. * config.bat: Rename GNUmakefile, so it is not run on MS-DOS. Rename signal.in.h and alloca.in.h. ------------------------------------------------------------ revno: 105959 fixes bug(s): http://debbugs.gnu.org/9607 committer: Eli Zaretskii branch nick: trunk timestamp: Thu 2011-09-29 16:03:42 +0300 message: Fix bug #9607 with vertical motion when auto-hscroll-mode is disabled. lisp/simple.el (line-move): If auto-hscroll-mode is disabled and the window is hscrolled, move by logical lines. (line-move-visual): Update the doc string to the above effect. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-09-29 09:20:45 +0000 +++ lisp/ChangeLog 2011-09-29 13:03:42 +0000 @@ -1,3 +1,9 @@ +2011-09-29 Eli Zaretskii + + * simple.el (line-move): If auto-hscroll-mode is disabled and the + window is hscrolled, move by logical lines. (Bug#9607) + (line-move-visual): Update the doc string to the above effect. + 2011-09-29 Martin Rudalics * window.el (display-buffer-record-window): When WINDOW is the === modified file 'lisp/simple.el' --- lisp/simple.el 2011-09-28 20:50:16 +0000 +++ lisp/simple.el 2011-09-29 13:03:42 +0000 @@ -4244,7 +4244,9 @@ into account variable-width characters and line continuation. If nil, `line-move' moves point by logical lines. A non-nil setting of `goal-column' overrides the value of this variable -and forces movement by logical lines." +and forces movement by logical lines. +Disabling `auto-hscroll-mode' also overrides forces movement by logical +lines when the window is horizontally scrolled." :type 'boolean :group 'editing-basics :version "23.1") @@ -4321,7 +4323,15 @@ (not executing-kbd-macro) (line-move-partial arg noerror to-end)) (set-window-vscroll nil 0 t) - (if (and line-move-visual (not goal-column)) + (if (and line-move-visual + ;; Display-based column are incompatible with goal-column. + (not goal-column) + ;; When auto-hscroll-mode is turned off and the text in + ;; the window is scrolled to the left, display-based + ;; motion doesn't make sense (because each logical line + ;; occupies exactly one screen line). + (not (and (null auto-hscroll-mode) + (> (window-hscroll) 0)))) (line-move-visual arg noerror) (line-move-1 arg noerror to-end)))) ------------------------------------------------------------ revno: 105958 committer: Eli Zaretskii branch nick: trunk timestamp: Thu 2011-09-29 15:18:08 +0300 message: Fix ChangeLog entry for the last commit. diff: === modified file 'ChangeLog' --- ChangeLog 2011-09-29 12:00:18 +0000 +++ ChangeLog 2011-09-29 12:18:08 +0000 @@ -1,8 +1,8 @@ 2011-09-29 Eli Zaretskii - * .bzrignore: Add ./GNUMakefile.unix. + * .bzrignore: Add ./GNUmakefile.unix. - * config.bat: Rename GNUMakefile, so it is not run on MS-DOS. + * config.bat: Rename GNUmakefile, so it is not run on MS-DOS. Rename signal.in.h and alloca.in.h. 2011-09-28 Eli Zaretskii ------------------------------------------------------------ revno: 105957 [merge] committer: Eli Zaretskii branch nick: trunk timestamp: Thu 2011-09-29 15:13:54 +0300 message: Fix the MSDOS build due to recent changes. msdos/mainmake.v2 (boot): Condition the value on the existence of autogen/README, not admin/admin.el, since the latter is now part of the release tarball. (install): Don't copy lib-src/fns.el, as that file is no longer generated in that directory. msdos/sed1v2.inp (LIB_PTHREAD, LIB_PTHREAD_SIGMASK): Edit to empty. (SETTINGS_CFLAGS, SETTINGS_LIBS): Edit these instead of GCONF_CFLAGS and GCONF_LIBS. msdos/sedlibmk.inp (ALLOCA_H, AR, ARFLAGS, GNULIB_CHDIR, GNULIB_DUP) (GNULIB_FDATASYNC, GNULIB_FDOPEN, GNULIB_FSTAT, GNULIB_PCLOSE) (GNULIB_PTHREAD_SIGMASK, GNULIB_RAISE, GNULIB_SIGACTION) (GNULIB_SIGPROCMASK, GNULIB_SIGNAL_H_SIGPIPE, HAVE_FDATASYNC) (HAVE_PCLOSE, HAVE_POPEN, HAVE_POSIX_SIGNALBLOCKING) (HAVE_PTHREAD_SIGMASK, HAVE_RAISE, HAVE_SIGACTION) (HAVE_SIGHANDLER_T, HAVE_SIGINFO_T, HAVE_SIGSET_T) (HAVE_STRUCT_SIGACTION_SA_SIGACTION) (HAVE_TYPE_VOLATILE_SIG_ATOMIC_T, LIB_PTHREAD) (LIB_PTHREAD_SIGMASK, NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H) (NEXT_SIGNAL_H, REPLACE_FDOPEN, REPLACE_PTHREAD_SIGMASK) (REPLACE_RAISE): New edits. (gl_LIBOBJS): Remove md5.o, filemode.o, and sha1.o. Add pthread_sigmask.o. (@GL_GENERATE_ALLOCA_H_TRUE@, @GL_GENERATE_ALLOCA_H_FALSE@): Edit to comment out unneeded lines. (warn-on-use.h): Edit the recipe commands to work with DJGPP without requiring a Unixy shell. msdos/inttypes.h (strtoimax) [DJGPP < 2.04]: New macro. msdos/sed2v2.inp (HAVE_ALLOCA, HAVE_DECL_STRTOLL, HAVE_DECL_STRTOIMAX) (HAVE_STRTOLL, HAVE_SIGSET_T, HAVE_SNPRINTF): New edits. .bzrignore: Add ./GNUmakefile.unix. config.bat: Rename GNUmakefile, so it is not run on MS-DOS. Rename signal.in.h and alloca.in.h. src/sysdep.c (snprintf) [EOVERFLOW]: If EOVERFLOW is not defined, use EDOM. diff: === modified file '.bzrignore' --- .bzrignore 2011-07-24 22:15:47 +0000 +++ .bzrignore 2011-09-29 12:13:54 +0000 @@ -26,6 +26,7 @@ makefile Makefile Makefile.c +./GNUmakefile.unix stamp-h1 stamp_BLD subdirs.el === modified file 'ChangeLog' --- ChangeLog 2011-09-28 17:49:09 +0000 +++ ChangeLog 2011-09-29 12:00:18 +0000 @@ -1,3 +1,10 @@ +2011-09-29 Eli Zaretskii + + * .bzrignore: Add ./GNUMakefile.unix. + + * config.bat: Rename GNUMakefile, so it is not run on MS-DOS. + Rename signal.in.h and alloca.in.h. + 2011-09-28 Eli Zaretskii * INSTALL: Mention that m17n libraries and libotf are needed for === modified file 'config.bat' --- config.bat 2011-07-25 18:48:17 +0000 +++ config.bat 2011-09-29 12:08:36 +0000 @@ -279,8 +279,10 @@ cd lib Rem Rename files like djtar on plain DOS filesystem would. If Exist build-aux\snippet\c++defs.h update build-aux/snippet/c++defs.h build-aux/snippet/cxxdefs.h +If Exist alloca.in.h update alloca.in.h alloca.in-h If Exist getopt.in.h update getopt.in.h getopt.in-h If Exist stdbool.in.h update stdbool.in.h stdbool.in-h +If Exist signal.in.h update signal.in.h signal.in-h If Exist stddef.in.h update stddef.in.h stddef.in-h If Exist stdint.in.h update stdint.in.h stdint.in-h If Exist stdio.in.h update stdio.in.h stdio.in-h @@ -326,6 +328,8 @@ goto End :gdbinitOk Echo Looking for the GDB init file...found +rem GNUMakefile is not appropriate for MS-DOS so move it out of the way +If Exist GNUmakefile mv -f GNUmakefile GNUmakefile.unix copy msdos\mainmake.v2 Makefile >nul rem ---------------------------------------------------------------------- goto End === modified file 'msdos/ChangeLog' --- msdos/ChangeLog 2011-09-06 16:34:41 +0000 +++ msdos/ChangeLog 2011-09-29 12:00:18 +0000 @@ -1,3 +1,39 @@ +2011-09-29 Eli Zaretskii + + * mainmake.v2 (boot): Condition the value on the existence of + autogen/README, not admin/admin.el, since the latter is now part + of the release tarball. + (install): Don't copy lib-src/fns.el, as that file is no longer + generated in that directory. + + * sed1v2.inp (LIB_PTHREAD, LIB_PTHREAD_SIGMASK): Edit to empty. + (SETTINGS_CFLAGS, SETTINGS_LIBS): Edit these instead of + GCONF_CFLAGS and GCONF_LIBS. + + * sedlibmk.inp (ALLOCA_H, AR, ARFLAGS, GNULIB_CHDIR, GNULIB_DUP) + (GNULIB_FDATASYNC, GNULIB_FDOPEN, GNULIB_FSTAT, GNULIB_PCLOSE) + (GNULIB_PTHREAD_SIGMASK, GNULIB_RAISE, GNULIB_SIGACTION) + (GNULIB_SIGPROCMASK, GNULIB_SIGNAL_H_SIGPIPE, HAVE_FDATASYNC) + (HAVE_PCLOSE, HAVE_POPEN, HAVE_POSIX_SIGNALBLOCKING) + (HAVE_PTHREAD_SIGMASK, HAVE_RAISE, HAVE_SIGACTION) + (HAVE_SIGHANDLER_T, HAVE_SIGINFO_T, HAVE_SIGSET_T) + (HAVE_STRUCT_SIGACTION_SA_SIGACTION) + (HAVE_TYPE_VOLATILE_SIG_ATOMIC_T, LIB_PTHREAD) + (LIB_PTHREAD_SIGMASK, NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H) + (NEXT_SIGNAL_H, REPLACE_FDOPEN, REPLACE_PTHREAD_SIGMASK) + (REPLACE_RAISE): New edits. + (gl_LIBOBJS): Remove md5.o, filemode.o, and sha1.o. Add + pthread_sigmask.o. + (@GL_GENERATE_ALLOCA_H_TRUE@, @GL_GENERATE_ALLOCA_H_FALSE@): Edit + to comment out unneeded lines. + (warn-on-use.h): Edit the recipe commands to work with DJGPP + without requiring a Unixy shell. + + * inttypes.h (strtoimax) [DJGPP < 2.04]: New macro. + + * sed2v2.inp (HAVE_ALLOCA, HAVE_DECL_STRTOLL, HAVE_DECL_STRTOIMAX) + (HAVE_STRTOLL, HAVE_SIGSET_T, HAVE_SNPRINTF): New edits. + 2011-09-06 Paul Eggert * sedlibmk.inp (CONFIG_CLEAN_VPATH_FILES): Adjust to snippet moves === modified file 'msdos/inttypes.h' --- msdos/inttypes.h 2011-05-07 10:24:55 +0000 +++ msdos/inttypes.h 2011-09-29 12:00:18 +0000 @@ -30,6 +30,7 @@ #else /* __DJGPP__ < 2.04 */ #include #define strtoumax strtoull +#define strtoimax strtoll #endif /* __DJGPP__ < 2.04 */ #endif === modified file 'msdos/mainmake.v2' --- msdos/mainmake.v2 2011-02-19 17:54:18 +0000 +++ msdos/mainmake.v2 2011-09-29 12:00:18 +0000 @@ -64,12 +64,13 @@ top_srcdir := $(subst \,/,$(shell cd)) # Q: Do we need to bootstrap? -# A: Only if we find admin/admin.el, i.e. we are building out of -# a VCS-checkout (not a release) and src/b-emacs.exe does not exist. +# A: Only if we find autogen/README, i.e. we are building out of +# a VCS-checkout (not a release), and src/b-emacs.exe does not exist. # This avoids building a bootstrap-emacs and recompiling Lisp files -# when building a pretest/release tarball. +# when building a pretest/release tarball. Recompiling Lisp files +# is BAD because lisp/Makefile.in requires a Unixy shell. boot := -ifneq ($(wildcard admin/admin.el),) +ifneq ($(wildcard autogen/README),) ifeq ($(wildcard src/b-emacs.exe),) boot := b-emacs.exe endif @@ -132,7 +133,6 @@ cd lib-src command.com /c >/dev/null for %p in (hexl etags ctags ebrowse) do\ if exist %p.exe mv -f %p.exe ../bin - if exist fns.el update fns.el ../bin/fns.el cd .. cd src mv -f emacs.exe ../bin/ === modified file 'msdos/sed1v2.inp' --- msdos/sed1v2.inp 2011-05-28 10:00:09 +0000 +++ msdos/sed1v2.inp 2011-09-29 12:00:18 +0000 @@ -53,6 +53,7 @@ /^LIB_GCC *=/s/@LIB_GCC@// /^LIB_STANDARD *=/s/@LIB_STANDARD@// /^LIB_MATH *=/s/@LIB_MATH@/-lm/ +/^LIB_PTHREAD *=/s/@LIB_PTHREAD@// /^LIBTIFF *=/s/@LIBTIFF@// /^LIBJPEG *=/s/@LIBJPEG@// /^LIBPNG *=/s/@LIBPNG@// @@ -70,8 +71,8 @@ /^DBUS_CFLAGS *=/s/@DBUS_CFLAGS@// /^DBUS_LIBS *=/s/@DBUS_LIBS@// /^DBUS_OBJ *=/s/@DBUS_OBJ@// -/^GCONF_CFLAGS *=/s/@GCONF_CFLAGS@// -/^GCONF_LIBS *=/s/@GCONF_LIBS@// +/^SETTINGS_CFLAGS *=/s/@SETTINGS_CFLAGS@// +/^SETTINGS_LIBS *=/s/@SETTINGS_LIBS@// /^GTK_OBJ *=/s/@GTK_OBJ@// /^LIBS_TERMCAP *=/s/@LIBS_TERMCAP@// /^TERMCAP_OBJ *=/s/@TERMCAP_OBJ@/termcap.o tparam.o/ @@ -102,6 +103,7 @@ /^GNU_OBJC_CFLAGS*=/s/@GNU_OBJC_CFLAGS@// /^LIBRESOLV *=/s/@LIBRESOLV@// /^LIBSELINUX_LIBS *=/s/@LIBSELINUX_LIBS@// +/^LIB_PTHREAD_SIGMASK *=/s/@[^@\n]*@// /^LIBGNUTLS_LIBS *=/s/@[^@\n]*@// /^LIBGNUTLS_CFLAGS *=/s/@[^@\n]*@// /^GETLOADAVG_LIBS *=/s/@[^@\n]*@// === modified file 'msdos/sed2v2.inp' --- msdos/sed2v2.inp 2011-09-26 03:20:03 +0000 +++ msdos/sed2v2.inp 2011-09-29 12:00:18 +0000 @@ -26,6 +26,7 @@ #define NSIG 320\ #endif +/^#undef HAVE_ALLOCA *$/s/^.*$/#define HAVE_ALLOCA 1/ /^#undef HAVE_SETITIMER *$/s/^.*$/#define HAVE_SETITIMER 1/ /^#undef HAVE_STRUCT_UTIMBUF *$/s/^.*$/#define HAVE_STRUCT_UTIMBUF 1/ /^#undef LOCALTIME_CACHE *$/s/^.*$/#define LOCALTIME_CACHE 1/ @@ -100,10 +101,19 @@ #else\ #undef HAVE_STDINT_H\ #endif +s/^#undef HAVE_DECL_STRTOLL *$/#define HAVE_DECL_STRTOLL 1/ s/^#undef HAVE_DECL_STRTOULL *$/#define HAVE_DECL_STRTOULL 1/ +s/^#undef HAVE_DECL_STRTOIMAX *$/#define HAVE_DECL_STRTOIMAX 1/ s/^#undef HAVE_DECL_STRTOUMAX *$/#define HAVE_DECL_STRTOUMAX 1/ -s/^#undef HAVE_STRTOULL *$/#define HAVE_STRTOULL 1/ -s/^#undef HAVE_STRTOULL *$/#define HAVE_STRTOULL 1/ +s/^#undef HAVE_STRTOLL *$/#define HAVE_STRTOLL 1/ +s/^#undef HAVE_STRTOULL *$/#define HAVE_STRTOULL 1/ +/^#undef HAVE_SIGSET_T *$/s/^.*$/#define HAVE_SIGSET_T 1/ +/^#undef HAVE_SNPRINTF/c\ +#if __DJGPP__ > 2 || __DJGPP_MINOR__ > 3\ +#define HAVE_SNPRINTF 1\ +#else\ +#undef HAVE_SNPRINTF\ +#endif # Comment out any remaining undef directives, because some of them # might be defined in sys/config.h we include at the top of config.h. === modified file 'msdos/sedlibmk.inp' --- msdos/sedlibmk.inp 2011-07-24 22:15:47 +0000 +++ msdos/sedlibmk.inp 2011-09-29 12:00:18 +0000 @@ -111,6 +111,8 @@ /^ALLOCA *=/s/@[^@\n]*@// /^ALSA_CFLAGS *=/s/@[^@\n]*@// /^ALSA_LIBS *=/s/@[^@\n]*@// +/^AR *=/s/@[^@\n]*@/ar/ +/^ARFLAGS *=/s/@[^@\n]*@/cru/ /^AWK *=/s/@[^@\n]*@/gawk/ /^CANNOT_DUMP *=/s/@[^@\n]*@/no/ /^CC *=/s/@[^@\n]*@/gcc/ @@ -147,9 +149,11 @@ /^GNULIB_ATOLL *=/s/@GNULIB_ATOLL@/1/ /^GNULIB_CALLOC_POSIX *=/s/@GNULIB_CALLOC_POSIX@/0/ /^GNULIB_CANONICALIZE_FILE_NAME *=/s/@GNULIB_CANONICALIZE_FILE_NAME@/0/ +/^GNULIB_CHDIR *=/s/@GNULIB_CHDIR@/0/ /^GNULIB_CHOWN *=/s/@GNULIB_CHOWN@/0/ /^GNULIB_CLOSE *=/s/@GNULIB_CLOSE@/0/ /^GNULIB_DPRINTF *=/s/@GNULIB_DPRINTF@/0/ +/^GNULIB_DUP *=/s/@GNULIB_DUP@/0/ /^GNULIB_DUP2 *=/s/@GNULIB_DUP2@/0/ /^GNULIB_DUP3 *=/s/@GNULIB_DUP3@/1/ /^GNULIB_ENVIRON *=/s/@GNULIB_ENVIRON@/0/ @@ -159,6 +163,8 @@ /^GNULIB_FCHOWNAT *=/s/@GNULIB_FCHOWNAT@/0/ /^GNULIB_FCHMODAT *=/s/@GNULIB_FCHMODAT@/0/ /^GNULIB_FCLOSE *=/s/@GNULIB_FCLOSE@/0/ +/^GNULIB_FDATASYNC *=/s/@GNULIB_FDATASYNC@/0/ +/^GNULIB_FDOPEN *=/s/@GNULIB_FDOPEN@/0/ /^GNULIB_FFLUSH *=/s/@GNULIB_FFLUSH@/0/ /^GNULIB_FGETC *=/s/@GNULIB_FGETC@/0/ /^GNULIB_FGETS *=/s/@GNULIB_FGETS@/0/ @@ -173,6 +179,7 @@ /^GNULIB_FSCANF *=/s/@GNULIB_FSCANF@/0/ /^GNULIB_FSEEK *=/s/@GNULIB_FSEEK@/0/ /^GNULIB_FSEEKO *=/s/@GNULIB_FSEEKO@/0/ +/^GNULIB_FSTAT *=/s/@GNULIB_FSTAT@/0/ /^GNULIB_FSTATAT *=/s/@GNULIB_FSTATAT@/0/ /^GNULIB_FSYNC *=/s/@GNULIB_FSYNC@/0/ /^GNULIB_FTELL *=/s/@GNULIB_FTELL@/0/ @@ -220,6 +227,7 @@ /^GNULIB_NANOSLEEP *=/s/@GNULIB_NANOSLEEP@/0/ /^GNULIB_OBSTACK_PRINTF *=/s/@GNULIB_OBSTACK_PRINTF@/0/ /^GNULIB_OBSTACK_PRINTF_POSIX *=/s/@GNULIB_OBSTACK_PRINTF_POSIX@/0/ +/^GNULIB_PCLOSE *=/s/@GNULIB_PCLOSE@/0/ /^GNULIB_PERROR *=/s/@GNULIB_PERROR@/0/ /^GNULIB_PIPE *=/s/@GNULIB_PIPE@/0/ /^GNULIB_PIPE2 *=/s/@GNULIB_PIPE2@/0/ @@ -227,12 +235,14 @@ /^GNULIB_PREAD *=/s/@GNULIB_PREAD@/0/ /^GNULIB_PRINTF *=/s/@GNULIB_PRINTF@/0/ /^GNULIB_PRINTF_POSIX *=/s/@GNULIB_PRINTF_POSIX@/0/ +/^GNULIB_PTHREAD_SIGMASK *=/s/@GNULIB_PTHREAD_SIGMASK@/0/ /^GNULIB_PTSNAME *=/s/@GNULIB_PTSNAME@/0/ /^GNULIB_PUTC *=/s/@GNULIB_PUTC@/0/ /^GNULIB_PUTCHAR *=/s/@GNULIB_PUTCHAR@/0/ /^GNULIB_PUTENV *=/s/@GNULIB_PUTENV@/0/ /^GNULIB_PUTS *=/s/@GNULIB_PUTS@/0/ /^GNULIB_PWRITE *=/s/@GNULIB_PWRITE@/0/ +/^GNULIB_RAISE *=/s/@GNULIB_RAISE@/0/ /^GNULIB_RANDOM_R *=/s/@GNULIB_RANDOM_R@/0/ /^GNULIB_READ *=/s/@GNULIB_READ@/0/ /^GNULIB_READLINK *=/s/@GNULIB_READLINK@/0/ @@ -246,6 +256,9 @@ /^GNULIB_RPMATCH *=/s/@GNULIB_RPMATCH@/0/ /^GNULIB_SCANF *=/s/@GNULIB_SCANF@/0/ /^GNULIB_SETENV *=/s/@GNULIB_SETENV@/0/ +/^GNULIB_SIGACTION *=/s/@GNULIB_SIGACTION@/0/ +/^GNULIB_SIGNAL_H_SIGPIPE *=/s/@GNULIB_SIGNAL_H_SIGPIPE@/0/ +/^GNULIB_SIGPROCMASK *=/s/@GNULIB_SIGPROCMASK@/0/ /^GNULIB_SLEEP *=/s/@GNULIB_SLEEP@/0/ /^GNULIB_SNPRINTF *=/s/@GNULIB_SNPRINTF@/0/ /^GNULIB_SPRINTF_POSIX *=/s/@GNULIB_SPRINTF_POSIX@/0/ @@ -285,11 +298,14 @@ /^GNULIB_WCTOMB *=/s/@GNULIB_WCTOMB@/0/ /^GNULIB_WRITE *=/s/@GNULIB_WRITE@/0/ /^GNULIB__EXIT *=/s/@GNULIB__EXIT@/0/ +/^GSETTINGS_CFLAGS *=/s/@[^@\n]*@// +/^GSETTINGS_LIBS *=/s/@[^@\n]*@// /^HAVE_ATOLL *=/s/@HAVE_ATOLL@/0/ /^HAVE_CANONICALIZE_FILE_NAME *=/s/@HAVE_CANONICALIZE_FILE_NAME@/0/ /^HAVE_CHOWN *=/s/@HAVE_CHOWN@/1/ /^HAVE_DECL_ENVIRON *=/s/@HAVE_DECL_ENVIRON@/1/ /^HAVE_DECL_FCHDIR *=/s/@HAVE_DECL_FCHDIR@/0/ +/^HAVE_DECL_FDATASYNC *=/s/@HAVE_DECL_FDATASYNC@/0/ /^HAVE_DECL_FPURGE *=/s/@HAVE_DECL_FPURGE@// /^HAVE_DECL_FSEEKO *=/s/@HAVE_DECL_FSEEKO@/0/ /^HAVE_DECL_FTELLO *=/s/@HAVE_DECL_FTELLO@/0/ @@ -315,6 +331,7 @@ /^HAVE_FCHDIR *=/s/@HAVE_FCHDIR@/0/ /^HAVE_FCHMODAT *=/s/@HAVE_FCHMODAT@/0/ /^HAVE_FCHOWNAT *=/s/@HAVE_FCHOWNAT@/0/ +/^HAVE_FDATASYNC *=/s/@HAVE_FDATASYNC@/0/ /^HAVE_FSEEKO *=/s/@HAVE_FSEEKO@/0/ /^HAVE_FSTATAT *=/s/@HAVE_FSTATAT@/0/ /^HAVE_FSYNC *=/s/@HAVE_FSYNC@/1/ @@ -351,11 +368,16 @@ /^HAVE_NANOSLEEP *=/s/@HAVE_NANOSLEEP@/0/ /^HAVE_OS_H *=/s/@HAVE_OS_H@/0/ /^HAVE_PIPE *=/s/@HAVE_PIPE@/0/ +/^HAVE_PCLOSE *=/s/@HAVE_PCLOSE@/1/ /^HAVE_PIPE2 *=/s/@HAVE_PIPE2@/0/ +/^HAVE_POPEN *=/s/@HAVE_POPEN@/1/ +/^HAVE_POSIX_SIGNALBLOCKING *=/s/@HAVE_POSIX_SIGNALBLOCKING@/1/ /^HAVE_PREAD *=/s/@HAVE_PREAD@/0/ /^HAVE_PTSNAME *=/s/@HAVE_PTSNAME@/0/ +/^HAVE_PTHREAD_SIGMASK *=/s/@HAVE_PTHREAD_SIGMASK@/0/ /^HAVE_PWRITE *=/s/@HAVE_PWRITE@/0/ /^HAVE_RANDOM_H *=/s/@HAVE_RANDOM_H@/1/ +/^HAVE_RAISE *=/s/@HAVE_RAISE@/1/ /^HAVE_RANDOM_R *=/s/@HAVE_RANDOM_R@/0/ /^HAVE_READLINK *=/s/@HAVE_READLINK@/0/ /^HAVE_READLINKAT *=/s/@HAVE_READLINKAT@/0/ @@ -363,15 +385,20 @@ /^HAVE_RENAMEAT *=/s/@HAVE_RENAMEAT@/0/ /^HAVE_RPMATCH *=/s/@HAVE_RPMATCH@/0/ /^HAVE_SETENV *=/s/@HAVE_SETENV@/1/ +/^HAVE_SIGACTION *=/s/@HAVE_SIGACTION@/1/ +/^HAVE_SIGHANDLER_T *=/s/@HAVE_SIGHANDLER_T@/0/ +/^HAVE_SIGINFO_T *=/s/@HAVE_SIGINFO_T@/0/ /^HAVE_SIGNED_SIG_ATOMIC_T *=/s/@HAVE_SIGNED_SIG_ATOMIC_T@/1/ /^HAVE_SIGNED_WCHAR_T *=/s/@HAVE_SIGNED_WCHAR_T@/0/ /^HAVE_SIGNED_WINT_T *=/s/@HAVE_SIGNED_WINT_T@/1/ +/^HAVE_SIGSET_T *=/s/@HAVE_SIGSET_T@/1/ /^HAVE_SLEEP *=/s/@HAVE_SLEEP@/1/ /^HAVE_STDINT_H *=/s/@HAVE_STDINT_H@/HAVE_STDINT_H/ /^HAVE_STRPTIME *=/s/@HAVE_STRPTIME@/0/ /^HAVE_STRTOD *=/s/@HAVE_STRTOD@/1/ /^HAVE_STRTOLL *=/s/@HAVE_STRTOLL@/1/ /^HAVE_STRTOULL *=/s/@HAVE_STRTOULL@/1/ +/^HAVE_STRUCT_SIGACTION_SA_SIGACTION *=/s/@HAVE_STRUCT_SIGACTION_SA_SIGACTION@/0/ /^HAVE_STRUCT_RANDOM_DATA *=/s/@HAVE_STRUCT_RANDOM_DATA@/0/ /^HAVE_SYMLINK *=/s/@HAVE_SYMLINK@/1/ /^HAVE_SYMLINKAT *=/s/@HAVE_SYMLINKAT@/0/ @@ -381,6 +408,7 @@ /^HAVE_SYS_PARAM_H *=/s/@HAVE_SYS_PARAM_H@/1/ /^HAVE_SYS_TYPES_H *=/s/@HAVE_SYS_TYPES_H@/1/ /^HAVE_TIMEGM *=/s/@HAVE_TIMEGM@/0/ +/^HAVE_TYPE_VOLATILE_SIG_ATOMIC_T *=/s/@HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@/1/ /^HAVE_UNISTD_H *=/s/@HAVE_UNISTD_H@/1/ /^HAVE_UNLINKAT *=/s/@HAVE_UNLINKAT@/0/ /^HAVE_UNLOCKPT *=/s/@HAVE_UNLOCKPT@/0/ @@ -398,11 +426,14 @@ /^INCLUDE_NEXT_AS_FIRST_DIRECTIVE *=/s/@[^@\n]*@/include_next/ /^LDFLAGS *=/s/@[^@\n]*@// /^LD_FIRSTFLAG *=/s/@[^@\n]*@// +/^LIB_PTHREAD *=/s/@[^@\n]*@// +/^LIB_PTHREAD_SIGMASK *=/s/@[^@\n]*@// /^LIBS *=/s/@[^@\n]*@// /^MAKEINFO *=/s/@MAKEINFO@/makeinfo/ # MKDIR_P lines are edited further below /^MKDIR_P *=/s/@MKDIR_P@// /^NEXT_AS_FIRST_DIRECTIVE_GETOPT_H *=/s/@[^@\n]*@// +/^NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H *=/s/@[^@\n]*@// /^NEXT_AS_FIRST_DIRECTIVE_STDARG_H *=/s/@[^@\n]*@// /^NEXT_AS_FIRST_DIRECTIVE_STDDEF_H *=/s/@[^@\n]*@// /^NEXT_AS_FIRST_DIRECTIVE_STDINT_H *=/s/@[^@\n]*@// @@ -413,6 +444,7 @@ /^NEXT_AS_FIRST_DIRECTIVE_UNISTD_H *=/s/@[^@\n]*@// /^NEXT_GETOPT_H *=/s/@[^@\n]*@// /^NEXT_STDARG_H *=/s/@[^@\n]*@// +/^NEXT_SIGNAL_H *=/s/@[^@\n]*@// /^NEXT_STDDEF_H *=/s/@[^@\n]*@// /^NEXT_STDIO_H *=/s/@[^@\n]*@// /^NEXT_STDINT_H *=/s/@[^@\n]*@// @@ -435,6 +467,7 @@ /^REPLACE_DUP2 *=/s/@REPLACE_DUP2@/0/ /^REPLACE_FCHOWNAT *=/s/@REPLACE_FCHOWNAT@/0/ /^REPLACE_FCLOSE *=/s/@REPLACE_FCLOSE@/0/ +/^REPLACE_FDOPEN *=/s/@REPLACE_FDOPEN@/0/ /^REPLACE_FFLUSH *=/s/@REPLACE_FFLUSH@/0/ /^REPLACE_FOPEN *=/s/@REPLACE_FOPEN@/0/ /^REPLACE_FPRINTF *=/s/@REPLACE_FPRINTF@/0/ @@ -473,9 +506,11 @@ /^REPLACE_POPEN *=/s/@REPLACE_POPEN@/0/ /^REPLACE_PREAD *=/s/@REPLACE_PREAD@/0/ /^REPLACE_PRINTF *=/s/@REPLACE_PRINTF@/0/ +/^REPLACE_PTHREAD_SIGMASK *=/s/@REPLACE_PTHREAD_SIGMASK@/0/ /^REPLACE_PUTENV *=/s/@REPLACE_PUTENV@/0/ /^REPLACE_PWRITE *=/s/@REPLACE_PWRITE@/0/ /^REPLACE_READ *=/s/@REPLACE_READ@/0/ +/^REPLACE_RAISE *=/s/@REPLACE_RAISE@/0/ /^REPLACE_READLINK *=/s/@REPLACE_READLINK@/0/ /^REPLACE_REALLOC *=/s/@REPLACE_REALLOC@/0/ /^REPLACE_REALPATH *=/s/@REPLACE_REALPATH@/0/ @@ -510,6 +545,7 @@ /^REPLACE_WRITE *=/s/@REPLACE_WRITE@/0/ /^SIG_ATOMIC_T_SUFFIX *=/s/@SIG_ATOMIC_T_SUFFIX@// /^SIZE_T_SUFFIX *=/s/@SIZE_T_SUFFIX@/u/ +/^ALLOCA_H *=/s/@[^@\n]*@/alloca.h/ /^STDBOOL_H *=/s/@[^@\n]*@// /^STDARG_H *=/s/@[^@\n]*@// /^STDDEF_H *=/s/@[^@\n]*@// @@ -522,7 +558,7 @@ /^WINT_T_SUFFIX *=/s/@WINT_T_SUFFIX@// /am__append_1 *=.*gettext\.h/s/@[^@\n]*@/\#/ /am__append_2 *=.*verify\.h/s/@[^@\n]*@// -/^gl_LIBOBJS *=/s/@[^@\n]*@/getopt.o getopt1.o strftime.o time_r.o getloadavg.o md5.o filemode.o sha1.o/ +/^gl_LIBOBJS *=/s/@[^@\n]*@/getopt.o getopt1.o strftime.o time_r.o getloadavg.o pthread_sigmask.o/ /^BUILT_SOURCES *=/s/ *inttypes\.h// /^am_libgnu_a_OBJECTS *=/s/careadlinkat\.\$(OBJEXT)// /^am_libgnu_a_OBJECTS *=/s/allocator\.\$(OBJEXT)// @@ -560,6 +596,8 @@ s/@echo /@djecho/ # # Fix the recipes for header files +s/^@GL_GENERATE_ALLOCA_H_TRUE@// +s/^@GL_GENERATE_ALLOCA_H_FALSE@/\#/ s/^@GL_GENERATE_STDBOOL_H_TRUE@/\#/ s/^@GL_GENERATE_STDBOOL_H_FALSE@// s/^@GL_GENERATE_STDARG_H_TRUE@/\#/ @@ -574,6 +612,9 @@ /^cxxdefs\.h:/,/^[ ][ ]*mv /c\ cxxdefs.h: $(top_srcdir)/build-aux/snippet/cxxdefs.h\ sed -n -e '/_GL_CXXDEFS/,$$p' < $(top_srcdir)/build-aux/snippet/cxxdefs.h > $@ +/^warn-on-use\.h:/,/^[ ][ ]*mv /c\ +warn-on-use.h: $(top_srcdir)/build-aux/snippet/warn-on-use.h\ + sed -n -e '/^.ifndef/,$$p' < $(top_srcdir)/build-aux/snippet/warn-on-use.h > $@ s/^ [ ]*{ echo \(.*\); \\/ djecho \1 > $@-t/ s/^ [ ]*{ echo \(.*\) && \\/ djecho \1 > $@-t/ s/ \&\& \\ *$// === modified file 'src/ChangeLog' --- src/ChangeLog 2011-09-28 14:37:27 +0000 +++ src/ChangeLog 2011-09-29 12:00:18 +0000 @@ -1,3 +1,8 @@ +2011-09-29 Eli Zaretskii + + * sysdep.c (snprintf) [EOVERFLOW]: If EOVERFLOW is not defined, + use EDOM. + 2011-09-28 Eli Zaretskii * xdisp.c (compute_display_string_end): If there's no display === modified file 'src/sysdep.c' --- src/sysdep.c 2011-09-09 01:06:52 +0000 +++ src/sysdep.c 2011-09-29 12:00:18 +0000 @@ -1844,7 +1844,11 @@ if (INT_MAX < nbytes) { +#ifdef EOVERFLOW errno = EOVERFLOW; +#else + errno = EDOM; +#endif return -1; } return nbytes; ------------------------------------------------------------ revno: 105956 committer: martin rudalics branch nick: trunk timestamp: Thu 2011-09-29 11:20:45 +0200 message: In display-buffer-record-window call point for selected window. (Bug#9626) * window.el (display-buffer-record-window): When WINDOW is the selected window use `point' instead of `window-point'. (Bug#9626) diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-09-29 08:16:15 +0000 +++ lisp/ChangeLog 2011-09-29 09:20:45 +0000 @@ -1,7 +1,11 @@ 2011-09-29 Martin Rudalics + * window.el (display-buffer-record-window): When WINDOW is the + selected window use `point' instead of `window-point'. (Bug#9626) + * startup.el (command-line-1): Use insert-before-markers when inserting initial-scratch-message. (Bug#9605) + * help.el (help-window): Remove variable. 2011-09-29 Glenn Morris === modified file 'lisp/window.el' --- lisp/window.el 2011-09-24 22:51:36 +0000 +++ lisp/window.el 2011-09-29 09:20:45 +0000 @@ -3833,7 +3833,14 @@ (list 'other ;; A quadruple of WINDOW's buffer, start, point and height. (list (window-buffer window) (window-start window) - (window-point window) (window-total-size window)) + (if (eq window (selected-window)) + ;; When WINDOW is the selected window use its + ;; buffer's `point' instead of `window-point' + ;; (Bug#9626). + (with-current-buffer (window-buffer window) + (point)) + (window-point window)) + (window-total-size window)) (selected-window) buffer)))) ((eq type 'window) ;; WINDOW has been created on an existing frame. ------------------------------------------------------------ revno: 105955 committer: martin rudalics branch nick: trunk timestamp: Thu 2011-09-29 10:16:15 +0200 message: In command-line-1 insert initial-scratch-message before markers (Bug#9605). * startup.el (command-line-1): Use insert-before-markers when inserting initial-scratch-message. (Bug#9605) * help.el (help-window): Remove variable. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-09-29 07:21:06 +0000 +++ lisp/ChangeLog 2011-09-29 08:16:15 +0000 @@ -1,3 +1,9 @@ +2011-09-29 Martin Rudalics + + * startup.el (command-line-1): Use insert-before-markers when + inserting initial-scratch-message. (Bug#9605) + * help.el (help-window): Remove variable. + 2011-09-29 Glenn Morris * pcmpl-cvs.el (pcomplete/cvs): Add "status" handler. === modified file 'lisp/help.el' --- lisp/help.el 2011-09-21 08:20:21 +0000 +++ lisp/help.el 2011-09-29 08:16:15 +0000 @@ -37,17 +37,6 @@ (add-hook 'temp-buffer-setup-hook 'help-mode-setup) (add-hook 'temp-buffer-show-hook 'help-mode-finish) -;; The variable `help-window' below is used by `help-mode-finish' to -;; communicate the window displaying help (the "help window") to the -;; macro `with-help-window'. The latter sets `help-window' to t before -;; invoking `with-output-to-temp-buffer'. If and only if `help-window' -;; is eq to t, `help-mode-finish' (called by `temp-buffer-setup-hook') -;; sets `help-window' to the window selected by `display-buffer'. -;; Exiting `with-help-window' and calling `help-print-return-message' -;; reset `help-window' to nil. -(defvar help-window nil - "Window chosen for displaying help.") - ;; `help-window-point-marker' is a marker you can move to a valid ;; position of the buffer shown in the help window in order to override ;; the standard positioning mechanism (`point-min') chosen by === modified file 'lisp/startup.el' --- lisp/startup.el 2011-08-20 19:30:53 +0000 +++ lisp/startup.el 2011-09-29 08:16:15 +0000 @@ -2318,7 +2318,10 @@ (get-buffer "*scratch*") (with-current-buffer "*scratch*" (when (zerop (buffer-size)) - (insert initial-scratch-message) + ;; Insert before markers to make sure that window-point + ;; appears at end of buffer when *scratch* is displayed + ;; (Bug#9605). + (insert-before-markers initial-scratch-message) (set-buffer-modified-p nil)))) (if (or inhibit-startup-screen ------------------------------------------------------------ revno: 105954 committer: Glenn Morris branch nick: trunk timestamp: Thu 2011-09-29 00:21:06 -0700 message: * lisp/pcmpl-cvs.el (pcomplete/cvs): Add "status" handler. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-09-29 00:12:44 +0000 +++ lisp/ChangeLog 2011-09-29 07:21:06 +0000 @@ -1,3 +1,7 @@ +2011-09-29 Glenn Morris + + * pcmpl-cvs.el (pcomplete/cvs): Add "status" handler. + 2011-09-29 Juanma Barranquero * descr-text.el (describe-char-categories): Accept category === modified file 'lisp/pcmpl-cvs.el' --- lisp/pcmpl-cvs.el 2011-09-27 18:09:43 +0000 +++ lisp/pcmpl-cvs.el 2011-09-29 07:21:06 +0000 @@ -107,6 +107,10 @@ "j(pcmpl-cvs-tags '(?U ?P))" "I(pcmpl-cvs-entries '(??))W?")) (while (pcomplete-here (pcmpl-cvs-entries '(?U ?P))))) + ((pcomplete-test "status") + (setq pcomplete-help "(cvs)File status") + (pcomplete-opt "vlR") + (while (pcomplete-here (pcmpl-cvs-entries)))) (t (while (pcomplete-here (pcmpl-cvs-entries))))))) ------------------------------------------------------------ revno: 105953 committer: Juanma Barranquero branch nick: trunk timestamp: Thu 2011-09-29 02:12:44 +0200 message: lisp/descr-text.el (describe-char-categories): Accept multiline descriptions. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-09-28 20:50:16 +0000 +++ lisp/ChangeLog 2011-09-29 00:12:44 +0000 @@ -1,3 +1,8 @@ +2011-09-29 Juanma Barranquero + + * descr-text.el (describe-char-categories): Accept category + descriptions more than one line long. + 2011-09-28 Stefan Monnier * simple.el (delete-trailing-whitespace): Fix last change. === modified file 'lisp/descr-text.el' --- lisp/descr-text.el 2011-04-19 13:44:55 +0000 +++ lisp/descr-text.el 2011-09-29 00:12:44 +0000 @@ -366,9 +366,10 @@ (list (mapconcat (lambda (x) (let* ((c (category-docstring x)) - (doc (if (string-match "\\`\\(.*?\\)\n\\(.*\\)\\'" c) + (doc (if (string-match "\\`\\(.*?\\)\n" c) (propertize (match-string 1 c) - 'help-echo (match-string 2 c)) + 'help-echo + (substring c (1+ (match-end 1)))) c))) (format "%c:%s" x doc))) mnemonics ", "))))) ------------------------------------------------------------ revno: 105952 committer: Stefan Monnier branch nick: trunk timestamp: Wed 2011-09-28 16:50:16 -0400 message: * simple.el (delete-trailing-whitespace): Fix last change. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-09-28 02:19:56 +0000 +++ lisp/ChangeLog 2011-09-28 20:50:16 +0000 @@ -1,5 +1,7 @@ 2011-09-28 Stefan Monnier + * simple.el (delete-trailing-whitespace): Fix last change. + * progmodes/perl-mode.el (perl-syntax-propertize-function): Don't confuse "y => 3" as the beginning of a `y' operation. === modified file 'lisp/simple.el' --- lisp/simple.el 2011-09-23 15:06:14 +0000 +++ lisp/simple.el 2011-09-28 20:50:16 +0000 @@ -589,9 +589,9 @@ ;; Delete trailing empty lines. (goto-char end-marker) (when (and (not end) - (<= (skip-chars-backward "\n") -2) ;; Really the end of buffer. - (save-restriction (widen) (eobp))) + (save-restriction (widen) (eobp)) + (<= (skip-chars-backward "\n") -2)) (delete-region (1+ (point)) end-marker)) (set-marker end-marker nil)))) ;; Return nil for the benefit of `write-file-functions'. ------------------------------------------------------------ revno: 105951 committer: Eli Zaretskii branch nick: trunk timestamp: Wed 2011-09-28 20:49:09 +0300 message: INSTALL: Mention that m17n libraries and libotf are needed for Arabic shaping. diff: === modified file 'ChangeLog' --- ChangeLog 2011-09-26 21:34:22 +0000 +++ ChangeLog 2011-09-28 17:49:09 +0000 @@ -1,3 +1,8 @@ +2011-09-28 Eli Zaretskii + + * INSTALL: Mention that m17n libraries and libotf are needed for + Arabic shaping. + 2011-09-26 Paul Eggert Merge from gnulib, improving some licensing wording. === modified file 'INSTALL' --- INSTALL 2011-06-07 04:16:37 +0000 +++ INSTALL 2011-09-28 17:49:09 +0000 @@ -111,15 +111,16 @@ * Complex Text Layout support libraries -Emacs needs the optional libraries "m17n-db", "libm17n-flt", "libotf" -to correctly display such complex scripts as Indic and Khmer. -On some systems, particularly GNU/Linux, these libraries may be -already present or available as additional packages. Note that if -there is a separate `dev' or `devel' package, for use at compilation -time rather than run time, you will need that as well as the -corresponding run time package; typically the dev package will contain -header files and a library archive. Otherwise, you can download and -build libraries from sources. +On GNU and Unix systems, Emacs needs the optional libraries "m17n-db", +"libm17n-flt", "libotf" to correctly display such complex scripts as +Indic and Khmer, and also for scripts that require Arabic shaping +support (Arabic and Farsi). On some systems, particularly GNU/Linux, +these libraries may be already present or available as additional +packages. Note that if there is a separate `dev' or `devel' package, +for use at compilation time rather than run time, you will need that +as well as the corresponding run time package; typically the dev +package will contain header files and a library archive. Otherwise, +you can download and build libraries from sources. The sources of these libraries are available by anonymous CVS from cvs.m17n.org. @@ -133,6 +134,9 @@ because you lack some other packages on which m17n-lib depends, try to configure it with the option "--without-gui". +Note that Emacs cannot support complex scripts on a TTY, unless the +terminal includes such a support. + * intlfonts-VERSION.tar.gz The intlfonts distribution contains X11 fonts in various encodings ------------------------------------------------------------ revno: 105950 fixes bug(s): http://debbugs.gnu.org/9624 committer: Eli Zaretskii branch nick: trunk timestamp: Wed 2011-09-28 17:37:27 +0300 message: Fix bug #9624 with crashes in Muse mode. src/xdisp.c (compute_display_string_end): If there's no display string at CHARPOS, return -1. src/bidi.c (bidi_fetch_char): When compute_display_string_end returns a negative value, treat the character as a normal character not covered by a display string. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-09-28 00:59:28 +0000 +++ src/ChangeLog 2011-09-28 14:37:27 +0000 @@ -1,3 +1,12 @@ +2011-09-28 Eli Zaretskii + + * xdisp.c (compute_display_string_end): If there's no display + string at CHARPOS, return -1. + + * bidi.c (bidi_fetch_char): When compute_display_string_end + returns a negative value, treat the character as a normal + character not covered by a display string. (Bug#9624) + 2011-09-28 Juanma Barranquero * lread.c (Fread_from_string): Fix typo in docstring. === modified file 'src/bidi.c' --- src/bidi.c 2011-09-24 10:31:37 +0000 +++ src/bidi.c 2011-09-28 14:37:27 +0000 @@ -974,6 +974,15 @@ ch = 0xFFFC; } disp_end_pos = compute_display_string_end (*disp_pos, string); + if (disp_end_pos < 0) + { + /* Somebody removed the display string from the buffer + behind our back. Recover by processing this buffer + position as if no display property were present there to + begin with. */ + *disp_prop = 0; + goto normal_char; + } *nchars = disp_end_pos - *disp_pos; if (*nchars <= 0) abort (); @@ -988,6 +997,7 @@ } else { + normal_char: if (string->s) { int len; === modified file 'src/xdisp.c' --- src/xdisp.c 2011-09-27 17:18:31 +0000 +++ src/xdisp.c 2011-09-28 14:37:27 +0000 @@ -3386,9 +3386,10 @@ } /* Return the character position of the end of the display string that - started at CHARPOS. A display string is either an overlay with - `display' property whose value is a string or a `display' text - property whose value is a string. */ + started at CHARPOS. If there's no display string at CHARPOS, + return -1. A display string is either an overlay with `display' + property whose value is a string or a `display' text property whose + value is a string. */ EMACS_INT compute_display_string_end (EMACS_INT charpos, struct bidi_string_data *string) { @@ -3402,8 +3403,22 @@ if (charpos >= eob || (string->s && !STRINGP (object))) return eob; + /* It could happen that the display property or overlay was removed + since we found it in compute_display_string_pos above. One way + this can happen is if JIT font-lock was called (through + handle_fontified_prop), and jit-lock-functions remove text + properties or overlays from the portion of buffer that includes + CHARPOS. Muse mode is known to do that, for example. In this + case, we return -1 to the caller, to signal that no display + string is actually present at CHARPOS. See bidi_fetch_char for + how this is handled. + + An alternative would be to never look for display properties past + it->stop_charpos. But neither compute_display_string_pos nor + bidi_fetch_char that calls it know or care where the next + stop_charpos is. */ if (NILP (Fget_char_property (pos, Qdisplay, object))) - abort (); + return -1; /* Look forward for the first character where the `display' property changes. */ ------------------------------------------------------------ revno: 105949 author: Lars Magne Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Wed 2011-09-28 09:03:55 +0000 message: gnus-uu.el (gnus-uu-grab-articles): Require gnus-async so that `gnus-asynchronous' isn't shadowed. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-09-27 06:01:27 +0000 +++ lisp/gnus/ChangeLog 2011-09-28 09:03:55 +0000 @@ -3,6 +3,11 @@ * plstore.el (plstore-select-keys, plstore-encrypt-to): Clarify documentation. +2011-09-27 Lars Magne Ingebrigtsen + + * gnus-uu.el (gnus-uu-grab-articles): Require gnus-async so that + `gnus-asynchronous' isn't shadowed. + 2011-09-26 Lars Magne Ingebrigtsen * nnimap.el (nnimap-wait-for-response): Message less (bug#9540). === modified file 'lisp/gnus/gnus-uu.el' --- lisp/gnus/gnus-uu.el 2011-03-06 00:08:33 +0000 +++ lisp/gnus/gnus-uu.el 2011-09-28 09:03:55 +0000 @@ -1290,6 +1290,7 @@ ;; the process-function has been successful and nil otherwise. (defun gnus-uu-grab-articles (articles process-function &optional sloppy limit no-errors) + (require 'gnus-async) (let ((state 'first) (gnus-asynchronous nil) (gnus-inhibit-treatment t) ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.