Merge from emacs-24; up to 2014-04-16T15:28:06Z!eggert@cs.ucla.edu

diff --cc admin/ChangeLog
index c28ff68,c1be3da..7af23b7
--- 1/admin/ChangeLog
--- 2/admin/ChangeLog
+++ b/admin/ChangeLog
@@@ -1,17 -1,9 +1,23 @@@
 -2014-04-17  Paul Eggert  <eggert@cs.ucla.edu>
++2014-04-18  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+       * notes/bzr: Update instructions for merging from gnulib.
+       Remove obsolete note about tramp.el and tramp-sh.el.
+       Change "emacs-23" to "emacs-24".
+ 
 +2014-04-11  Glenn Morris  <rgm@gnu.org>
 +
 +      * grammars/Makefile.in (EMACSDATA, EMACSDOC, EMACSPATH): Unexport.
 +
 +2014-03-22  Glenn Morris  <rgm@gnu.org>
 +
 +      * quick-install-emacs (AVOID): Remove testfile and test-distrib.
 +
 +2014-03-21  Glenn Morris  <rgm@gnu.org>
 +
 +      * update_autogen: Auto-detect VCS in use.
 +      (vcs): New variable.
 +      (status, commit, main): Handle git.
 +
  2014-03-07  Paul Eggert  <eggert@cs.ucla.edu>
  
        Fix oversight preventing lib/sys/types.h from being generated.

diff --cc lisp/ChangeLog
index ab9240c,729c0b2..9078046
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,43 -1,26 +1,60 @@@
 -2014-04-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 2014-04-18  Michael Albinus  <michael.albinus@gmx.de>
