Now on revision 111541. ------------------------------------------------------------ revno: 111541 committer: Dmitry Antipov branch nick: trunk timestamp: Thu 2013-01-17 10:29:40 +0400 message: * lisp.h (toplevel): Add comment about using Lisp_Save_Value objects, related functions and macros. (make_save_value): Adjust prototype. (make_save_pointer): New prototype. (SAFE_NALLOCA): Fix indentation. Use make_save_pointer. (SAFE_ALLOCA_LISP): Adjust make_save_value usage. * alloc.c (format_save_value): Rename to make_save_value. (make_save_pointer): New function. (record_xmalloc): Use make_save_pointer. * dired.c, editfns.c, fileio.c, font.c, gtkutil.c, lread.c: * nsmenu.m, nsterm.m, xfns.c, xmenu.c, xselect.c, keymap.c: Change users of make_save_value to make_save_pointer. Likewise for format_save_value and make_save_value. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-01-17 05:52:13 +0000 +++ src/ChangeLog 2013-01-17 06:29:40 +0000 @@ -1,5 +1,21 @@ 2013-01-17 Dmitry Antipov + * lisp.h (toplevel): Add comment about using Lisp_Save_Value + objects, related functions and macros. + (make_save_value): Adjust prototype. + (make_save_pointer): New prototype. + (SAFE_NALLOCA): Fix indentation. Use make_save_pointer. + (SAFE_ALLOCA_LISP): Adjust make_save_value usage. + * alloc.c (format_save_value): Rename to make_save_value. + (make_save_pointer): New function. + (record_xmalloc): Use make_save_pointer. + * dired.c, editfns.c, fileio.c, font.c, gtkutil.c, lread.c: + * nsmenu.m, nsterm.m, xfns.c, xmenu.c, xselect.c, keymap.c: + Change users of make_save_value to make_save_pointer. + Likewise for format_save_value and make_save_value. + +2013-01-17 Dmitry Antipov + * buffer.h (NARROWED, BUF_NARROWED): Drop unused macros. (DECODE_POSITION, BUFFER_CHECK_INDIRECTION): Fix indentation. * buffer.c (toplevel, syms_of_buffer): Drop old commented-out === modified file 'src/alloc.c' --- src/alloc.c 2013-01-15 21:38:58 +0000 +++ src/alloc.c 2013-01-17 06:29:40 +0000 @@ -845,7 +845,7 @@ record_xmalloc (size_t size) { void *p = xmalloc (size); - record_unwind_protect (safe_alloca_unwind, make_save_value (p, 0)); + record_unwind_protect (safe_alloca_unwind, make_save_pointer (p)); return p; } @@ -3356,7 +3356,7 @@ and `o' for Lisp_Object. Up to 4 objects can be specified. */ Lisp_Object -format_save_value (const char *fmt, ...) +make_save_value (const char *fmt, ...) { va_list ap; int len = strlen (fmt); @@ -3404,15 +3404,19 @@ return val; } -/* Return a Lisp_Save_Value object containing POINTER and INTEGER. - Most code should use this to package C integers and pointers - to call record_unwind_protect. The unwind function can get the - C values back using XSAVE_POINTER and XSAVE_INTEGER. */ +/* The most common task it to save just one C pointer. */ Lisp_Object -make_save_value (void *pointer, ptrdiff_t integer) +make_save_pointer (void *pointer) { - return format_save_value ("pi", pointer, integer); + Lisp_Object val = allocate_misc (Lisp_Misc_Save_Value); + struct Lisp_Save_Value *p = XSAVE_VALUE (val); + + p->area = 0; + p->type0 = SAVE_POINTER; + p->data[0].pointer = pointer; + p->type1 = p->type2 = p->type3 = SAVE_UNUSED; + return val; } /* Free a Lisp_Save_Value object. Do not use this function === modified file 'src/dired.c' --- src/dired.c 2013-01-15 09:22:25 +0000 +++ src/dired.c 2013-01-17 06:29:40 +0000 @@ -152,7 +152,7 @@ file-attributes on filenames, both of which can throw, so we must do a proper unwind-protect. */ record_unwind_protect (directory_files_internal_unwind, - make_save_value (d, 0)); + make_save_pointer (d)); #ifdef WINDOWSNT if (attrs) @@ -465,7 +465,7 @@ report_file_error ("Opening directory", Fcons (dirname, Qnil)); record_unwind_protect (directory_files_internal_unwind, - make_save_value (d, 0)); + make_save_pointer (d)); /* Loop reading blocks */ /* (att3b compiler bug requires do a null comparison this way) */ === modified file 'src/editfns.c' --- src/editfns.c 2013-01-15 09:22:25 +0000 +++ src/editfns.c 2013-01-17 06:29:40 +0000 @@ -833,7 +833,7 @@ Lisp_Object save_excursion_save (void) { - return format_save_value + return make_save_value ("oooo", Fpoint_marker (), /* Do not copy the mark if it points to nowhere. */ @@ -4249,7 +4249,7 @@ { buf = xmalloc (bufsize); sa_must_free = 1; - buf_save_value = make_save_value (buf, 0); + buf_save_value = make_save_pointer (buf); record_unwind_protect (safe_alloca_unwind, buf_save_value); memcpy (buf, initial_buffer, used); } === modified file 'src/fileio.c' --- src/fileio.c 2013-01-15 10:14:31 +0000 +++ src/fileio.c 2013-01-17 06:29:40 +0000 @@ -4249,7 +4249,7 @@ to be signaled after decoding the text we read. */ nbytes = internal_condition_case_1 (read_non_regular, - format_save_value ("iii", (ptrdiff_t) fd, inserted, trytry), + make_save_value ("iii", (ptrdiff_t) fd, inserted, trytry), Qerror, read_non_regular_quit); if (NILP (nbytes)) @@ -5608,7 +5608,7 @@ } record_unwind_protect (do_auto_save_unwind, - make_save_value (stream, 0)); + make_save_pointer (stream)); record_unwind_protect (do_auto_save_unwind_1, make_number (minibuffer_auto_raise)); minibuffer_auto_raise = 0; === modified file 'src/font.c' --- src/font.c 2013-01-15 09:22:25 +0000 +++ src/font.c 2013-01-17 06:29:40 +0000 @@ -1861,7 +1861,7 @@ else { otf = STRINGP (file) ? OTF_open (SSDATA (file)) : NULL; - val = make_save_value (otf, 0); + val = make_save_pointer (otf); otf_list = Fcons (Fcons (file, val), otf_list); } return otf; === modified file 'src/ftfont.c' --- src/ftfont.c 2013-01-15 09:22:25 +0000 +++ src/ftfont.c 2013-01-17 06:29:40 +0000 @@ -393,7 +393,7 @@ cache_data = xmalloc (sizeof *cache_data); cache_data->ft_face = NULL; cache_data->fc_charset = NULL; - val = make_save_value (cache_data, 0); + val = make_save_value ("pi", cache_data, 0); cache = Fcons (Qnil, val); Fputhash (key, cache, ft_face_cache); } === modified file 'src/gtkutil.c' --- src/gtkutil.c 2013-01-15 09:22:25 +0000 +++ src/gtkutil.c 2013-01-17 06:29:40 +0000 @@ -1716,7 +1716,7 @@ g_signal_connect (G_OBJECT (w), "delete-event", G_CALLBACK (gtk_true), NULL); gtk_widget_show (w); - record_unwind_protect (pop_down_dialog, make_save_value (&dd, 0)); + record_unwind_protect (pop_down_dialog, make_save_pointer (&dd)); (void) xg_maybe_add_timer (&dd); g_main_loop_run (dd.loop); === modified file 'src/keymap.c' --- src/keymap.c 2013-01-15 10:14:31 +0000 +++ src/keymap.c 2013-01-17 06:29:40 +0000 @@ -610,7 +610,7 @@ } else if (CHAR_TABLE_P (binding)) map_char_table (map_keymap_char_table_item, Qnil, binding, - format_save_value ("ppo", fun, data, args)); + make_save_value ("ppo", fun, data, args)); } UNGCPRO; return tail; === modified file 'src/lisp.h' --- src/lisp.h 2013-01-15 21:38:58 +0000 +++ src/lisp.h 2013-01-17 06:29:40 +0000 @@ -1388,7 +1388,50 @@ SAVE_OBJECT }; -/* Special object used to hold a different values for later use. */ +/* Special object used to hold a different values for later use. + + This is mostly used to package C integers and pointers to call + record_unwind_protect. Typical task is to pass just one C pointer + to unwind function. You should pack pointer with make_save_pointer + and then get it back with XSAVE_POINTER, e.g.: + + ... + struct my_data *md = get_my_data (); + record_unwind_protect (my_unwind, make_save_pointer (md)); + ... + + Lisp_Object my_unwind (Lisp_Object arg) + { + struct my_data *md = XSAVE_POINTER (arg, 0); + ... + } + + If yon need to pass more than just one C pointer, you should + use make_save_value. This function allows you to pack up to + 4 integers, pointers or Lisp_Objects and conveniently get them + back with XSAVE_POINTER, XSAVE_INTEGER and XSAVE_OBJECT macros: + + ... + struct my_data *md = get_my_data (); + ptrdiff_t my_offset = get_my_offset (); + Lisp_Object my_object = get_my_object (); + record_unwind_protect + (my_unwind, make_save_value ("pio", md, my_offset, my_object)); + ... + + Lisp_Object my_unwind (Lisp_Object arg) + { + struct my_data *md = XSAVE_POINTER (arg, 0); + ptrdiff_t my_offset = XSAVE_INTEGER (arg, 1); + Lisp_Object my_object = XSAVE_OBJECT (arg, 2); + ... + } + + If ENABLE_CHECKING is in effect, XSAVE_xxx macros do type checking of the + saved objects and raise eassert if type of the saved object doesn't match + the type which is extracted. In the example above, XSAVE_INTEGER (arg, 2) + or XSAVE_OBJECT (arg, 1) are wrong because integer was saved in slot 1 and + Lisp_Object was saved in slot 2 of ARG. */ struct Lisp_Save_Value { @@ -3018,8 +3061,8 @@ extern Lisp_Object make_float (double); extern void display_malloc_warning (void); extern ptrdiff_t inhibit_garbage_collection (void); -extern Lisp_Object format_save_value (const char *, ...); -extern Lisp_Object make_save_value (void *, ptrdiff_t); +extern Lisp_Object make_save_value (const char *, ...); +extern Lisp_Object make_save_pointer (void *); extern Lisp_Object build_overlay (Lisp_Object, Lisp_Object, Lisp_Object); extern void free_marker (Lisp_Object); extern void free_cons (struct Lisp_Cons *); @@ -3701,16 +3744,16 @@ NITEMS items, each of the same type as *BUF. MULTIPLIER must positive. The code is tuned for MULTIPLIER being a constant. */ -#define SAFE_NALLOCA(buf, multiplier, nitems) \ - do { \ - if ((nitems) <= MAX_ALLOCA / sizeof *(buf) / (multiplier)) \ - (buf) = alloca (sizeof *(buf) * (multiplier) * (nitems)); \ - else \ +#define SAFE_NALLOCA(buf, multiplier, nitems) \ + do { \ + if ((nitems) <= MAX_ALLOCA / sizeof *(buf) / (multiplier)) \ + (buf) = alloca (sizeof *(buf) * (multiplier) * (nitems)); \ + else \ { \ (buf) = xnmalloc (nitems, sizeof *(buf) * (multiplier)); \ sa_must_free = 1; \ record_unwind_protect (safe_alloca_unwind, \ - make_save_value (buf, 0)); \ + make_save_pointer (buf)); \ } \ } while (0) @@ -3735,7 +3778,7 @@ { \ Lisp_Object arg_; \ buf = xmalloc ((nelt) * word_size); \ - arg_ = make_save_value (buf, nelt); \ + arg_ = make_save_value ("pi", buf, nelt); \ XSAVE_VALUE (arg_)->area = 1; \ sa_must_free = 1; \ record_unwind_protect (safe_alloca_unwind, arg_); \ === modified file 'src/lread.c' --- src/lread.c 2013-01-15 09:22:25 +0000 +++ src/lread.c 2013-01-17 06:29:40 +0000 @@ -1298,7 +1298,7 @@ message_with_string ("Loading %s...", file, 1); } - record_unwind_protect (load_unwind, make_save_value (stream, 0)); + record_unwind_protect (load_unwind, make_save_pointer (stream)); record_unwind_protect (load_descriptor_unwind, load_descriptor_list); specbind (Qload_file_name, found); specbind (Qinhibit_file_name_operation, Qnil); === modified file 'src/nsmenu.m' --- src/nsmenu.m 2013-01-15 09:22:25 +0000 +++ src/nsmenu.m 2013-01-17 06:29:40 +0000 @@ -1440,7 +1440,7 @@ unwind_data->pool = pool; unwind_data->dialog = dialog; - record_unwind_protect (pop_down_menu, make_save_value (unwind_data, 0)); + record_unwind_protect (pop_down_menu, make_save_pointer (unwind_data)); popup_activated_flag = 1; tem = [dialog runDialogAt: p]; unbind_to (specpdl_count, Qnil); /* calls pop_down_menu */ === modified file 'src/nsterm.m' --- src/nsterm.m 2013-01-13 12:08:31 +0000 +++ src/nsterm.m 2013-01-17 06:29:40 +0000 @@ -3677,7 +3677,7 @@ } bar = [[EmacsScroller alloc] initFrame: r window: win]; - wset_vertical_scroll_bar (window, make_save_value (bar, 0)); + wset_vertical_scroll_bar (window, make_save_pointer (bar)); } else { === modified file 'src/xfns.c' --- src/xfns.c 2013-01-15 09:22:25 +0000 +++ src/xfns.c 2013-01-17 06:29:40 +0000 @@ -5416,7 +5416,7 @@ XmStringFree (default_xmstring); } - record_unwind_protect (clean_up_file_dialog, make_save_value (dialog, 0)); + record_unwind_protect (clean_up_file_dialog, make_save_pointer (dialog)); /* Process events until the user presses Cancel or OK. */ x_menu_set_in_use (1); === modified file 'src/xmenu.c' --- src/xmenu.c 2013-01-15 10:14:31 +0000 +++ src/xmenu.c 2013-01-17 06:29:40 +0000 @@ -1477,7 +1477,7 @@ gtk_menu_popup (GTK_MENU (menu), 0, 0, pos_func, &popup_x_y, i, timestamp ? timestamp : gtk_get_current_event_time ()); - record_unwind_protect (pop_down_menu, make_save_value (menu, 0)); + record_unwind_protect (pop_down_menu, make_save_pointer (menu)); if (gtk_widget_get_mapped (menu)) { @@ -1826,7 +1826,7 @@ /* Make sure to free the widget_value objects we used to specify the contents even with longjmp. */ record_unwind_protect (cleanup_widget_value_tree, - make_save_value (first_wv, 0)); + make_save_pointer (first_wv)); /* Actually create and show the menu until popped down. */ create_and_show_popup_menu (f, first_wv, x, y, for_click, timestamp); @@ -1925,7 +1925,7 @@ if (menu) { ptrdiff_t specpdl_count = SPECPDL_INDEX (); - record_unwind_protect (pop_down_menu, make_save_value (menu, 0)); + record_unwind_protect (pop_down_menu, make_save_pointer (menu)); /* Display the menu. */ gtk_widget_show_all (menu); @@ -2136,7 +2136,7 @@ /* Make sure to free the widget_value objects we used to specify the contents even with longjmp. */ record_unwind_protect (cleanup_widget_value_tree, - make_save_value (first_wv, 0)); + make_save_pointer (first_wv)); /* Actually create and show the dialog. */ create_and_show_dialog (f, first_wv); @@ -2479,7 +2479,7 @@ #endif record_unwind_protect (pop_down_menu, - format_save_value ("pp", f, menu)); + make_save_value ("pp", f, menu)); /* Help display under X won't work because XMenuActivate contains a loop that doesn't give Emacs a chance to process it. */ === modified file 'src/xselect.c' --- src/xselect.c 2013-01-15 09:22:25 +0000 +++ src/xselect.c 2013-01-17 06:29:40 +0000 @@ -1141,7 +1141,7 @@ /* Make sure to do unexpect_property_change if we quit or err. */ record_unwind_protect (wait_for_property_change_unwind, - make_save_value (location, 0)); + make_save_pointer (location)); XSETCAR (property_change_reply, Qnil); property_change_reply_object = location; ------------------------------------------------------------ revno: 111540 committer: Dmitry Antipov branch nick: trunk timestamp: Thu 2013-01-17 09:52:13 +0400 message: * buffer.h (NARROWED, BUF_NARROWED): Drop unused macros. (DECODE_POSITION, BUFFER_CHECK_INDIRECTION): Fix indentation. * buffer.c (toplevel, syms_of_buffer): Drop old commented-out debugging stubs. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-01-15 21:38:58 +0000 +++ src/ChangeLog 2013-01-17 05:52:13 +0000 @@ -1,3 +1,10 @@ +2013-01-17 Dmitry Antipov + + * buffer.h (NARROWED, BUF_NARROWED): Drop unused macros. + (DECODE_POSITION, BUFFER_CHECK_INDIRECTION): Fix indentation. + * buffer.c (toplevel, syms_of_buffer): Drop old commented-out + debugging stubs. + 2013-01-15 Paul Eggert * alloc.c (free_save_value): Now static. === modified file 'src/buffer.c' --- src/buffer.c 2013-01-10 10:30:16 +0000 +++ src/buffer.c 2013-01-17 05:52:13 +0000 @@ -372,9 +372,6 @@ b->INTERNAL_FIELD (zv_marker) = val; } -/* For debugging; temporary. See set_buffer_internal. */ -/* Lisp_Object Qlisp_mode, Vcheck_symbol; */ - void nsberror (Lisp_Object spec) { @@ -6003,10 +6000,6 @@ window scrolls by a full window height. Meaningful values are between 0.0 and 1.0, inclusive. */); -/*DEFVAR_LISP ("debug-check-symbol", &Vcheck_symbol, - "Don't ask."); -*/ - DEFVAR_LISP ("before-change-functions", Vbefore_change_functions, doc: /* List of functions to call before each text change. Two arguments are passed to each function: the positions of === modified file 'src/buffer.h' --- src/buffer.h 2013-01-10 10:30:16 +0000 +++ src/buffer.h 2013-01-17 05:52:13 +0000 @@ -82,9 +82,6 @@ /* Size of gap. */ #define GAP_SIZE (current_buffer->text->gap_size) -/* Is the current buffer narrowed? */ -#define NARROWED ((BEGV != BEG) || (ZV != Z)) - /* Modification count. */ #define MODIFF (current_buffer->text->modiff) @@ -173,10 +170,6 @@ /* Size of gap. */ #define BUF_GAP_SIZE(buf) ((buf)->text->gap_size) -/* Is this buffer narrowed? */ -#define BUF_NARROWED(buf) ((BUF_BEGV (buf) != BUF_BEG (buf)) \ - || (BUF_ZV (buf) != BUF_Z (buf))) - /* Modification count. */ #define BUF_MODIFF(buf) ((buf)->text->modiff) @@ -294,24 +287,24 @@ /* Access a Lisp position value in POS, and store the charpos in CHARPOS and the bytepos in BYTEPOS. */ -#define DECODE_POSITION(charpos, bytepos, pos) \ -do \ - { \ - Lisp_Object __pos = (pos); \ - if (NUMBERP (__pos)) \ - { \ - charpos = __pos; \ - bytepos = buf_charpos_to_bytepos (current_buffer, __pos); \ - } \ - else if (MARKERP (__pos)) \ - { \ - charpos = marker_position (__pos); \ - bytepos = marker_byte_position (__pos); \ - } \ - else \ - wrong_type_argument (Qinteger_or_marker_p, __pos); \ - } \ -while (0) +#define DECODE_POSITION(charpos, bytepos, pos) \ + do \ + { \ + Lisp_Object __pos = (pos); \ + if (NUMBERP (__pos)) \ + { \ + charpos = __pos; \ + bytepos = buf_charpos_to_bytepos (current_buffer, __pos); \ + } \ + else if (MARKERP (__pos)) \ + { \ + charpos = marker_position (__pos); \ + bytepos = marker_byte_position (__pos); \ + } \ + else \ + wrong_type_argument (Qinteger_or_marker_p, __pos); \ + } \ + while (0) /* Maximum number of bytes in a buffer. A buffer cannot contain more bytes than a 1-origin fixnum can represent, @@ -1009,15 +1002,15 @@ #define BUFFER_CHECK_INDIRECTION(b) \ do { \ if (BUFFER_LIVE_P (b)) \ - { \ - if (b->base_buffer) \ - { \ - eassert (b->indirections == -1); \ - eassert (b->base_buffer->indirections > 0); \ - } \ - else \ - eassert (b->indirections >= 0); \ - } \ + { \ + if (b->base_buffer) \ + { \ + eassert (b->indirections == -1); \ + eassert (b->base_buffer->indirections > 0); \ + } \ + else \ + eassert (b->indirections >= 0); \ + } \ } while (0) /* Chain of all buffers, including killed ones. */ ------------------------------------------------------------ revno: 111539 committer: Stefan Monnier branch nick: trunk timestamp: Wed 2013-01-16 14:06:15 -0500 message: * lisp/emacs-lisp/trace.el (trace--read-args): Use a closure and an honest call to `eval' rather than a backquoted lambda. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-01-15 06:05:22 +0000 +++ lisp/ChangeLog 2013-01-16 19:06:15 +0000 @@ -1,3 +1,8 @@ +2013-01-16 Stefan Monnier + + * emacs-lisp/trace.el (trace--read-args): Use a closure and an honest + call to `eval' rather than a backquoted lambda. + 2013-01-15 Stefan Monnier * emacs-lisp/nadvice.el (advice--tweak): Make it possible for `tweak' === modified file 'lisp/emacs-lisp/trace.el' --- lisp/emacs-lisp/trace.el 2013-01-11 23:03:04 +0000 +++ lisp/emacs-lisp/trace.el 2013-01-16 19:06:15 +0000 @@ -256,9 +256,9 @@ (read-from-minibuffer "Context expression: " nil read-expression-map t 'read-expression-history)))) - `(lambda () - (let ((print-circle t)) - (concat " [" (prin1-to-string ,exp) "]")))))))) + (lambda () + (let ((print-circle t)) + (concat " [" (prin1-to-string (eval exp t)) "]")))))))) ;;;###autoload (defun trace-function-foreground (function &optional buffer context) ------------------------------------------------------------ revno: 111538 committer: Paul Eggert branch nick: trunk timestamp: Wed 2013-01-16 09:45:39 -0800 message: Merge from gnulib. diff: === modified file 'ChangeLog' --- ChangeLog 2013-01-16 06:04:58 +0000 +++ ChangeLog 2013-01-16 17:45:39 +0000 @@ -1,5 +1,11 @@ 2013-01-16 Paul Eggert + Merge from gnulib, incorporating: + 2013-01-16 largefile: port better to Mac OS X 10.5 + 2013-01-15 stdint: fix build with Android's Bionic fox x86 + +2013-01-16 Paul Eggert + * configure.ac: Document that --enable-gcc-warnings emits errors. (Bug#13448) === modified file 'lib/stdint.in.h' --- lib/stdint.in.h 2013-01-01 09:11:05 +0000 +++ lib/stdint.in.h 2013-01-16 17:45:39 +0000 @@ -39,7 +39,7 @@ Ideally we should test __BIONIC__ here, but it is only defined after has been included; hence test __ANDROID__ instead. */ #if defined __ANDROID__ \ - && defined _SYS_TYPES_H_ && !defined _SSIZE_T_DEFINED_ + && defined _SYS_TYPES_H_ && !defined __need_size_t # @INCLUDE_NEXT@ @NEXT_STDINT_H@ #else === modified file 'm4/largefile.m4' --- m4/largefile.m4 2013-01-01 09:11:05 +0000 +++ m4/largefile.m4 2013-01-16 17:45:39 +0000 @@ -5,9 +5,10 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# The following implementation works around a problem in autoconf <= 2.68; -# AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5. -m4_version_prereq([2.69], [] ,[ +# The following implementation works around a problem in autoconf <= 2.69; +# AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5, +# or configures them incorrectly in some cases. +m4_version_prereq([2.70], [] ,[ # _AC_SYS_LARGEFILE_TEST_INCLUDES # ------------------------------- @@ -25,9 +26,9 @@ # _AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, -# CACHE-VAR, -# DESCRIPTION, -# PROLOGUE, [FUNCTION-BODY]) +# CACHE-VAR, +# DESCRIPTION, +# PROLOGUE, [FUNCTION-BODY]) # -------------------------------------------------------- m4_define([_AC_SYS_LARGEFILE_MACRO_VALUE], [AC_CACHE_CHECK([for $1 value needed for large files], [$3], @@ -93,15 +94,11 @@ [_AC_SYS_LARGEFILE_TEST_INCLUDES]) fi - AH_VERBATIM([_DARWIN_USE_64_BIT_INODE], -[/* Enable large inode numbers on Mac OS X. */ -#ifndef _DARWIN_USE_64_BIT_INODE -# define _DARWIN_USE_64_BIT_INODE 1 -#endif]) + AC_DEFINE([_DARWIN_USE_64_BIT_INODE], [1], + [Enable large inode numbers on Mac OS X 10.5.]) fi ])# AC_SYS_LARGEFILE - -])# m4_version_prereq 2.69 +])# m4_version_prereq 2.70 # Enable large files on systems where this is implemented by Gnulib, not by the # system headers. ------------------------------------------------------------ revno: 111537 committer: Glenn Morris branch nick: trunk timestamp: Wed 2013-01-16 06:17:35 -0500 message: Auto-commit of generated files. diff: === modified file 'autogen/configure' --- autogen/configure 2013-01-13 20:03:01 +0000 +++ autogen/configure 2013-01-16 11:17:35 +0000 @@ -2076,9 +2076,10 @@ --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors --disable-largefile omit support for large files - --enable-gcc-warnings turn on lots of GCC warnings. This is intended for - developers, and may generate false alarms when used - with older or non-GNU development tools. + --enable-gcc-warnings turn on lots of GCC warnings/errors. This is + intended for developers, and may generate false + alarms when used with older or non-GNU development + tools. --enable-link-time-optimization build emacs with link-time optimization. This is supported only for GCC since 4.5.0. ------------------------------------------------------------ revno: 111536 fixes bug: http://debbugs.gnu.org/13448 committer: Paul Eggert branch nick: trunk timestamp: Tue 2013-01-15 22:04:58 -0800 message: * configure.ac: Document that --enable-gcc-warnings emits errors. diff: === modified file 'ChangeLog' --- ChangeLog 2013-01-13 20:03:01 +0000 +++ ChangeLog 2013-01-16 06:04:58 +0000 @@ -1,3 +1,8 @@ +2013-01-16 Paul Eggert + + * configure.ac: Document that --enable-gcc-warnings emits errors. + (Bug#13448) + 2013-01-13 Glenn Morris * make-dist: Add options for xz compression and no compression. === modified file 'configure.ac' --- configure.ac 2013-01-12 05:21:06 +0000 +++ configure.ac 2013-01-16 06:04:58 +0000 @@ -627,7 +627,7 @@ AC_ARG_ENABLE([gcc-warnings], [AS_HELP_STRING([--enable-gcc-warnings], - [turn on lots of GCC warnings. This is intended for + [turn on lots of GCC warnings/errors. This is intended for developers, and may generate false alarms when used with older or non-GNU development tools.])], [case $enableval in