From: Glenn Morris Date: Sat, 3 Nov 2012 19:14:22 +0000 (-0700) Subject: Merge from emacs-24; up to 2012-11-03T05:11:34Z!dmantipov@yandex.ru X-Git-Tag: emacs-24.3.90~173^2~9^2~172 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f58542e1510319921d1745e0ad647ed42b1157f2;p=emacs.git Merge from emacs-24; up to 2012-11-03T05:11:34Z!dmantipov@yandex.ru --- f58542e1510319921d1745e0ad647ed42b1157f2 diff --cc ChangeLog index e67369492da,a139c0dfb6d..4d632fc8c33 --- a/ChangeLog +++ b/ChangeLog @@@ -1,16 -1,7 +1,20 @@@ + 2012-11-03 Eli Zaretskii + + * config.bat: Copy lib/execinfo.in.h to lib/execinfo.in-h if needed. + +2012-11-03 Paul Eggert + + Fix data-loss with --batch (Bug#9574). + * lib/close-stream.c, lib/close-stream.h, lib/fpending.c + * lib/fpending.h, m4/close-stream.m4, m4/fpending.m4: + New files, from gnulib. + * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate. + +2012-11-02 Glenn Morris + + * Makefile.in (EMACS_ICON): New variable. + (install-etc): Use EMACS_ICON to allow choice of icon. + 2012-10-26 Glenn Morris * Makefile.in (EMACS_NAME): New variable. diff --cc doc/misc/ChangeLog index 768a846bd1a,62308037fec..0a32fd82044 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@@ -1,7 -1,16 +1,18 @@@ + 2012-11-03 Glenn Morris + + * cl.texi: Further general copyedits. + (List Functions): Remove copy-tree, standard elisp for some time. + (Efficiency Concerns): Comment out examples that no longer apply. + (Compiler Optimizations): Rename from "Optimizing Compiler"; reword. + (Creating Symbols, Random Numbers): De-emphasize internal + variables cl--gensym-counter and cl--random-state. (Bug#12788) ++ (Naming Conventions, Type Predicates, Macros) ++ (Predicates on Numbers): No longer mention cl-floatp-safe. + -2012-11-02 Glenn Morris +2012-11-02 Katsumi Yamaoka - * cl.texi (Naming Conventions, Type Predicates, Macros) - (Predicates on Numbers): No longer mention cl-floatp-safe. + * gnus.texi (Mail Source Specifiers): + Document :leave keyword used for pop mail source. 2012-11-01 Glenn Morris diff --cc lisp/ChangeLog index 4d2f7e766cf,5be111818dd..c9a389be38b --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,25 -1,26 +1,48 @@@ + 2012-11-03 Glenn Morris + + * emacs-lisp/cl-macs.el (cl-parse-loop-clause): + Rename handler properties back from cl-- to cl-. (Bug#12788) + + * emacs-lisp/cl-macs.el (cl-do-all-symbols): Add doc string. + + 2012-11-03 Eli Zaretskii + + * term/pc-win.el: Don't load term/internal from here. + + * loadup.el: Load term/internal from here. + + 2012-11-03 Fabián Ezequiel Gallina + + * progmodes/python.el (inferior-python-mode): Fix hang in + jit-lock (Bug#12645). + + 2012-11-03 Martin Rudalics + + * window.el (switch-to-visible-buffer) + (switch-to-buffer-preserve-window-point): Fix doc-strings. + +2012-11-03 Glenn Morris + + * emacs-lisp/cl-lib.el (cl--random-time): + Rename from cl-random-time. (Bug#12773) + (cl--gensym-counter, cl--random-state): Update callers. + * emacs-lisp/cl-extra.el (cl-make-random-state): Update callers. + +2012-11-03 Chong Yidong + + * cus-start.el: Make cursor-type customizable (Bug#11633). + +2012-11-02 Glenn Morris + + * filecache.el: No need to load find-lisp when compiling. + (find-lisp-find-files): Autoload it. + (file-cache-add-directory-recursively): Don't require find-lisp. + + * image.el (image-type-from-file-name): Trivial simplification. + + * emacs-lisp/bytecomp.el (byte-compile-eval): + Decouple "noruntime" and "cl-functions" warnings. + 2012-11-01 Stephen Berman * play/gomoku.el (gomoku-display-statistics): Update mode line diff --cc msdos/sed2v2.inp index 916c49dd1b5,ef0b7e5b427..ba9eb4fb596 --- a/msdos/sed2v2.inp +++ b/msdos/sed2v2.inp @@@ -70,7 -69,8 +69,8 @@@ /^#undef PACKAGE_STRING/s/^.*$/#define PACKAGE_STRING ""/ /^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/ /^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION ""/ + /^#undef PENDING_OUTPUT_COUNT/s/^.*$/#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_ptr - (FILE)->_base)/ -/^#undef VERSION/s/^.*$/#define VERSION "24.2.50"/ +/^#undef VERSION/s/^.*$/#define VERSION "24.3.50"/ /^#undef SYSTEM_TYPE/s/^.*$/#define SYSTEM_TYPE "ms-dos"/ /^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/ /^#undef SYS_SIGLIST_DECLARED/s/^.*$/#define SYS_SIGLIST_DECLARED 1/ diff --cc src/ChangeLog index be10016fc33,3ae755f3d20..16b694e6e24 --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,80 -1,22 +1,98 @@@ + 2012-11-03 Eli Zaretskii + + * lisp.mk: Adjust comments to the fact that term/internal is now + loaded from loadup.el. + + * msdos.c (msdos_abort): Rename from emacs_abort, and make static. + (msdos_fatal_signal): New function. + (XMenuActivate): Adjust the call to kbd_buffer_events_waiting to + its argument list. + + * conf_post.h (_GL_EXECINFO_INLINE) [MSDOS]: Define to "inline" + for GCC versions before 4. + (emacs_raise): Define to call msdos_fatal_signal. + + * xdisp.c (init_from_display_pos): Fix initialization of the bidi + iterator when starting in the middle of a display or overlay + string. (Bug#12745) + -2012-11-03 Jan Djärv +2012-11-03 Paul Eggert + + Fix data-loss with --batch (Bug#9574). + * emacs.c: Include . + (close_output_streams): New function. + (main): Pass it to atexit, so that Emacs closes stdout and stderr + and handles errors appropriately. + (Fkill_emacs): Don't worry about flushing, as close_output_stream + does that now. + + Fix a race condition that causes Emacs to mess up glib (Bug#8855). + The symptom is a diagnostic "GLib-WARNING **: In call to + g_spawn_sync(), exit status of a child process was requested but + SIGCHLD action was set to SIG_IGN and ECHILD was received by + waitpid(), so exit status can't be returned." The diagnostic + is partly wrong, as the SIGCHLD action is not set to SIG_IGN. + The real bug is a race condition between Emacs and glib: Emacs + does a waitpid (-1, ...) and reaps glib's subprocess by mistake, + so that glib can't find it. Work around the bug by invoking + waitpid only on subprocesses that Emacs itself creates. + * process.c (create_process, record_child_status_change): + Don't use special value -1 in pid field, as the caller now must + know the pid rather than having the callee infer it. The + inference was sometimes incorrect anyway, due to another race. + (create_process): Set new 'alive' member if child is created. + (process_status_retrieved): New function. + (record_child_status_change): Use it. + Accept negative 1st argument, which means to wait for the + processes that Emacs already knows about. Move special-case code + for DOS_NT (which lacks WNOHANG) here, from caller. Keep track of + processes that have already been waited for, by testing and + clearing new 'alive' member. + (CAN_HANDLE_MULTIPLE_CHILDREN): Remove, as record_child_status_change + now does this internally. + (handle_child_signal): Let record_child_status_change do all + the work, since we do not want to reap all exited child processes, + only the child processes that Emacs itself created. + * process.h (Lisp_Process): New boolean member 'alive'. + + Omit duplicate definitions no longer needed with gcc -g3. + * lisp.h (GCTYPEBITS, GCALIGNMENT, ARRAY_MARK_FLAG, PSEUDOVECTOR_FLAG) + (VALMASK, MOST_POSITIVE_FIXNUM, MOST_NEGATIVE_FIXNUM): + Define only as macros. There's no longer any need to also define + these symbols as enums or as constants, since we now assume + gcc -g3 when debugging. + +2012-11-03 Chong Yidong + + * process.c (wait_reading_process_output): Clean up the last + change. + +2012-11-03 Jim Paris (tiny change) + + * process.c (wait_reading_process_output): Avoid a race condition + with SIGIO delivery (Bug#11536). + +2012-11-03 Chong Yidong + + * buffer.c (cursor_type): Untabify docstring. + +2012-11-03 Dmitry Antipov + + * frame.h (struct frame): Drop can_have_scroll_bars member + which is meaningless for a long time. Adjust comments. + (FRAME_CAN_HAVE_SCROLL_BARS): Remove. + * frame.c, nsfns.m, term.c, w32fns.c, xfns.c: Adjust users. + +2012-11-03 Dmitry Antipov + + * window.c (decode_next_window_args): Update window arg after + calling decode_live_window and so fix crash reported at + http://lists.gnu.org/archive/html/emacs-devel/2012-11/msg00035.html + by Juanma Barranquero . + (Fwindow_body_width, Fwindow_body_height): Simplify a bit. + * font.c (Ffont_at): Likewise. + +2012-11-01 Jan Djärv * widget.c (resize_cb): New function. (EmacsFrameRealize): Add resize_cb as event handler (Bug#12733).