From: Glenn Morris Date: Tue, 27 Nov 2012 03:10:32 +0000 (-0800) Subject: Merge from emacs-24; up to 2012-11-20T20:06:17Z!monnier@iro.umontreal.ca X-Git-Tag: emacs-24.3.90~173^2~9^2~141^2~3 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5c9cf0a3f9817220ed0f907637951f5cdf1a9614;p=emacs.git Merge from emacs-24; up to 2012-11-20T20:06:17Z!monnier@iro.umontreal.ca --- 5c9cf0a3f9817220ed0f907637951f5cdf1a9614 diff --cc ChangeLog index bddec07fc19,caec4db11a1..ab81d73e45c --- a/ChangeLog +++ b/ChangeLog @@@ -1,16 -1,7 +1,20 @@@ -2012-11-24 Eli Zaretskii ++2012-11-27 Eli Zaretskii + - * make-dist (nt): Adjust to changes in names of the *.manifest - files. ++ * make-dist (nt): Adjust to changes in names of the *.manifest files. ++ +2012-11-24 Ken Brown + + * configure.ac (HAVE_MOUSE): Remove. + +2012-11-23 Paul Eggert + + Assume POSIX 1003.1-1988 or later for dirent.h (Bug#12958). + * configure.ac: Do not check for dirent.h or closdir. + +2012-11-21 Paul Eggert + + Assume POSIX 1003.1-1988 or later for unistd.h (Bug#12945). + * configure.ac: Do not check for getcwd or getwd. 2012-11-21 Glenn Morris diff --cc lisp/ChangeLog index 2771ca42f25,79028d68f73..b6d7c082a88 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,74 -1,57 +1,127 @@@ + 2012-11-27 Stefan Monnier + + * textmodes/table.el (table-insert): Don't use `symbol-name' on + lexically scoped variables (bug#13005). + -2012-11-26 Glenn Morris ++2012-11-27 Glenn Morris + + * vc/vc-hooks.el (vc-mistrust-permissions): + Default to t, to avoid data-loss. (Bug#11490) + -2012-11-26 Fabián Ezequiel Gallina ++2012-11-27 Fabián Ezequiel Gallina + + * progmodes/python.el (python-indent-guess-indent-offset): + If indentation is guessed make python-indent-offset buffer-local. + + Fix Imenu regression. + * progmodes/python.el (python-nav-beginning-of-defun): + Fix forward movement when statement(s) separates point from defun. + (python-imenu-prev-index-position): New function. + -2012-11-26 Eli Zaretskii ++2012-11-27 Eli Zaretskii + + * subr.el (buffer-file-type): Declare with defvar-local. Doc fix. + + * dos-w32.el (find-file-not-found-set-buffer-file-coding-system): + Don't set buffer-file-type. Return nil. (Bug#12989) + -2012-11-26 Glenn Morris ++2012-11-27 Glenn Morris + + * hippie-exp.el (hippie-expand-try-functions-list): + Re-autoload it. (Bug#12982) + -2012-11-25 Eli Zaretskii ++2012-11-27 Eli Zaretskii + + * descr-text.el (describe-char-padded-string): + Call internal-char-font only on GUI frames. (Bug#11964) + -2012-11-24 Andreas Schwab ++2012-11-27 Andreas Schwab + + * buff-menu.el (Buffer-menu-buffer+size-width): Fix customize type + and obsoletion message. + -2012-11-24 Stefan Monnier ++2012-11-27 Stefan Monnier + + * emacs-lisp/cl-macs.el (cl--transform-lambda): Add back `declare' in + the constructs to keep outside of the `cl-block' (bug#12977). + -2012-11-24 Chong Yidong ++2012-11-27 Chong Yidong + + * mouse.el (mouse-drag-line): Even if the line is not draggable, + keep reading until we get the up-event anyway, in order to process + the up-event for mouse-1-click-follows-link (Bug#12971). + -2012-11-23 Stefan Monnier +2012-11-26 Stefan Monnier + + * emacs-lisp/advice.el (ad-should-compile): Don't compile advice if the + base function is not yet defined (bug#12965). + (ad-activate-advised-definition): Use ad-compile-function. + (ad-activate): Use cond. + +2012-11-25 Leo Liu + + * textmodes/sgml-mode.el (sgml-tag): Fix indentation for closing tag. + (Bug#12979) + +2012-11-24 Vincent Belaïche + + * textmodes/reftex-parse.el (reftex-parse-from-file): Use variable + reftex-section-info-function in order to be compatible with + Texinfo integration. + + * textmodes/reftex.el (reftex-section-pre-regexp) + (reftex-section-post-regexp, reftex-section-info-function): + New variable. + (reftex-compile-variables): Use variables reftex-section-pre-regexp, + reftex-section-post-regexp, and reftex-section-info-function in order + to be compatible with Texinfo integration. + + * textmodes/reftex-toc.el (reftex-toc-promote-action): + use reftex-section-pre-regexp variable in order to be compatible with + Texinfo integration. + +2012-11-25 Chong Yidong + + * faces.el: Make face-spec-set more analogous to setq. + (face-spec-set): Change the third arg to specify whether this + function is being called via defface, customize, or a third party. + Set the appropriate symbol properties. Clear the override spec if + setting via Custom. Initialize face if necessary. (Bug#4988) + (face-spec-recalc): Allow theme faces to completely replace the + defface spec, in the same way as custom faces (Bug#8454). + + * cus-face.el (custom-declare-face): Move face initialization to + face-spec-set. + (custom-theme-set-faces): Don't initialize the face name here, as + that is now done in face-spec-set. + + * cus-edit.el (custom-face-set, custom-face-mark-to-save) + (custom-face-reset-saved, custom-face-mark-to-reset-standard): + Simplify by using the new arg to face-spec-set. + + * emacs-lisp/lisp-mode.el (eval-defun-1): When evaluating defface, + reset face-override-spec too, and use custom-declare-face. + +2012-11-24 Jan Djärv + + * term/ns-win.el (ns-initialize-window-system): Move creation of + fontsets here (Bug#11964). + +2012-11-24 Vincent Belaïche + + * ses.el (ses-rename-cell): Correct bug on mode-line update after + cell renaming. + +2012-11-24 Chong Yidong + + * woman.el (woman-default-faces, woman-monochrome-faces): Mark as + obsolete. + + * custom.el (custom-theme-set-variables): Use a topological sort + for ordering by custom dependencies (Bug#12952). + (custom--sort-vars, custom--sort-vars-1): New functions. + +2012-11-24 Stefan Monnier * emacs-lisp/bytecomp.el (byte-compile-file): Setup default value for lexical-binding (bug#12938). diff --cc src/ChangeLog index c612c4dd365,ce272cc0b53..d841812bceb --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,14 -1,76 +1,24 @@@ -2012-11-26 Eli Zaretskii ++2012-11-27 Eli Zaretskii + + * fontset.c (Finternal_char_font): Return nil on non-GUI frames. + (Bug#11964) + -2012-11-24 Paul Eggert - - Revert recent change for Bug#8855. - As reported by Harald Hanche-Olsen in - - the change introduces a further bug, of creating lots of zombie - processes in some cases. Further work is needed to come up with a - better fix for Bug#8855. - -2012-11-24 Eli Zaretskii - + * xdisp.c (draw_glyphs): Don't draw in mouse face if mouse + highlighting on the frame was cleared. Prevents assertion + violations when repeatedly clicking on the "Top" link of the + "bread-crumbs" in Info buffers. + -2012-11-23 Paul Eggert - Eli Zaretskii - - Fix a race condition with 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. - - This is a backport from the trunk, consisting of: +2012-11-25 Paul Eggert - * w32proc.c (create_child): Don't clip the PID of the child - process to fit into an Emacs integer, as this is no longer a - restriction. - (waitpid): Rename from sys_wait. Emulate a Posix 'waitpid' by - reaping only the process specified by PID argument, if that is - positive. Use PID instead of dead_child to know which process to - reap. Wait for the child to die only if WNOHANG is not in - OPTIONS. - (sys_select): Don't set dead_child. + * sysdep.c (sys_subshell): Don't assume pid_t fits in int. - * sysdep.c (wait_for_termination_1): Remove the WINDOWSNT portion, - as it is no longer needed. +2012-11-24 Ken Brown - * process.c (waitpid, WUNTRACED) [!WNOHANG]: Remove definitions, - no longer needed. - (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. Remove the setting of - record_at_most_one_child for the !WNOHANG case. - (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'. + * keyboard.c (HAVE_MOUSE): + * frame.c (HAVE_MOUSE): Remove, and rewrite code as if HAVE_MOUSE + were always defined. -2012-11-23 Eli Zaretskii +2012-11-24 Eli Zaretskii * xdisp.c (set_cursor_from_row): Skip step 2 only if point is not between bpos_covered and bpos_max. This fixes cursor display when