Merge from trunk

diff --cc lisp/dired.el
index c3d1435401e773c1aa8340869de0d7c89d6ccd1a,c3d1435401e773c1aa8340869de0d7c89d6ccd1a..0dc53bf32c4a870dbd0b980743c3c2f5f354d0f5
--- 1/lisp/dired.el
--- 2/lisp/dired.el
+++ b/lisp/dired.el
@@@ -3974,7 -3974,7 +3974,7 @@@ true then the type of the file linked t
  ;;;***
  \f
  ;;;### (autoloads (dired-do-relsymlink dired-jump) "dired-x" "dired-x.el"
--;;;;;;  "bb37ec379c0a523368794491b691fd8d")
++;;;;;;  "2f8d3d5a31b969b181e23c40d6bb16a0")
  ;;; Generated autoloads from dired-x.el
  
  (autoload 'dired-jump "dired-x" "\

diff --cc src/keyboard.c
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xfns.c
Simple merge

diff --cc src/xterm.c
Simple merge