+ 
+       * net/tramp.el (tramp-run-real-handler, tramp-file-name-handler):
+       Do not autoload.
+       (tramp-file-name-handler, tramp-completion-file-name-handler):
+       Revert patch from 2014-04-10, it isn't necessary anymore.
+       (tramp-autoload-file-name-handler)
+       (tramp-register-autoload-file-name-handlers): New defuns.
+       (top): Autoload call of `tramp-register-autoload-file-name-handlers'.
+       (tramp-register-file-name-handlers): Remove also
+       `tramp-autoload-file-name-handler' from `file-name-handler-list'.
+       Do not autoload its invocation, but eval it after loading of 'tramp.
+ 
+       * net/tramp-adb.el (tramp-unload-hook): Unload `tramp-adb'.
+ 
+       * net/tramp-compat.el (tramp-unload-hook): Unload `tramp-loaddefs'.
+ 
 +2014-04-17  Daniel Colascione  <dancol@dancol.org>
 +
 +      Add support for bracketed paste mode; add infrastructure for
 +      managing terminal mode enabling and disabling automatically.
 +
 +      * xt-mouse.el:
 +      (xterm-mouse-mode): Simplify.
 +      (xterm-mouse-tracking-enable-sequence)
 +      (xterm-mouse-tracking-disable-sequence): New constants.
 +      (turn-on-xterm-mouse-tracking-on-terminal)
 +      (turn-off-xterm-mouse-tracking-on-terminal): Use
 +      tty-mode-set-strings and tty-mode-reset-strings terminal
 +      parameters instead of random hooks.
 +      (turn-on-xterm-mouse-tracking)
 +      (turn-off-xterm-mouse-tracking): Delete.
 +
 +      * term/xterm.el (xterm-extra-capabilities): Fix bitrotted comment.
 +      (xterm-paste-ending-sequence): New constant.
 +      (xterm-paste): New command used for bracketed paste support.
 +
 +      (xterm-modify-other-keys-terminal-list): Delete obsolete variable.
 +      (terminal-init-xterm-bracketed-paste-mode): New function.
 +      (terminal-init-xterm): Call it.
 +      (terminal-init-xterm-modify-other-keys): Use tty-mode-set-strings
 +      and tty-mode-reset-strings instead of random hooks.
 +      (xterm-turn-on-modify-other-keys)
 +      (xterm-turn-off-modify-other-keys)
 +      (xterm-remove-modify-other-keys): Delete obsolete functions.
 +
 +      * term/screen.el: Rewrite to just use the xterm code.  Add
 +      copyright notice.  Mention tmux.
 +
 +2014-04-17  Ian D  <dunni@gnu.org>  (tiny change)
 +
 +      * image-mode.el (image-mode-window-put): Also update the property of
 +      the "default window".
 +      * doc-view.el (doc-view-new-window-function): If no window
 +      exists, move to the last known page.
  
 -      * nxml/nxml-mode.el (nxml-fontify-matcher): Make sure propertization
 -      was done (bug#17264).
 -      * nxml/xmltok.el (xmltok-scan-after-comment-open): Extend unclosed
 -      comment to EOB.
 +2014-04-16  Stefan Monnier  <monnier@iro.umontreal.ca>
  
        * progmodes/perl-mode.el (perl-calculate-indent): Don't auto-indent in
        here-documents (bug#17262).

diff --cc src/ChangeLog
index 96c46d0,e7b8384..34ae84c
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,19 -1,27 +1,38 @@@
 -2014-04-18  Eli Zaretskii  <eliz@gnu.org>
 -
 -      * xdisp.c (insert_left_trunc_glyphs): Ensure the left truncation
 -      glyph is written to TEXT_AREA of the temporary glyph_row.
 -      (Bug#17288)
 -
+ 2014-04-18  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+       * emacs.c (close_output_streams): Don't clear and restore errno.
+ 
 -2014-04-17  Jan Djärv  <jan.h.d@swipnet.se>
++2014-04-18  Jan Djärv  <jan.h.d@swipnet.se>
+ 
+       * xterm.c (x_make_frame_visible): Prevent endless loop when frame
+       never becomes visible, i.e. using XMonad  (Bug#17237).
+ 
 -2014-04-17  Eli Zaretskii  <eliz@gnu.org>
++2014-04-18  Eli Zaretskii  <eliz@gnu.org>
+ 
 -      * xdisp.c (Fline_pixel_height): Don't assume that the current
 -      buffer and the selected window's buffer are one and the same.
 -      (Bug#17281)
++      * xdisp.c (insert_left_trunc_glyphs): Ensure the left truncation
++      glyph is written to TEXT_AREA of the temporary glyph_row.  (Bug#17288)
++      (Fline_pixel_height): Don't assume that the current buffer and the
++      selected window's buffer are one and the same.  (Bug#17281)
+ 
+       * insdel.c (invalidate_buffer_caches): Invalidate the bidi
+       paragraph-start cache before the newline cache.  (Bug#17269)
+ 
 +2014-04-17  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      * term.c (tty_send_additional_strings): No need to fflush here,
 +      as callers fflush.
 +      (tty_set_terminal_modes): fflush after sending additional strings,
 +      not before.
 +
 +2014-04-17  Daniel Colascione  <dancol@dancol.org>
 +
 +      * term.c (Qtty_mode_set_strings, Qtty_mode_reset_strings): New
 +      symbols.
 +      (tty_send_additional_strings): New function.
 +      (tty_set_terminal_modes, tty_reset_terminal_modes): Use it.
 +      (syms_of_term): Intern tty-mode-set-strings and
 +      tty-mode-reset-strings.
 +
  2014-04-16  Stefan Monnier  <monnier@iro.umontreal.ca>
  
        * window.c (save_window_save): Lookup window_point_insertion_type in

diff --cc src/emacs.c
Simple merge

diff --cc src/insdel.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xterm.c
Simple merge

diff --cc test/ChangeLog
index 504cf85,0d8dd76..4986280
--- 1/test/ChangeLog
--- 2/test/ChangeLog
+++ b/test/ChangeLog
@@@ -1,8 -1,19 +1,23 @@@
 -2014-04-10  Paul Eggert  <eggert@cs.ucla.edu>
+ 2014-04-18  Michael Albinus  <michael.albinus@gmx.de>
+ 
+       * automated/tramp-tests.el (tramp-copy-size-limit): Set to nil.
+       (tramp--test-make-temp-name): Optional argument LOCAL.
+       (tramp--instrument-test-case): Show messages.  Catch also `quit'.
+       (tramp-test10-write-region): No special test for out-of-band copy
+       needed anymore.
+       (tramp-test11-copy-file, tramp-test12-rename-file)
+       (tramp-test21-file-links): Extend tests.
+       (tramp-test20-file-modes): More robust check for user "root".
+       (tramp--test-check-files): New defun.
+       (tramp-test30-special-characters, tramp-test33-recursive-load)
+       (tramp-test34-unload): New tests.
+       (tramp-test31-utf8, tramp-test32-asynchronous-requests):  Rename.
+ 
 +2014-04-11  Glenn Morris  <rgm@gnu.org>
 +
 +      * automated/Makefile.in (EMACSDATA, EMACSDOC, EMACSPATH): Unexport.
 +
 +2014-04-11  Paul Eggert  <eggert@cs.ucla.edu>
  
        * automated/electric-tests.el: Fix spelling error in test name.
        (whitespace-skipping-for-quotes-not-outside):