From: Glenn Morris Date: Sat, 24 Nov 2012 01:57:09 +0000 (-0800) Subject: Merge from emacs-24; up to 2012-11-19T11:36:02Z!yamaoka@jpl.org X-Git-Tag: emacs-24.3.90~173^2~18^2~8 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d125ca15f3751f36a1ec49e3d9f9de1735b43698;p=emacs.git Merge from emacs-24; up to 2012-11-19T11:36:02Z!yamaoka@jpl.org --- d125ca15f3751f36a1ec49e3d9f9de1735b43698 diff --cc doc/lispref/ChangeLog index 99e21bac469,adb52dc7f2b..b5c4318c404 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@@ -1,12 -1,39 +1,39 @@@ -2012-11-23 Martin Rudalics ++2012-11-24 Martin Rudalics + + * windows.texi (Basic Windows): Fix typo. + (Windows and Frames): Fix example. Move description of + window-in-direction here. + (Recombining Windows): Fix example. + (Buffers and Windows): Fix description of + replace-buffer-in-windows. + (Switching Buffers): Reword. + (Display Action Functions): Minor adjustments. + (Choosing Window Options): Minor fixes. + (Window History): Minor rewording. + (Dedicated Windows): Correct and reword part describing how + dedicatedness affects functions removing buffers or windows. + * buffers.texi (The Buffer List): Fix description of + bury-buffer. + -2012-11-23 Chong Yidong ++2012-11-24 Chong Yidong + + * modes.texi (%-Constructs): Fix statement about mode construct + padding (Bug#12866). + -2012-11-21 Stefan Monnier ++2012-11-24 Stefan Monnier + + * debugging.texi (Profiling): Make it more clear + that --enable-profiling is about profiling the C code. + 2012-11-21 Glenn Morris - * debugging.texi (Profiling): Mention --enable-profiling (if !tex). - Add some basic information about the profile report buffer. - (Debugging): Mention profiling in the introduction. - -2012-11-20 Glenn Morris + * display.texi (Attribute Functions): + Update for set-face-* name changes. + Add new "inherit" argument for face-bold-p etc. + Move description of this argument to a common section, like "frame". - * debugging.texi (Profiling): New section, in progress. + * debugging.texi (Profiling): New section. + (Debugging): Mention profiling in the introduction. * tips.texi (Compilation Tips): Move profiling to separate section. * elisp.texi: Add Profiling to detailed menu. diff --cc doc/lispref/windows.texi index e515b24db93,224c4736c92..7622fcfd233 --- a/doc/lispref/windows.texi +++ b/doc/lispref/windows.texi @@@ -1061,7 -1084,7 +1084,7 @@@ including the space earlier stolen fro @end smallexample @noindent - This can be counterintuitive, in particular if @code{W4} were used for -This can be counterintutive, in particular if @var{W4} were used for ++This can be counterintuitive, in particular if @var{W4} were used for displaying a buffer only temporarily (@pxref{Temporary Displays}), and you want to continue working with the initial layout. diff --cc lisp/ChangeLog index 09f42233f96,431f45c3695..c127bfd42e6 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,56 -1,77 +1,108 @@@ -2012-11-23 Stefan Monnier ++2012-11-24 Stefan Monnier + + * emacs-lisp/bytecomp.el (byte-compile-file): Setup default value for + lexical-binding (bug#12938). + -2012-11-23 Wolfgang Jenkner ++2012-11-24 Wolfgang Jenkner + + * image-mode.el (image-transform-check-size): Use assertions only + for images of type imagemagick. + + Otherwise no error, image-transform-fit-to-{width,height} is + silently ignored, as before. Doc fix. + -2012-11-23 Chong Yidong ++2012-11-24 Chong Yidong + + * faces.el (color-defined-p): Doc fix (Bug#12853). + -2012-11-23 Juri Linkov ++2012-11-24 Juri Linkov + + * dired.el (dired-mark): Add optional arg `interactive'. + Check for `use-region-p' if `interactive' is non-nil. + (dired-unmark, dired-flag-file-deletion): Add optional arg + `interactive'. Call `dired-mark' with the arg `interactive'. + (Bug#10624) + -2012-11-23 Juri Linkov - + * wdired.el: Revert 2012-10-17 change partly and replace it with + Patch by Christopher Schmidt . + (wdired-finish-edit): Add marks for new file names to + `wdired-old-marks'. Restore marks using `dired-mark-remembered' + after `revert-buffer'. + (wdired-do-renames): Remove calls to `dired-remove-file', + `dired-add-file', `dired-add-entry'. (Bug#11795) + -2012-11-21 Alan Mackenzie ++2012-11-24 Alan Mackenzie + + * progmodes/cc-defs.el (c-version): Bump to 5.32.4. + + Fix bugs in the state cache. Enhance a debugging mechanism. + * progmodes/cc-engine.el (c-parse-state-get-strategy): Don't use + "brace at column zero" strategy for C++. + (c-append-lower-brace-pair-to-state-cache): Repair algorithm. + (c-parse-state-point): New variable. + (c-record-parse-state-state): Record old parse state with + `copy-tree'. Record previous value of point. + (c-debug-parse-state-double-cons): New debugging function. + (c-debug-parse-state): Call the above new function. + (c-toggle-parse-state-debug): Output a confirmatory message. + + * progmodes/cc-mode.el (c-before-change, c-after-change): + Call c-invalidate-state-cache from `c-before-change' instead of + `c-after-change'. + -2012-11-20 Daniel Colascione +2012-11-23 Chong Yidong - * term/w32-win.el (cygwin-convert-path-from-windows): - Accomodate rename of cygwin_convert_path* to cygwin_convert_file_name*. - This change is a backport from trunk. + * find-cmd.el (find-constituents): Add executable, ipath, + readable, samefile, writable, daystart, regextype (Bug#12856). -2012-11-20 Eli Zaretskii +2012-11-23 Stefan Monnier - * simple.el (line-move): Don't call line-move-partial if - scroll-conservatively is in effect. (Bug#12927) + * emacs-lisp/ert.el, emacs-lisp/ert-x.el: Use cl-lib and lexical-binding. -2012-11-20 Michael Albinus +2012-11-22 Paul Eggert - * net/trampver.el (tramp-version): Downgrade to 2.2.6-24.3, in - order to distinguish from trunk. + * calc/calc.el (calc-gregorian-switch): Move to after calc-refresh + definition. This fixes a bootstrap failure. + (calc-gregorian-switch): In menu, put dates before regions. + This is easier to follow, lines up better in the menu, and lets us + coalesce regions that switch at the same time. Give country + names, not "Vatican", as that's better for non-expert users. + Use names that are stable between the date of switch and now, e.g., + Bohemia and Moravia (which existed then and now) and not + Czechoslovakia (which didn't exist then and doesn't exist now). + What is now the U.S. mostly did not switch at the same time as + Britain, so omit the U.S. Correct spelling of "Britain". + Catholic Switzerland was too much of a mess, so omit it. -2012-11-19 Stefan Monnier +2012-11-22 Jay Belanger + + * calc/calc.el (calc-gregorian-switch): Refresh the Calc buffer + after the variable is changed. + +2012-11-21 Daniel Colascione + + * progmodes/sql.el (sql-mode-font-lock-object-name): Support IF NOT EXISTS + in SQL declarations for font-lock. + (sql-imenu-generic-expression): Teach imenu about IF NOT EXISTS. + +2012-11-21 Glenn Morris + + * faces.el (face-underline-p, face-inverse-video-p, face-bold-p) + (face-italic-p): Add optional argument "inherit". + + * faces.el (set-face-inverse-video, set-face-bold, set-face-italic): + Remove -p suffix from names, for consistency with other set-face-*. + (set-face-inverse-video): Fix interactive spec. + * play/gamegrid.el (gamegrid-make-mono-tty-face): + * textmodes/table.el (table--update-cell-face): + Use set-face-inverse-video rather than now obsolete alias. - * emacs-lisp/byte-run.el (defun-declarations-alist): Don't accept - non-symbols for compiler macros (yet). +2012-11-21 Eli Zaretskii + + * simple.el (line-move): Don't call line-move-partial if + scroll-conservatively is in effect. (Bug#12927) + +2012-11-21 Stefan Monnier * eshell/em-cmpl.el (eshell-pcomplete): Refine fix for bug#12838: Fallback on completion-at-point rather than diff --cc src/ChangeLog index e5669da5196,655eb1595c0..32a14ef9e62 --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,91 -1,86 +1,105 @@@ -2012-11-23 Paul Eggert - - Fix a race condition with glib (Bug#8855). - This is a backport from the trunk, consisting of: - - 2012-11-17 Eli Zaretskii - - * 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 (wait_for_termination_1): Remove the WINDOWSNT portion, - as it is no longer needed. - - * process.c (waitpid, WUNTRACED) [!WNOHANG]: Remove definitions, - no longer needed. - (record_child_status_change): Remove the setting of - record_at_most_one_child for the !WNOHANG case. - - 2012-11-03 Paul Eggert - - Fix a race condition that causes Emacs to mess up glib (Bug#8855). - This is a backport from the trunk. - 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'. - -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 + several display strings follow each other. + + * .gdbinit (pgx): If the glyph's object is a string, display the + pointer to string data, rather than the value of the string object + itself (which barfs under CHECK_LISP_OBJECT_TYPE). + -2012-11-21 Eli Zaretskii - + * indent.c (Fvertical_motion): If the starting position is covered + by a display string, return to one position before that, to avoid + overshooting it inside move_it_to. (Bug#12930) + -2012-11-20 Daniel Colascione +2012-11-23 Dmitry Antipov + + * frame.h (struct frame): Remove display_preempted member + since all users are dead long ago. + * nsterm.h (struct x_output): Use the only dummy member. + * w32menu.c (pending_menu_activation): Remove since not + really used. + (set_frame_menubar): Adjust user. + * w32term.h (struct x_output): Drop outdated #if 0 code. + (struct w32_output): Use bitfields for explicit_parent, + asked_for_visible and menubar_active members. Drop + unused pending_menu_activation member. + * xterm.h (struct x_output): Drop outdated #if 0 code. + Use bitfields for explicit_parent, asked_for_visible, + has_been_visible and net_wm_state_hidden_seen members. - * w32fns.c (Fx_file_dialog): - (Fx_file_dialog): Accomodate rename of cygwin_convert_path* to - cygwin_convert_file_name*. +2012-11-23 Eli Zaretskii - * cygw32.c (Fcygwin_convert_path_to_windows, syms_of_cygw32): - Rename cygwin_convert_path* to cygwin_convert_file_name*. + * makefile.w32-in (globals.h, gl-stamp): Use $(SWITCHCHAR) instead + of a literal "/". (Bug#12955) + (gl-stamp): Invoke fc.exe directly, not through cmd. -2012-11-20 Ken Brown +2012-11-23 Paul Eggert + + Assume POSIX 1003.1-1988 or later for dirent.h (Bug#12958). + * dired.c: Assume HAVE_DIRENT_H. + (NAMLEN): Remove, replacing with ... + (dirent_namelen): New function. All uses changed. Use the GNU macro + _D_EXACT_NAMELEN if available, as it's faster than strlen. + (DIRENTRY): Remove, replacing all uses with 'struct dirent'. + (DIRENTRY_NONEMPTY): Remove. All callers now assume it's nonzero. + * makefile.w32-in (DIR_H): Remove. All uses replaced with + $(NT_INC)/dirent.h. + ($(BLD)/w32.$(O)): Do not depend on $(SRC)/ndir.h. + * ndir.h: Rename to ../nt/inc/dirent.h. + * sysdep.h (closedir) [!HAVE_CLOSEDIR]: Remove. + Do not include ; no longer needed. + * w32.c: Include rather than "ndir.h". + +2012-11-23 Chong Yidong + + * xftfont.c (xftfont_open): Remove duplicate assignment. + +2012-11-22 Dmitry Antipov + + * alloc.c (Fgarbage_collect): Unblock input after clearing + gc_in_progress to avoid note_mouse_highlight glitch with GC. + * frame.h (FRAME_MOUSE_UPDATE): New macro. + * msdos.c (IT_frame_up_to_date): Use it here... + * w32term.c (w32_frame_up_to_date): ...here... + * xterm.c (XTframe_up_to_date): ...and here... + * nsterm.m (ns_frame_up_to_date): ...but not here. + * lisp.h (Mouse_HLInfo): Remove mouse_face_deferred_gc member. + Adjust users. + * xdisp.c (message2_nolog, message3_nolog, note_mouse_highlight): + Do not check whether GC is in progress. + +2012-11-22 Dmitry Antipov + + * xdisp.c (window_buffer_changed): New function. + (update_menu_bar, update_tool_bar): Use it to + simplify large 'if' statements. + (redisplay_internal): Generalize commonly used + 'tail' and 'frame' local variables. + +2012-11-22 Eli Zaretskii + + * w32.c (getcwd): Fix the 2nd argument type, to prevent conflicts + with Windows system header. + +2012-11-21 Paul Eggert + + Assume POSIX 1003.1-1988 or later for unistd.h (Bug#12945). + * alloc.c: Assume unistd.h exists. + * fileio.c (Fexpand_file_name) [DOS_NT]: Use getcwd, not getwd. + * sysdep.c (get_current_dir_name): Assume getcwd exists. + (getwd) [USG]: Remove; no longer needed. + (sys_subshell) [DOS_NT]: Use getcwd, not getwd. + * w32.c (getcwd): Rename from getwd, and switch to getcwd's API. + * w32.h (getcwd): Remove decl. + +2012-11-21 Stefan Monnier + + * xdisp.c (fast_set_selected_frame): Rename from update_tool_bar_unwind. + Make it set selected_window as well. + (update_tool_bar): Use it. + +2012-11-21 Ken Brown * emacs.c (main): Set the G_SLICE environment variable for all Cygwin builds, not just GTK builds. See