From: Glenn Morris Date: Sat, 2 Feb 2013 03:38:21 +0000 (-0800) Subject: Merge from emacs-24; up to 2012-12-13T09:45:54Z!lekktu@gmail.com X-Git-Tag: emacs-24.3.90~173^2~7^2~165 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=94fbc901707d7c1fd7ec0471d288e585caf59b34;p=emacs.git Merge from emacs-24; up to 2012-12-13T09:45:54Z!lekktu@gmail.com --- 94fbc901707d7c1fd7ec0471d288e585caf59b34 diff --cc lisp/ChangeLog index d27b2a44c15,344a8d772da..13aacfc85dd --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,99 -1,36 +1,132 @@@ -2013-02-01 Stefan Monnier ++2013-02-02 Stefan Monnier + + * mouse.el (mouse-drag-track): Always deactivate the mark before + running the final event's command since that command is in charge of + activating the mark if needed (bug#13523). + -2013-02-01 Juri Linkov ++2013-02-02 Juri Linkov + + * replace.el (perform-replace): Move let-bindings of isearch-* + variables deeper to the loop that searches for the next match. + Add bindings for `isearch-nonincremental' and `isearch-adjusted'. + Use `isearch-search-fun-default' instead of `isearch-search-fun'. + (Bug#13579) + + * isearch.el (isearch-search-fun-default): Check for null + first element of isearch-cmds as a precaution when it's used + with inactive isearch. + -2013-02-01 Andrew W. Nosenko (tiny change) ++2013-02-02 Andrew W. Nosenko (tiny change) + + * net/tramp.el (tramp-check-for-regexp): Avoid "Args out of range" + error when buffer in question is narrowed so position 1 is out of + visible part. + -2013-01-31 Glenn Morris ++2013-02-02 Glenn Morris + + * textmodes/remember.el (remember-clipboard): Doc fix. + -2013-01-30 Stefan Monnier ++2013-02-02 Stefan Monnier + + * progmodes/make-mode.el (makefile-fill-paragraph): Reset syntax-table + properties (bug#13179). + +2013-02-02 Juri Linkov + + * progmodes/grep.el (grep-regexp-alist): Use variable grep-match-face + instead of hard-coded default face `match'. (Bug#9438) + +2012-02-01 Christopher Schmidt + + * vc/vc-arch.el (vc-arch-registered): + * vc/vc-bzr.el (vc-bzr-registered): + * vc/vc-cvs.el (vc-cvs-registered): + * vc/vc-git.el (vc-git-registered): + * vc/vc-hg.el (vc-hg-registered): + * vc/vc-mtn.el (vc-mtn-registered): + * vc/vc-svn.el (vc-svn-registered): Suppress load messages. + (Bug#13139) + + * info.el (Info-next-reference, Info-prev-reference): Add numeric + prefix argument. (Bug#11656) + +2013-02-01 Stefan Monnier + + * help-fns.el (help-split-fundoc): Don't insert byte-compiled body. + +2013-02-01 Glenn Morris + + * vc/vc-hooks.el (vc-menu-map): Disable vc-rollback menu item + if the backend is known not to support it. + + * imenu.el (imenu-default-create-index-function): + Tweak infinite loop test to check for forward motion as well as none. + +2013-02-01 Alex Harsanyi + + * net/soap-client.el (soap-invoke): Encode the string for + `url-request-data' as UTF-8. + Fixes . + +2013-02-01 Glenn Morris + + * calc/calc-help.el (calc-view-news): Use view-emacs-news. + + * calc/README, calc/README.prev: Rename/merge to etc/CALC-NEWS. + +2013-01-31 Michael Albinus + + * net/tramp.el (tramp-tramp-file-p): Comment check for + `string-as-unibyte'. The function does not exist on XEmacs, and + likely we need another approach. + + * net/tramp-sh.el (tramp-compute-multi-hops): Check, whether + `tramp-gw-*' variables are bound. + +2013-01-31 Glenn Morris + + * files.el (basic-save-buffer-2): Choose coding system for + writing the file before backing it up, to reduce delay between + backing up and writing the new version. (Bug#13522) + +2013-01-31 Michal Nazarewicz + + * simple.el (cycle-spacing): New command. + (just-one-space): Use it. + +2013-01-31 Stefan Monnier + + * progmodes/opascal.el: Rename from delphi.el. Use lexical-binding. + (opascal-newline-always-indents): Remove custom. + (opascal-tab, opascal-newline): Remove commands. + (opascal-new-comment-line): Insert "\n" instead of calling newline. + (opascal-mode-map): Keep default bindings for RET and TAB and DEL. + (opascal-save-match-data): Remove, use save-match-data instead. + (opascal-save-state): Use with-silent-modifications. + + * progmodes/pascal.el (pascal-mode-syntax-table): Accept //..\n comments + (bug#13585). + +2013-01-30 Juri Linkov + + * frame.el (toggle-frame-maximized, toggle-frame-fullscreen): + Use fullboth as an alias for fullscreen. Suggested by Jan Djärv in + . + +2013-01-30 Stefan Monnier + + * progmodes/make-mode.el (makefile-backslash-region): Don't compute + column if we're just deleting the backslashes. + (makefile-fill-paragraph): Use eolp. + +2013-01-30 Michael Albinus + + * autorevert.el (auto-revert-use-notify): Fix docstring. + +2013-01-30 Leo Liu + + * imenu.el (imenu--truncate-items): Fix subalist checking (bug#13576). + 2013-01-30 Glenn Morris * mouse.el (mouse-drag-line): Avoid pushing same event onto diff --cc src/ChangeLog index b4c3195973c,d09ad50ba12..302010ec769 --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,70 -1,14 +1,80 @@@ -2013-02-01 Eli Zaretskii ++2013-02-02 Eli Zaretskii + + * callproc.c (Fcall_process): Make sure program name in PATH and + new_argv[0] is encoded, if needed. Otherwise, un-encoded string + is passed to exec/spawnve, which fails unless the file-name + encoding is UTF-8. + + * w32proc.c (sys_spawnve): Make sure escape_char is initialized, + even if w32-quote-process-args is nil. + -2013-01-27 Eli Zaretskii +2013-02-01 Paul Eggert + + Fix timestamp bug when write-region appends nothing (Bug#13149). + * fileio.c (Fwrite_region): When neither O_EXCL nor O_TRUNC is used, + the file's time stamp doesn't change if Emacs happens to write nothing + to the file, and on a buggy file system this could cause Emacs to + incorrectly infer that the file system doesn't have the bug. + Avoid this problem by inhibiting the inference in this case. + +2013-02-01 Dmitry Antipov + + * window.h (struct window): Convert base_line_number, base_line_pos + and column_number_displayed members from Lisp_Object to ptrdiff_t. + Convert region_showing member from Lisp_Object to bitfield. + Remove sequence_number member. Adjust comments. + * window.c (sequence_number): Remove. + (make_window): Initialize column_number_displayed. + * print.c (print_object): Follow the printed representation of + frames and print window pointer to distinguish between windows. + (adjust_window_count): Invalidate base_line_pos. Adjust comment. + * xdisp.c (wset_base_line_number, wset_base_line_pos) + (wset_column_number_displayed, wset_region_showing): Remove. + (window_buffer_changed, mode_line_update_needed, redisplay_internal) + (try_scrolling, try_cursor_movement, redisplay_window) + (try_window_reusing_current_matrix, try_window_id, display_line) + (display_mode_lines, decode_mode_spec): Adjust users. + * .gdbinit (pwinx): Do not print sequence_number. + +2013-02-01 Paul Eggert + + Use fdopendir, fstatat and readlinkat, for efficiency (Bug#13539). + * conf_post.h (GNULIB_SUPPORT_ONLY_AT_FDCWD): Remove. + * dired.c: Include . + (open_directory): New function, which uses open and fdopendir + rather than opendir. DOS_NT platforms still use opendir, though. + (directory_files_internal, file_name_completion): Use it. + (file_attributes): New function, with most of the old Ffile_attributes. + (directory_files_internal, Ffile_attributes): Use it. + (file_attributes, file_name_completion_stat): First arg is now fd, + not dir name. All uses changed. Use fstatat rather than lstat + + stat. + (file_attributes): Use emacs_readlinkat rather than Ffile_symlink_p. + * fileio.c: Include , . + (emacs_readlinkat): New function, with much of the old + Ffile_symlink_p, but with an fd argument for speed. + It uses readlinkat rather than careadlinkatcwd, so that it + need not assume the working directory. + (Ffile_symlink_p): Use it. + * filelock.c (current_lock_owner): Use emacs_readlinkat + rather than emacs_readlink. + * lisp.h (emacs_readlinkat): New decl. + (READLINK_BUFSIZE, emacs_readlink): Remove. + * sysdep.c: Do not include , . + (emacs_norealloc_allocator, emacs_readlink): Remove. + This stuff is moved to fileio.c. + * w32.c (fstatat, readlinkat): New functions. + (careadlinkat): Don't check that fd == AT_FDCWD. + (careadlinkatcwd): Remove; no longer needed. + +2013-01-31 Glenn Morris + + * fileio.c (choose_write_coding_system): Make it callable from Lisp. + (Fwrite_region): Update for new choose_write_coding_system args. + Move the last piece of choose_write_coding_system here. (Bug#13522) + (syms_of_fileio): Add choose-write-coding-system. + +2013-01-30 Eli Zaretskii * w32.c (sys_open): Zero out the flags for the new file descriptor. (sys_close): Zero out the flags for the file descriptor before diff --cc src/callproc.c index 5eba3271358,c4177d5044c..9d81bb18295 --- a/src/callproc.c +++ b/src/callproc.c @@@ -445,28 -416,34 +445,34 @@@ usage: (call-process PROGRAM &optional path = Fsubstring (path, make_number (2), Qnil); new_argv = SAFE_ALLOCA ((nargs > 4 ? nargs - 2 : 2) * sizeof *new_argv); - if (nargs > 4) - { - ptrdiff_t i; - struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5; - GCPRO5 (infile, buffer, current_dir, path, error_file); - argument_coding.dst_multibyte = 0; - for (i = 4; i < nargs; i++) - { - argument_coding.src_multibyte = STRING_MULTIBYTE (args[i]); - if (CODING_REQUIRE_ENCODING (&argument_coding)) - /* We must encode this argument. */ - args[i] = encode_coding_string (&argument_coding, args[i], 1); - } - UNGCPRO; - for (i = 4; i < nargs; i++) - new_argv[i - 3] = SSDATA (args[i]); - new_argv[i - 3] = 0; - } - else - new_argv[1] = 0; - new_argv[0] = SSDATA (path); + { + struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5; + + GCPRO5 (infile, buffer, current_dir, path, error_file); + if (nargs > 4) + { + ptrdiff_t i; + + argument_coding.dst_multibyte = 0; + for (i = 4; i < nargs; i++) + { + argument_coding.src_multibyte = STRING_MULTIBYTE (args[i]); + if (CODING_REQUIRE_ENCODING (&argument_coding)) + /* We must encode this argument. */ + args[i] = encode_coding_string (&argument_coding, args[i], 1); + } + for (i = 4; i < nargs; i++) - new_argv[i - 3] = SDATA (args[i]); ++ new_argv[i - 3] = SSDATA (args[i]); + new_argv[i - 3] = 0; + } + else + new_argv[1] = 0; + if (STRING_MULTIBYTE (path)) + path = ENCODE_FILE (path); - new_argv[0] = SDATA (path); ++ new_argv[0] = SSDATA (path); + UNGCPRO; + } #ifdef MSDOS /* MW, July 1993 */