From: Glenn Morris Date: Thu, 6 Dec 2012 06:17:10 +0000 (-0800) Subject: Merge from emacs-24; up to 2012-11-24T16:58:43Z!cyd@gnu.org X-Git-Tag: emacs-24.3.90~173^2~9^2~41 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d8ad4d3ff9dcea9c581d72e1e9ec292ea18673b1;p=emacs.git Merge from emacs-24; up to 2012-11-24T16:58:43Z!cyd@gnu.org --- d8ad4d3ff9dcea9c581d72e1e9ec292ea18673b1 diff --cc ChangeLog index b27377baa4a,965c7882a86..4a1e95a6ee2 --- a/ChangeLog +++ b/ChangeLog @@@ -1,26 -1,8 +1,30 @@@ -2012-12-05 Glenn Morris ++2012-12-06 Glenn Morris + + * configure.ac: Handle info/ files with or without ".info" extension. + -2012-11-24 Eli Zaretskii +2012-11-30 Paul Eggert + + Merge from gnulib for 'inline' (Bug#13040), incorporating: + 2012-11-29 snippet/warn-on-use: no 'static inline' + 2012-11-29 ftruncate, fts, lstat, openat, raise: no 'static inline' + 2012-11-29 arctwo, md4, md5, sha1, sha256, sha512: no 'static inline' + 2012-11-29 fflush, stat: no 'static inline' + 2012-11-29 stdio: better 'inline' + 2012-11-29 sys_stat: no 'static inline' + 2012-11-29 unistd: better 'inline' + 2012-11-29 c-strtod, memcoll, readutmp: no 'static inline' + 2012-11-29 extern-inline: no 'static inline' + 2012-11-29 sys_socket: better 'inline' + * lib/stdio.c, lib/unistd.c: New files, from gnulib. + * build-aux/snippet/warn-on-use.h, lib/gnulib.mk, lib/lstat.c: + * lib/md5.c, lib/sha1.c, lib/sha256.c, lib/sha512.c, lib/stat.c: + * lib/stdio.in.h, lib/sys_stat.in.h, lib/unistd.in.h, m4/c-strtod.m4: + * m4/extern-inline.m4, m4/gnulib-comp.m4, m4/lstat.m4, m4/md5.m4: + * m4/sha1.m4, m4/sha256.m4, m4/sha512.m4, m4/stat.m4, m4/stdio_h.m4: + * m4/sys_socket_h.m4, m4/sys_stat_h.m4, m4/unistd_h.m4: + Update from gnulib. + +2012-11-27 Eli Zaretskii * make-dist (nt): Adjust to changes in names of the *.manifest files. diff --cc doc/emacs/ChangeLog index ce56d3af1b0,7599c1e823e..dd45dac5747 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@@ -1,4 -1,9 +1,9 @@@ -2012-12-03 Juanma Barranquero ++2012-12-06 Juanma Barranquero + + * vc1-xtra.texi (General VC Options): Remove obsolete reference + to `vc-path'. + -2012-12-02 Chong Yidong +2012-12-03 Chong Yidong * custom.texi (Init Rebinding): kbd is now a function (Bug#13052). diff --cc doc/emacs/trouble.texi index 705cd5a4bbe,c6b8c2490c8..fc4cef19760 --- a/doc/emacs/trouble.texi +++ b/doc/emacs/trouble.texi @@@ -330,19 -325,17 +330,19 @@@ sed -n 's/.*\[\(.*\)]$/\1/p' @var{backt @noindent Here, @var{backtrace} is the name of a text file containing a copy of -the backtrace, and @var{bindir} is the name of the directory that -contains the Emacs executable. +the backtrace, @var{bindir} is the name of the directory that +contains the Emacs executable, and @var{emacs-binary} is the name of +the Emacs executable file, normally @file{emacs} on GNU and Unix +systems and @file{emacs.exe} on MS-Windows and MS-DOS. @cindex core dump - Optionally, Emacs can generate a @dfn{core dump} when it crashes. A -core dump is a file containing voluminous data about the state of the -program prior to the crash, usually examined by loading it into a -debugger such as GDB@. On many platforms, core dumps are disabled by -default, and you must explicitly enable them by running the shell -command @samp{ulimit -c unlimited} (e.g., in your shell startup -script). + Optionally, Emacs can generate a @dfn{core dump} when it crashes, on +systems that support core files. A core dump is a file containing +voluminous data about the state of the program prior to the crash, - usually examined by loading it into a debugger such as GDB. On many ++usually examined by loading it into a debugger such as GDB@. On many +platforms, core dumps are disabled by default, and you must explicitly +enable them by running the shell command @samp{ulimit -c unlimited} - (e.g.@: in your shell startup script). ++(e.g., in your shell startup script). @node After a Crash @subsection Recovery After a Crash diff --cc doc/lispref/ChangeLog index d15a05fe777,702db101549..bafcbfab9a7 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@@ -1,4 -1,10 +1,10 @@@ -2012-12-05 Chong Yidong ++2012-12-06 Chong Yidong + + * lists.texi (Plist Access): Move put example to Symbol Plists. + + * symbols.texi (Standard Properties): Fix typo. + -2012-12-02 Chong Yidong +2012-12-03 Chong Yidong * symbols.texi (Symbol Properties): New node. (Symbol Plists): Make it a subsection under Symbol Properties. diff --cc doc/misc/ses.texi index cccd74dec0f,0c50bb2a1e4..fecba99952f --- a/doc/misc/ses.texi +++ b/doc/misc/ses.texi @@@ -909,10 -850,10 +909,10 @@@ loaded, then the entire data area is @c variables are processed. You can edit the data area, but don't insert or delete any newlines -except in the local-variables part, since SES locates things by +except in the local-variables part, since @acronym{SES} locates things by counting newlines. Use @kbd{C-x C-e} at the end of a line to install your edits into the spreadsheet data structures (this does not update - the print area, use e.g. @kbd{C-c C-l} for that). + the print area, use, e.g., @kbd{C-c C-l} for that). The data area is maintained as an image of spreadsheet data structures that area stored in buffer-local variables. If the data diff --cc lisp/ChangeLog index 3c0f28da4db,a4f40e6a80d..fbd6e3c631c --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,96 -1,23 +1,115 @@@ + 2012-12-06 Chong Yidong + + * ffap.el (ffap-replace-file-component): Fix typo. + -2012-12-05 Stefan Monnier ++2012-12-06 Stefan Monnier + + * progmodes/octave-mod.el (octave-mark-block): Move out of tokens and + fix open-paren-like token test (bug#12785). + -2012-12-04 Glenn Morris ++2012-12-06 Glenn Morris + + * mail/rmailsum.el (rmail-new-summary): Tweak for + rmail-maybe-display-summary changing buffer. (Bug#13066) + -2012-12-03 Juri Linkov ++2012-12-06 Juri Linkov + + * info.el (Info-fontify-node): Don't hide the last newline. + (Bug#12272) + -2012-12-01 Leo Liu +2012-12-06 Katsumi Yamaoka + + * mail/mailabbrev.el (mail-abbrev-expand-wrapper): Work in minibuffer + so as to enable message-read-from-minibuffer to expand mail aliases. + +2012-12-06 Stefan Monnier + + * minibuf-eldef.el (minibuf-eldef-update-minibuffer): Don't mess with + the `intangible' property. + Suggested by Christopher Schmidt + +2012-12-05 Deniz Dogan + + * net/rcirc.el (rcirc-urls): Update documentation. + (rcirc-condition-filter): New function. + (rcirc-browse-url, rcirc-markup-urls): Use only URLs before point + and exclude consecutive duplicate URLs (Bug#6082). + +2012-12-05 Michael Albinus + + * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): + Check return code of copy command. + + * net/tramp-adb.el (tramp-adb-sdk-dir, tramp-adb-prompt): Use + group `tramp'. Add version. + +2012-12-05 Chong Yidong + + * ffap.el (ffap-url-regexp): Don't require matching at front of + string (Bug#4952). + (ffap-url-p): If only a substring matches, return that. + (ffap-url-at-point): Use the return value of ffap-url-p. + (ffap-read-file-or-url, ffap-read-file-or-url-internal) + (find-file-at-point, dired-at-point, dired-at-point-prompter) + (ffap-guess-file-name-at-point): Likewise. + (ffap-replace-file-component): Fix typo. + + * info.el (info-display-manual): Add existing Info buffers, whose + files may not be in Info-directory-list, to the completion. + (info--manual-names): New helper function. + +2012-12-05 Glenn Morris + + * vc/vc-hg.el (vc-hg-resolve-when-done, vc-hg-find-file-hook): + New functions, for detecting and resolving conflicts. (Bug#10709) + +2012-12-04 Jambunathan K + + * hi-lock.el (hi-lock-auto-select-face): New user variable. + (hi-lock-auto-select-face-defaults): New buffer local variable. + (hi-lock-read-face-name): Honor `hi-lock-auto-select-face'. + (hi-lock-unface-buffer): Prompt user with useful defaults. + With prefix arg, unhighlight all hi-lock patterns in buffer. + +2012-12-04 Stefan Monnier + + * obsolete/terminal.el, obsolete/longlines.el: Add obsolecence info. + +2012-12-04 Michael Albinus + + * Makefile.in (TRAMP_SRC): + * makefile.w32-in (TRAMP_SRC): Add tramp-adb.el. + +2012-12-04 Juergen Hoetzel + + * net/tramp-adb.el: New package. + +2012-12-04 Chong Yidong + + * terminal.el: Move to obsolete/. + + * longlines.el: Move to obsolete/. + + * vc/ediff-diff.el (ediff-extract-diffs, ediff-extract-diffs3): + Remove code referring to longlines mode. + +2012-12-03 Juri Linkov + + * sort.el (delete-duplicate-lines): New command. (Bug#13032) + +2012-12-03 Agustín Martín Domingo + + * textmodes/ispell.el (ispell-init-process) + (ispell-start-process, ispell-internal-change-dictionary): + Make sure personal dictionary name is expanded after initial + `default-directory' value. Use expanded strings for + keep/restart checks and for value (Bug#13019). + +2012-12-03 Jay Belanger + + * calc/calc-forms.el (math-date-to-iso-dt): Fix weekday number. + +2012-12-03 Leo Liu * files.el (dir-locals-read-from-file): Check file non-empty before reading. (Bug#13038) diff --cc src/ChangeLog index a6ba03a0069,106333ac8ed..795582c802b --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,122 -1,19 +1,135 @@@ -2012-12-05 Eli Zaretskii ++2012-12-06 Eli Zaretskii + + * callproc.c (Fcall_process_region) [!HAVE_MKSTEMP]: If mktemp + fails, signal an error instead of continuing with an empty + string. (Bug#13079) + Encode expanded temp file pattern before passing it to mkstemp or + mktemp. + -2012-12-04 Eli Zaretskii - + * fileio.c (file_name_as_directory, directory_file_name) [DOS_NT]: + Encode the file name before passing it to dostounix_filename, in + case it will downcase it (under w32-downcase-file-names). + (Bug#12933) + -2012-12-01 Chong Yidong +2012-12-05 Paul Eggert + + Minor call-process cleanups. + * callproc.c (Fcall_process): Do record-unwind-protect on MSDOS + at the same time as other platforms, to simplify analysis. + No need for fd0_volatile since we have synch_process_fd. + Avoid needless emacs_close; arg is always negative. + +2012-12-04 Andreas Schwab + + * callproc.c (Fcall_process): Fix specpdl nesting for asynchronous + processes. + +2012-12-04 Dmitry Antipov + + * lisp.h (Mouse_HLInfo): Remove set-but-unused mouse_face_image_state + member. Adjust users. Convert mouse_face_past_end, mouse_face_defer + and mouse_face_hidden members to a bitfields. + * frame.h (struct frame): Remove set-but-not-used space_width member. + (FRAME_SPACE_WIDTH): Remove. + * nsterm.m, w32term.c, xterm.c: Adjust users. + * termchar.h (struct tty_display_info): Remove set-but-unused se_is_so + member. Adjust users. Convert term_initted, delete_in_insert_mode, + costs_set, insert_mode, standout_mode, cursor_hidden and flow_control + members to a bitfields. + +2012-12-03 Paul Eggert + + Don't let call-process be a zombie factory (Bug#12980). + Fixing this bug required some cleanup of the signal-handling code. + As a side effect, this change also fixes a longstanding rare race + condition whereby Emacs could mistakenly kill unrelated processes, + and it fixes a bug where a second C-g does not kill a recalcitrant + synchronous process in GNU/Linux and similar platforms. + The patch should also fix the last vestiges of Bug#9488, + a bug which has mostly been fixed on the trunk by other changes. + * callproc.c, process.h (synch_process_alive, synch_process_death) + (synch_process_termsig, sync_process_retcode): + Remove. All uses removed, to simplify analysis and so that + less consing is done inside critical sections. + * callproc.c (call_process_exited): Remove. All uses replaced + with !synch_process_pid. + * callproc.c (synch_process_pid, synch_process_fd): New static vars. + These take the role of what used to be in unwind-protect arg. + All uses changed. + (block_child_signal, unblock_child_signal): + New functions, to avoid races that could kill innocent-victim processes. + (call_process_kill, call_process_cleanup, Fcall_process): Use them. + (call_process_kill): Record killed processes as deleted, so that + zombies do not clutter up the system. Do this inside a critical + section, to avoid a race that would allow the clutter. + (call_process_cleanup): Fix code so that the second C-g works again + on common platforms such as GNU/Linux. + (Fcall_process): Create the child process in a critical section, + to fix a race condition. If creating an asynchronous process, + record it as deleted so that zombies do not clutter up the system. + Do unwind-protect for WINDOWSNT too, as that's simpler in the + light of these changes. Omit unnecessary call to emacs_close + before failure, as the unwind-protect code does that. + * callproc.c (call_process_cleanup): + * w32proc.c (waitpid): Simplify now that synch_process_alive is gone. + * process.c (record_deleted_pid): New function, containing + code refactored out of Fdelete_process. + (Fdelete_process): Use it. + (process_status_retrieved): Remove. All callers changed to use + child_status_change. + (record_child_status_change): Remove, folding its contents into ... + (handle_child_signal): ... this signal handler. Now, this + function is purely a handler for SIGCHLD, and is not called after + a synchronous waitpid returns; the synchronous code is moved to + wait_for_termination. There is no need to worry about reaping + more than one child now. + * sysdep.c (get_child_status, child_status_changed): New functions. + (wait_for_termination): Now takes int * status and bool + interruptible arguments, too. Do not record child status change; + that's now the caller's responsibility. All callers changed. + Reimplement in terms of get_child_status. + (wait_for_termination_1, interruptible_wait_for_termination): + Remove. All callers changed to use wait_for_termination. + * syswait.h: Include , for bool. + (record_child_status_change, interruptible_wait_for_termination): + Remove decls. + (record_deleted_pid, child_status_changed): New decls. + (wait_for_termination): Adjust to API changes noted above. + + * bytecode.c, lisp.h (Qbytecode): Remove. + No longer needed after 2012-11-20 interactive-p changes. + +2012-12-03 Eli Zaretskii + + * xdisp.c (redisplay_window): If the cursor is visible, but inside + the scroll margin, move point outside the margin. (Bug#13055) + +2012-12-03 Jan Djärv + + * gtkutil.c (my_log_handler): New function. + (xg_set_geometry): Set log handler to my_log_handler (Bug#11177). + +2012-12-03 Dmitry Antipov + + * lisp.h (modify_region): Rename to... + (modify_region_1): ...new prototype. + * textprop.c (modify_region): Now static. Adjust users. + * insdel.c (modify_region): Rename to... + (modify_region_1): ...new function to work with current buffer. + Adjust comment and users. Use true and false for booleans. + +2012-12-03 Dmitry Antipov + + * alloc.c (free_save_value): New function. + (safe_alloca_unwind): Use it. + * lisp.h (free_save_value): New prototype. + * editfns.c (save_excursion_save): Use Lisp_Misc_Save_Value. + Add comment. + (save_excursion_restore): Adjust to match saved data structure. + Use free_save_value to offload some work from GC. Drop obsolete + #if 0 code. + +2012-12-03 Chong Yidong * fileio.c (Vauto_save_list_file_name): Doc fix.