From: Glenn Morris Date: Wed, 13 Feb 2013 04:31:09 +0000 (-0800) Subject: Merge from emacs-24; up to 2012-12-17T11:17:34Z!rgm@gnu.org X-Git-Tag: emacs-24.3.90~173^2~7^2~64 X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/01fcc3a532872b29784a4d888ab9cc1aef0eed01 Merge from emacs-24; up to 2012-12-17T11:17:34Z!rgm@gnu.org --- 01fcc3a532872b29784a4d888ab9cc1aef0eed01 diff --cc doc/lispref/ChangeLog index a61d84a77b,79ba145c5f..be1bdfcfa3 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@@ -1,4 -1,21 +1,17 @@@ + 2013-02-13 Glenn Morris + + * objects.texi (Char-Table Type): Add footnote about #^^. + + * modes.texi (Minor Mode Conventions): Fix typo. + -2013-02-12 Glenn Morris - + * keymaps.texi (Scanning Keymaps): Remove obsolete sentence about + meta characters; this changed in 22.1. (Bug#13684) + -2013-02-11 Glenn Morris - + * objects.texi (Char-Table Type): Add cindex. + + * keymaps.texi (Key Binding Commands): Trivial rephrasing. + -2013-02-09 Glenn Morris +2013-02-10 Glenn Morris * keymaps.texi (Creating Keymaps): Update make-keymap result. diff --cc doc/misc/ediff.texi index 1e4c888a9e,edb2a446cf..378eee08c5 --- a/doc/misc/ediff.texi +++ b/doc/misc/ediff.texi @@@ -1148,9 -1148,9 +1148,9 @@@ packages also use this method) Regular files are treated by the @code{patch} utility in the usual manner, i.e., the original is renamed into @file{source-name.orig} and the result of the patch is placed into the file source-name (@file{_orig} is used - on systems like DOS, etc.) + on systems like DOS, etc.). -@node Customization, Credits, Remote and Compressed Files, Top +@node Customization @chapter Customization Ediff has a rather self-explanatory interface, and in most cases you diff --cc doc/misc/ses.texi index ce75f2ef91,2bef526257..20bd689c6a --- a/doc/misc/ses.texi +++ b/doc/misc/ses.texi @@@ -901,9 -842,9 +901,9 @@@ Begins with an 014 character, followed macros for each row, followed by column-widths, column-printers, default-printer, and header-row. Then there's the global parameters (file-format ID, numrows, numcols) and the local variables (specifying - @acronym{SES} mode for the buffer, etc.) -SES mode for the buffer, etc.). ++@acronym{SES} mode for the buffer, etc.). -When a SES file is loaded, first the numrows and numcols values are +When a @acronym{SES} file is loaded, first the numrows and numcols values are loaded, then the entire data area is @code{eval}ed, and finally the local variables are processed. diff --cc lisp/ChangeLog index 4222f81879,580f9ea26b..a1d7f0013b --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,80 -1,9 +1,85 @@@ -2013-02-10 Michael Albinus ++2013-02-13 Michael Albinus + + * net/ange-ftp.el (ange-ftp-make-directory): Don't raise an error, + if DIR exists and PARENTS is non-nil. + -2013-02-09 Chong Yidong +2013-02-13 Juanma Barranquero + + * progmodes/js.el (js--multi-line-declaration-indentation): + Silence byte-compiler warning. + +2013-02-12 Michael Albinus + + * net/tramp-adb.el (tramp-adb-handle-start-file-process): Rewrite. + + * net/tramp-compat.el (top): Declare `remote-file-name-inhibit-cache' + only if it doesn't exist. + + * net/tramp-sh.el (tramp-sh-handle-start-file-process): Set + process marker. + +2013-02-12 Tassilo Horn + + * doc-view.el (doc-view-odf->pdf-converter-soffice): Use separate + UserInstallation when calling soffice to work around LibreOffice + bug 37531. + +2013-02-12 Glenn Morris + + * files.el (basic-save-buffer): + Offer to create a non-existing directory. (Bug#3016) + + * calc/calc-graph.el (calc-graph-show-dumb): + * calendar/calendar.el (calendar-mode-map): + * cus-edit.el (custom-mode-map): + * ehelp.el (electric-help-map): + * emulation/vip.el (vip-mode-map): + * epa.el (epa-key-list-mode-map): + * info.el (Info-mode-map): + * mail/rmail.el (rmail-mode-map): + * mail/rmailsum.el (rmail-summary-mode-map): + * man.el (Man-mode-map): + * net/newst-plainview.el (newsticker-mode-map): + * progmodes/cpp.el (cpp-edit-mode-map): + * progmodes/grep.el (grep-mode-map): + * progmodes/idlw-help.el (idlwave-help-mode-map): + * simple.el (special-mode-map): + * startup.el (splash-screen-keymap): + * view.el (view-mode-map): + Make S-SPC scroll in the opposite sense to SPC. (Bug#2145) + +2013-02-11 Elias Pipping + + * doc-view.el (doc-view-current-cache-dir): Beware % escapes + (bug#13679). + +2013-02-11 Stefan Monnier + + * cus-start.el (all): Remove inhibit-local-menu-bar-menus. + +2013-02-11 Glenn Morris + + * vc/diff.el (diff-use-labels): New variable. + (diff-no-select): Use --label rather than -L, and first + check that it is supported. (Bug#11067) + + * files.el (enable-dir-local-variables): New variable. + (hack-dir-local-variables): Respect enable-dir-local-variables. + * tutorial.el (help-with-tutorial): + Ignore directory-local variables. (Bug#11127) + + * vc/vc-svn.el (vc-svn-command): Move --non-interactive from here... + (vc-svn-global-switches): ... to here. (Bug#13513) + +2013-02-10 Christopher Schmidt + + * minibuf-eldef.el (minibuffer-default--in-prompt-regexps): + Handle "foo (bar, default: xxx): " prompts. + +2013-02-10 Chong Yidong + + * files.el (basic-save-buffer-1): Do not set + buffer-file-coding-system-explicit (Bug#4533). * mail/emacsbug.el (report-emacs-bug): Change binding of report-emacs-bug-insert-to-mailer to C-c M-i (Bug#13510). diff --cc src/ChangeLog index ed750032dd,62d33e15ec..31ffd36c06 --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,216 -1,52 +1,262 @@@ + 2013-02-13 Glenn Morris + + * keyboard.c (input-decode-map, key-translation-map): Doc fixes. + -2013-02-12 Paul Eggert ++2013-02-13 Paul Eggert + + Improve AIX port some more (Bug#13650). + With this, it should be as good as it was in 23.3, though it's + still pretty bad: the dumped emacs does not run. See Mark Fleishman in + http://lists.gnu.org/archive/html/help-gnu-emacs/2011-04/msg00287.html + * unexaix.c (start_of_text): Remove. + (_data, _text): Declare as char[], not int, as AIX manual suggests. + (bias, lnnoptr, text_scnptr, data_scnptr, load_scnptr) + (orig_load_scnptr, orig_data_scnptr): + Now off_t, not long, since they are file offsets. + (make_hdr): Use _data, not start_of_data (). + This is the key part of the fix. + (make_hdr, unrelocate_symbols): Use off_t for file offsets. + (unrelocate_symbols): Cast pointers to intptr_t, not to ulong. + + * pre-crt0.c (data_start): Initialize to 1. + This ports to compilers that optimize the external declaration + 'int x = 0;' as if it were 'int x;' to shrink the executable. + -2013-02-11 Paul Eggert - + Improve AIX port (Bug#13650). + This doesn't fix the bug, but it makes progress: Emacs builds now. + * unexaix.c: Include inttypes.h, stdarg.h. + (report_error, report_error_1): Mark as _Noreturn. + (report_error): Don't report the wrong errno. + (report_error_1): Now varargs. All callers changed. + (make_hdr): Use uintptr_t, not unsigned, when converting pointers + to unsigned. Don't use ADDR_CORRECT, as it no longer exists. + (write_ptr): Use %p to print address rather than %lx and a cast + to unsigned long. Grow buffer a bit, to be safer. + -2013-02-11 Eli Zaretskii ++2013-02-13 Eli Zaretskii + + * bidi.c (bidi_resolve_neutral): After finding the next + non-neutral character, accept NEUTRAL_ON type as well, because + directional control characters, such as LRE and RLE, have their + type converted to that by bidi_resolve_weak. This avoids aborts + when LRE/RLE follows a run of neutrals. + (bidi_move_to_visually_next): Assert that return value of + bidi_peek_at_next_level is non-negative. Negative values will + cause an infloop. + -2013-02-05 Daniel Colascione +2013-02-13 Paul Eggert + + Minor getenv-related fixes. + * callproc.c (Fcall_process_region) [!DOS_NT]: + Avoid unnecessary duplicate call to getenv. + * callproc.c (init_callproc): + * dispnew.c (init_display): + * sysdep.c (sys_subshell): + Omit unnecessary cast of getenv or egetenv. + +2013-02-13 Juanma Barranquero + + * makefile.w32-in ($(BLD)/filelock.$(O), $(BLD)/sysdep.$(O)): + Update dependencies. + +2013-02-12 Eli Zaretskii + + * xdisp.c (redisplay_internal): Don't set w->region_showing to the + marker's position. + (display_line): Set w->region_showing to the value of + it->region_beg_charpos, not to -1. This fixes redisplay + optimization when cursor is moved up after M->. (Bug#13623) + (Bug#13626) + (try_scrolling): Scroll text up more if point is too close to ZV + and inside the scroll margin. This makes sure point is moved + outside the scroll margin in these cases. + + * window.h (struct window): region_showing can no longer be + negative. + +2013-02-11 Paul Eggert + + Tune by using memchr and memrchr. + * doc.c (Fsnarf_documentation): + * fileio.c (Fsubstitute_in_file_name): + * search.c (find_newline, scan_newline): + * xdisp.c (pos_visible_p, display_count_lines): + Use memchr and memrchr rather than scanning byte-by-byte. + * search.c (find_newline): Rename from scan_buffer. + Omit first arg TARGET, as it's always '\n'. All callers changed. + + Clean up read_key_sequence a tiny bit more. + * keyboard.c (read_char_x_menu_prompt) [HAVE_MENUS]: + (read_key_sequence): Remove unused locals. + +2013-02-11 Stefan Monnier + + Clean up read_key_sequence a bit; reread active keymaps after first event. + * keyboard.c (read_char, read_char_x_menu_prompt) + (read_char_minibuf_menu_prompt): + Replace nmaps+maps with a single `map' arg. + (follow_key): Operate on a single map. + (active_maps): New function. + (test_undefined): Also return true for nil bindings. + (read_key_sequence): Use active_maps to replace the arrays of keymaps with + a single (composed) keymap. Remember `first_event' to choose the right + set of active keymaps. Recompute the set of keymaps after receiving + the first event. Remove GOBBLE_FIRST_EVENT. + (syms_of_keyboard): Remove inhibit_local_menu_bar_menus. + * keyboard.h (read_char): Update declaration. + * lread.c (read_filtered_event): Adjust call to read_char. + +2013-02-11 Eli Zaretskii + + * xdisp.c (move_it_vertically_backward, move_it_by_lines): + Don't use the limitation on backwards movement when lines are truncated + in the window. (Bug#13675) + +2013-02-11 Dmitry Antipov + + * marker.c (set_marker_internal): If desired position is passed + as a marker, avoid call to buf_charpos_to_bytepos. + * window.c (Fset_window_point): Omit redundant type checking. + (Fset_window_start): Likewise. Format comment. + (window_scroll_pixel_based): Use set_marker_restricted_both + with character and byte positions obtained from an iterator. + (Fset_window_configuration): Use set_marker_restricted_both. + * xdisp.c (message_dolog): Likewise. + +2013-02-10 Eli Zaretskii + + * xdisp.c (move_it_vertically_backward, move_it_by_lines): + When text lines are longer than window's screen lines, don't move back + too far. This speeds up some redisplay operations. (Bug#13675) + +2013-02-10 Dmitry Antipov + + * syntax.c (scan_sexps_forward): Fix byte position calculation + Bug#13664 (a.k.a Bug#13667) introduced with 2013-02-08 change. + +2013-02-10 Paul Eggert + + * fileio.c (Fexpand_file_name): Omit confusing pointer comparison + that was not needed. + +2013-02-09 Paul Eggert + + Minor hashing refactoring. + * fns.c (SXHASH_REDUCE): Move to lisp.h. + (sxhash_float): Return EMACS_UINT, for consistency with the other + hash functions. + * lisp.h (INTMASK): Now a macro, since SXHASH_REDUCE is now a + non-static inline function and therefore can't use static vars. + (SXHASH_REDUCE): Move here from fns.c, and make it inline. + * profiler.c (hashfn_profiler): Use SXHASH_REDUCE, to be consistent + with the other hash functions. + +2013-02-09 Eli Zaretskii + + * callproc.c (Fcall_process_region) [WINDOWSNT]: Make sure the + XXXXXX part of the temporary file pattern is not downcased even + when w32-downcase-file-names is non-nil. (Bug#13661) + + * xdisp.c (decode_mode_spec): Remove handling of %t. + + * msdos.c (careadlinkatcwd): Remove. + +2013-02-08 Stefan Monnier + + * lread.c (skip_dyn_bytes): New function (bug#12598). + (read1): Use it. Use getc instead of READCHAR to read bytes. + (load_each_byte): Remove. Update users. + +2013-02-08 Dmitry Antipov + + * search.c (scan_buffer): Calculate end byte position just once. + (scan_newline): Do not recalculate start_byte. + (search_command): Use eassert. + * syntax.c (struct lisp_parse_state): New member location_byte. + (scan_sexps_forward): Record from_byte and avoid redundant + character to byte position calculation ... + (Fparse_partial_sexp): ... here. Break too long line. + +2013-02-08 Dmitry Antipov + + * lisp.h (make_uninit_vector): New function. + * alloc.c (Fvector, Fmake_byte_code): + * ccl.c (Fregister_ccl_program): + * charset.c (Fdefine_charset_internal, define_charset_internal): + * coding.c (make_subsidiaries, Fdefine_coding_system_internal): + * composite.c (syms_of_composite): + * font.c (Fquery_font, Ffont_info, syms_of_font): + * fontset.c (FONT_DEF_NEW, Fset_fontset_font): + * ftfont.c (ftfont_shape_by_flt): + * indent.c (recompute_width_table): + * nsselect.m (clean_local_selection_data): + * syntax.c (init_syntax_once): + * w32unsubscribe.c (uniscribe_shape): + * window.c (Fcurrent_window_configuration): + * xfaces.c (Fx_family_fonts): + * xselect.c (selection_data_to_lisp_data): Use it. + +2013-02-07 Dmitry Antipov + + * coding.c (Fdefine_coding_system_internal): Use AREF where + argument is known to be a vector. + * fns.c (Flocale_info): Likewise for ASET. + * xselect.c (selection_data_to_lisp_data): Likewise for ASET. + * w32fns.c (w32_parse_hot_key): Likewise for ASIZE and AREF. + +2013-02-05 Jan Djärv + + * nsmenu.m (update_frame_tool_bar): Check for negative tool bar + height. + + * nsterm.h (HAVE_NATIVE_FS): Define if OSX => 10.7. + (EmacsView): Add fs_is_native, fsIsNative, isFullscreen and + updateCollectionBehaviour. + + * nsterm.m (NEW_STYLE_FS): Remove. + (ns_last_use_native_fullscreen): New variable. + (x_make_frame_visible): Replace NEW_STYLE_FS with isFullscreen. + (x_set_window_size): Do not take title bar and tool bar into account + if isFullscreen returns YES. + (ns_fullscreen_hook): Replace NEW_STYLE_FS with isFullscreen. + (check_native_fs): New function. + (ns_select, ns_read_socket): Call check_native_fs if HAVE_NATIVE_FS. + (ns_term_init): Remove NEW_STYLE_FS. + (updateFrameSize:, windowWillResize:toSize:): Only adjust for title bar + and tool bar if isFullscreen returns NO. + (windowDidResize:): Replace NEW_STYLE_FS with fsIsNative. + (initFrameFromEmacs:): Initialize fs_is_native. Replace NEW_STYLE_FS + with HAVE_NATIVE_FS. + (window:willUseFullScreenPresentationOptions:): New method. + (windowDidEnterFullScreen:): Replace NEW_STYLE_FS with fsIsNative. + Hide toolbar if not enabled (Bug#13444). + (windowDidExitFullScreen:): Call updateCollectionBehaviour. + Restore tool bar if enabled, hide it otherwise (Bug#13444). + (fsIsNative, isFullscreen, updateCollectionBehaviour): New methods. + (toggleFullScreen:): If fs_is_native, call toggleFullScreen on + window. Do no set FRAME_EXTERNAL_TOOL_BAR (f) to 0. + Check FRAME_EXTERNAL_TOOL_BAR (f) before restoring + FRAME_TOOLBAR_HEIGHT (f). Call updateFrameSize when going non-fs. + (syms_of_nsterm): Add ns-use-native-fullscreen. + +2013-02-04 Paul Eggert + + * fileio.c (Qchoose_write_coding_system): Now static. + +2013-02-04 Eli Zaretskii + + * xdisp.c (window_buffer_changed): region_showing can be negative, + which still means region is being displayed. + (redisplay_internal): Resurrect code that forced redisplay of the + whole window when showing region and the mark has changed. + Record the new mark position to allow redisplay optimizations. + (display_line): If it->region_beg_charpos is non-zero, set the + window's region_showing member to -1. (Bug#13623) (Bug#13626) + + * window.h (struct window) : Declare ptrdiff_t, + not bitfield of 1 bit. + +2013-02-03 Daniel Colascione * emacs.c: Use execvp, not execv, when DAEMON_MUST_EXEC, so that daemon mode works on cygw32 when Emacs is installed and not just