merge upstream

44 files changed, 1477 insertions, 609 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4c6b23dac0b..4203e05aed8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,324 @@
+2014-12-30  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * Makefile.in (semantic): Simplify.
+
+2014-12-30  Juri Linkov  <juri@linkov.net>
+
+        * net/eww.el (eww-isearch-next-buffer): New function.
+        (eww-mode): Set multi-isearch-next-buffer-function to it.
+
+2014-12-30  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * progmodes/xref.el (xref-find-definitions): Mention "no
+        identifier at point" case in the docstring.
+
+        * menu-bar.el (menu-bar-goto-uses-etags-p): New function.
+        (menu-bar-goto-menu): Use it to show or hide the `set-tags-name'
+        and `separator-tag-file' items.
+
+2014-12-29  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * obsolete/pc-select.el (pc-selection-mode): Use system-type.
+        This is instead of system-name, which is both wrong here and obsolete.
+
+2014-12-29  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * menu-bar.el (menu-bar-next-tag-other-window)
+        (menu-bar-next-tag): Remove.
+
+2014-12-29  K. Handa  <handa@gnu.org>
+
+        * international/mule.el (make-translation-table-from-alist):
+        Accept nil or zero-length vector for FROM and TO.
+
+2014-12-29  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * net/eww.el (eww-mode): Truncate overlong lines for prettier
+        display when resizing.
+
+        * net/shr.el (shr-width): Default to using the window width when
+        rendering.
+
+2014-12-29  Dmitry Gutov  <dgutov@yandex.ru>
+
+        Unbreak jumping to an alias's definition.
+
+        * emacs-lisp/find-func.el (find-function-library): Return a pair
+        (ORIG-FUNCTION . LIBRARY) instead of just its second element.
+        (find-function-noselect): Use it.
+
+        * progmodes/elisp-mode.el (elisp--xref-identifier-file): Rename to
+        `elisp--xref-identifier-location', incorporate logic from
+        `elisp--xref-find-definitions', use the changed
+        `find-function-library' return value.
+
+2014-12-29  Juri Linkov  <juri@linkov.net>
+
+        * comint.el (comint-history-isearch-message): Use field-beginning
+        instead of comint-line-beginning-position - that's more fixes for
+        http://lists.gnu.org/archive/html/emacs-devel/2014-12/msg00305.html
+        (comint-history-isearch-message): Fix args of isearch-message-prefix.
+
+2014-12-29  Juri Linkov  <juri@linkov.net>
+
+        * vc/vc-dir.el (vc-dir-display-file): New command (bug#19450).
+        (vc-dir-mode-map): Bind it to "\C-o".
+        (vc-dir-menu-map): Add it to menu.
+
+2014-12-29  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * progmodes/etags.el (find-tag-other-window)
+        (find-tag-other-frame, find-tag-regexp, tags-loop-continue)
+        (tags-apropos): Declare obsolete.
+
+        * menu-bar.el (menu-bar-goto-menu): Replace all but one etags item
+        with xref ones.
+
+2014-12-28  Eli Zaretskii  <eliz@gnu.org>
+
+        * international/mule.el (define-coding-system): Fix typos in the
+        doc string.
+
+2014-12-28  Kenichi Handa  <handa@gnu.org>
+
+        * international/mule.el (define-coding-system): Improve the doc
+        string.
+
+2014-12-28  Ivan Shmakov  <ivan@siamics.net>
+
+        * net/shr.el (shr-tag-table): Fix handling of tbody/header/footer
+        elements in tables (bug#19444).
+
+        * net/eww.el (eww-handle-link): Fix typo in "up" rel handling
+        (bug#19445).
+
+2014-12-28  Juri Linkov  <juri@linkov.net>
+
+        * vc/compare-w.el: Require diff-mode for diff faces.
+        (compare-windows-removed, compare-windows-added): New faces
+        inheriting from diff faces.
+        (compare-windows): Define obsolete face alias.
+        (compare-windows-highlight): Replace face `compare-windows' with
+        new faces `compare-windows-added' and `compare-windows-removed'
+        (bug#19451).
+        (compare-windows-get-recent-window): Signal an error when
+        no other window is found (bug#19170).
+
+2014-12-27  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * progmodes/elisp-mode.el (elisp--xref-identifier-file):
+        Skip features that have no sources.
+
+        * simple.el (execute-extended-command):
+        When `suggest-key-bindings' is nil, don't.
+
+2014-12-27  Fabián Ezequiel Gallina  <fgallina@gnu.org>
+
+        python.el: Native readline completion.
+
+        * progmodes/python.el (python-shell-completion-native-disabled-interpreters)
+        (python-shell-completion-native-enable)
+        (python-shell-completion-native-output-timeout): New defcustoms.
+        (python-shell-completion-native-interpreter-disabled-p)
+        (python-shell-completion-native-try)
+        (python-shell-completion-native-setup)
+        (python-shell-completion-native-turn-off)
+        (python-shell-completion-native-turn-on)
+        (python-shell-completion-native-turn-on-maybe)
+        (python-shell-completion-native-turn-on-maybe-with-msg)
+        (python-shell-completion-native-toggle): New functions.
+        (python-shell-completion-native-get-completions): New function.
+        (python-shell-completion-at-point): Use it.
+
+2014-12-27  Fabián Ezequiel Gallina  <fgallina@gnu.org>
+
+        python.el: Enhance shell user interaction and deprecate
+        python-shell-get-or-create-process.
+
+        * progmodes/python.el
+        (python-shell-get-process-or-error): New function.
+        (python-shell-with-shell-buffer): Use it.
+        (python-shell-send-string, python-shell-send-region)
+        (python-shell-send-buffer, python-shell-send-defun)
+        (python-shell-send-file, python-shell-switch-to-shell): Use it.
+        Add argument MSG to display user-friendly message when no process
+        is running.
+        (python-shell-switch-to-shell): Call pop-to-buffer with NORECORD.
+        (python-shell-make-comint): Rename argument SHOW from POP.  Use
+        display-buffer instead of pop-to-buffer.
+        (run-python): Doc fix.  Return process.
+        (python-shell-get-or-create-process): Make obsolete.
+
+2014-12-27  Fabián Ezequiel Gallina  <fgallina@gnu.org>
+
+        * progmodes/python.el (python-shell-buffer-substring): Handle
+        cornercase when region sent starts at point-min.
+
+2014-12-27  Eli Zaretskii  <eliz@gnu.org>
+
+        * language/misc-lang.el (composition-function-table): Add Syriac
+        characters and also ZWJ/ZWNJ.  See
+        http://lists.gnu.org/archive/html/help-gnu-emacs/2014-12/msg00248.html
+        for the details.
+
+2014-12-27  Fabián Ezequiel Gallina  <fgallina@gnu.org>
+
+        python.el: Fix message when sending region.
+
+        * progmodes/python.el (python-shell-send-region): Rename argument
+        send-main from nomain.  Fix message.
+        (python-shell-send-buffer): Rename argument send-main from arg.
+
+2014-12-27  Fabián Ezequiel Gallina  <fgallina@gnu.org>
+
+        python.el: Cleanup temp files even with eval errors.
+
+        * progmodes/python.el (python-shell-send-file): Make file-name
+        mandatory.  Fix temp file removal in the majority of cases.
+
+2014-12-27  Fabián Ezequiel Gallina  <fgallina@gnu.org>
+
+        python.el: Handle file encoding for shell.
+
+        * progmodes/python.el (python-rx-constituents): Add coding-cookie.
+        (python-shell--save-temp-file): Write file with proper encoding.
+        (python-shell-buffer-substring): Add coding cookie for detected
+        encoding to generated content.  Fix blank lines when removing
+        if-name-main block.
+        (python-shell-send-file): Handle file encoding.
+        (python-info-encoding-from-cookie)
+        (python-info-encoding): New functions.
+
+2014-12-27  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band):
+        Use `tramp-rsh-end-of-line', it ought to be more robust.
+
+2014-12-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/js.el (js-syntax-propertize): "return" can't be divided
+        (bug#19397).
+
+2014-12-27  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-read-passwd): Ignore errors from `auth-source-*'.
+
+        * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Use "\n"
+        as end-of-line delimeter for passwords, when running on MS Windows.
+
+2014-12-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/sh-script.el (sh-set-shell): Don't change the global value
+        of indent-line-function (bug#19433).
+
+2014-12-27  Fabián Ezequiel Gallina  <fgallina@gnu.org>
+
+        Fix line numbers on Python shell.
+        * progmodes/python.el (python-shell--save-temp-file): Do not
+        append coding cookie.
+        (python-shell-send-string): Generalize for
+        python-shell-send-region.
+        (python--use-fake-loc): Delete var.
+        (python-shell-buffer-substring): Cleanup fake-loc logic.
+        (python-shell-send-region): Remove fake-loc logic, simplify.
+
+2014-12-27  Fabián Ezequiel Gallina  <fgallina@gnu.org>
+
+        * progmodes/python.el (python-indent-post-self-insert-function):
+        Make colon to re-indent only for dedenters, handling
+        multiline-statements gracefully.
+
+2014-12-27  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-handle-insert-file-contents):
+        Set `find-file-not-found-functions' in case of errors.  (Bug#18623)
+
+2014-12-27  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-sh.el (tramp-send-command-and-read): New optional
+        arg MARKER.
+        (tramp-get-remote-path): Use it.
+
+2014-12-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * lisp/subr.el (redisplay-dont-pause): Mark as obsolete.
+
+2014-12-27  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-error-with-buffer): Call `message' properly.
+        (tramp-accept-process-output): Use nil as argument for
+        `accept-process-output', when there is a gateway prepended.
+
+        * net/tramp-gw.el (tramp-gw-open-connection): Suppress traces in
+        wrong debug buffer.
+        (tramp-gw-open-connection): Set process coding system 'binary.
+        (tramp-gw-open-network-stream): Handle HTTP error 403.
+
+        * net/tramp-sh.el (tramp-compute-multi-hops): Suppress traces in
+        wrong debug buffer.
+        (tramp-maybe-open-connection): Set connection property "gateway".
+
+2014-12-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * subr.el (sit-for): Tweak docstring (bug#19381).
+
+2014-12-27  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * vc/vc-git.el (vc-git-after-dir-status-stage): Move `up-to-date'
+        stage to after `diff-index' (bug#19386).
+
+2014-12-27  João Távora  <joaotavora@gmail.com>
+
+        * textmodes/tex-mode.el (tex-insert-quote): Consider and respect
+        `electric-pair-mode' (bug#19356).
+
+2014-12-27  Dmitry Gutov  <dgutov@yandex.ru>
+
+        elisp-xref-find: Don't create buffers eagerly.
+
+        * progmodes/elisp-mode.el (elisp--identifier-location): Fold back
+        into `elisp--company-location'.
+        (elisp--identifier-completion-table): Rename to
+        `elisp--identifier-completion-table', and do not include just any
+        symbols with a property list.
+        (elisp-completion-at-point): Revert the 2014-12-25 change.
+        (elisp--xref-identifier-file): New function.
+        (elisp--xref-find-definitions): Use it.
+
+        * emacs-lisp/find-func.el (find-function-library): New function,
+        extracted from `find-function-noselect'.
+
+        * progmodes/xref.el (xref-elisp-location): New class.
+        (xref-make-elisp-location): New function.
+        (xref-location-marker): New implementation.
+
+2014-12-27  Juri Linkov  <juri@linkov.net>
+
+        * minibuffer.el (minibuffer-completion-help):
+        Use shrink-window-if-larger-than-buffer in window-height
+        when temp-buffer-resize-mode is nil.
+
+        * window.el (with-displayed-buffer-window): Remove window-height
+        from the action alist in the temp-buffer-window-show call
+        when window-height is handled explicitly afterwards (bug#19355).
+
+2014-12-27  Juri Linkov  <juri@linkov.net>
+
+        Support subdirectories when saving places in dired.
+        * saveplace.el (toggle-save-place, save-place-to-alist)
+        (save-places-to-alist, save-place-dired-hook):
+        Use dired-current-directory instead of dired-directory (bug#19436).
+        (save-place-dired-hook): Add check for alist to make the new
+        format future-proof to allow other possible formats.
+
+2014-12-26  Fabián Ezequiel Gallina  <fgallina@gnu.org>
+
+        python.el: Generate clearer shell buffer names.
+
+        * progmodes/python.el (python-shell-get-process-name)
+        (python-shell-internal-get-process-name): Use `buffer-name`.
+        (python-shell-internal-get-or-create-process): Simplify.
+
 2014-12-26  Dmitry Gutov  <dgutov@yandex.ru>
 
         Add basic xref apropos implementation to elisp-mode.
@@ -9,6 +330,11 @@
 
         * progmodes/xref.el (xref--show-xrefs): Use `user-error'.
 
+2014-12-25  Filipp Gunbin  <fgunbin@fastmail.fm>
+
+        * dired-aux.el (dired-maybe-insert-subdir): Make
+        dired-maybe-insert-subdir always skip trivial files.
+
 2014-12-25  Helmut Eller  <eller.helmut@gmail.com>
             Dmitry Gutov  <dgutov@yandex.ru>
 
@@ -4645,12 +4971,6 @@
 
 2014-07-28  Fabián Ezequiel Gallina  <fgallina@gnu.org>
 
-        Prevent Python process shell buffer to pop twice.
-        * progmodes/python.el (python-shell-switch-to-shell): Do not call
-        pop-to-buffer.
-
-2014-07-28  Fabián Ezequiel Gallina  <fgallina@gnu.org>
-
         * progmodes/python.el
         (python-shell-with-shell-buffer): New macro.
         (python-shell-font-lock-get-or-create-buffer)
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index f22ca69996b..ba2a2292cbd 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -325,13 +325,8 @@ compile-clean:
 leim:
         $(MAKE) -C ../leim all EMACS="$(EMACS)"
 
-# FIXME.  Yuck.
 semantic:
-        case ${EMACS} in \
-          .*) EMACS="../${EMACS}" ;; \
-           *) EMACS="${EMACS}" ;; \
-        esac; \
-        $(MAKE) -C ../admin/grammars all EMACS="$${EMACS}"
+        $(MAKE) -C ../admin/grammars all EMACS="$(EMACS:.%=../.%)"
 
 # Compile all Lisp files, but don't recompile those that are up to
 # date.  Some .el files don't get compiled because they set the
diff --git a/lisp/comint.el b/lisp/comint.el
index 3085052087c..4acaa30db91 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -1532,14 +1532,20 @@ the function `isearch-message'."
     ;; the initial comint prompt.
     (if (overlayp comint-history-isearch-message-overlay)
         (move-overlay comint-history-isearch-message-overlay
-                      (save-excursion (forward-line 0) (point))
-                      (comint-line-beginning-position))
+                      (save-excursion
+                        (goto-char (field-beginning))
+                        (forward-line 0)
+                        (point))
+                      (field-beginning))
       (setq comint-history-isearch-message-overlay
-            (make-overlay (save-excursion (forward-line 0) (point))
-                          (comint-line-beginning-position)))
+            (make-overlay (save-excursion
+                            (goto-char (field-beginning))
+                            (forward-line 0)
+                            (point))
+                          (field-beginning)))
       (overlay-put comint-history-isearch-message-overlay 'evaporate t))
     (overlay-put comint-history-isearch-message-overlay
-                 'display (isearch-message-prefix c-q-hack ellipsis))
+                 'display (isearch-message-prefix ellipsis isearch-nonincremental))
     (if (and comint-input-ring-index (not ellipsis))
         ;; Display the current history index.
         (message "History item: %d" (1+ comint-input-ring-index))
diff --git a/lisp/desktop.el b/lisp/desktop.el
index 75bced49c2f..6ca396a1132 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -940,7 +940,7 @@ Frames with a non-nil `desktop-dont-save' parameter are not saved."
         (and desktop-restore-frames
              (frameset-save nil
                             :app desktop--app-id
-                            :name (concat user-login-name "@" system-name)
+                            :name (concat user-login-name "@" (system-name))
                             :predicate #'desktop--check-dont-save))))
 
 ;;;###autoload
diff --git a/lisp/dired.el b/lisp/dired.el
index 909ba22985a..7f7251f29ce 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -3884,7 +3884,7 @@ Ask means pop up a menu for the user to select one of copy, move or link."
 
 ;;; Start of automatically extracted autoloads.
 
-;;;### (autoloads nil "dired-aux" "dired-aux.el" "1448837b5f3e2b9ad63f723361f1e32e")
+;;;### (autoloads nil "dired-aux" "dired-aux.el" "73269f48e7fe2fd0ac580fd69252b33a")
 ;;; Generated autoloads from dired-aux.el
 
 (autoload 'dired-diff "dired-aux" "\
diff --git a/lisp/dnd.el b/lisp/dnd.el
index 73b531dfd16..3fda471497f 100644
--- a/lisp/dnd.el
+++ b/lisp/dnd.el
@@ -122,17 +122,18 @@ Return nil if URI is not a local file."
 
   ;; The hostname may be our hostname, in that case, convert to a local
   ;; file.  Otherwise return nil.  TODO:  How about an IP-address as hostname?
-  (let ((hostname (when (string-match "^file://\\([^/]*\\)" uri)
+  (let ((sysname (system-name)))
+    (let ((hostname (when (string-match "^file://\\([^/]*\\)" uri)
                       (downcase (match-string 1 uri))))
-        (system-name-no-dot
-         (downcase (if (string-match "^[^\\.]+" system-name)
-                       (match-string 0 system-name)
-                     system-name))))
-    (when (and hostname
-             (or (string-equal "localhost" hostname)
-                 (string-equal (downcase system-name) hostname)
-                 (string-equal system-name-no-dot hostname)))
-        (concat "file://" (substring uri (+ 7 (length hostname)))))))
+          (sysname-no-dot
+           (downcase (if (string-match "^[^\\.]+" sysname)
+                         (match-string 0 sysname)
+                       sysname))))
+      (when (and hostname
+                 (or (string-equal "localhost" hostname)
+                     (string-equal (downcase sysname) hostname)
+                     (string-equal sysname-no-dot hostname)))
+        (concat "file://" (substring uri (+ 7 (length hostname))))))))
 
 (defsubst dnd-unescape-uri (uri)
   (replace-regexp-in-string
diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el
index c372117b104..3131be09eb1 100644
--- a/lisp/emacs-lisp/find-func.el
+++ b/lisp/emacs-lisp/find-func.el
@@ -311,6 +311,45 @@ The search is done in the source for library LIBRARY."
                   (cons (current-buffer) (point)))
               (cons (current-buffer) nil))))))))
 
+(defun find-function-library (function &optional lisp-only verbose)
+  "Return the pair (ORIG-FUNCTION . LIBRARY) for FUNCTION.
+
+ORIG-FUNCTION is the original name, after removing all advice and
+resolving aliases.  LIBRARY is an absolute file name, a relative
+file name inside the C sources directory, or a name of an
+autoloaded feature.
+
+If ORIG-FUNCTION is a built-in function and LISP-ONLY is non-nil,
+signal an error.
+
+If VERBOSE is non-nil, and FUNCTION is an alias, display a
+message about the whole chain of aliases."
+  (let ((def (symbol-function (find-function-advised-original function)))
+        aliases)
+    ;; FIXME for completeness, it might be nice to print something like:
+    ;; foo (which is advised), which is an alias for bar (which is advised).
+    (while (symbolp def)
+      (or (eq def function)
+          (not verbose)
+          (if aliases
+              (setq aliases (concat aliases
+                                    (format ", which is an alias for `%s'"
+                                            (symbol-name def))))
+            (setq aliases (format "`%s' is an alias for `%s'"
+                                  function (symbol-name def)))))
+      (setq function (symbol-function (find-function-advised-original function))
+            def (symbol-function (find-function-advised-original function))))
+    (if aliases
+        (message "%s" aliases))
+    (cons function
+          (cond
+           ((autoloadp def) (nth 1 def))
+           ((subrp def)
+            (if lisp-only
+                (error "%s is a built-in function" function))
+            (help-C-file-name def 'subr))
+           ((symbol-file function 'defun))))))
+
 ;;;###autoload
 (defun find-function-noselect (function &optional lisp-only)
   "Return a pair (BUFFER . POINT) pointing to the definition of FUNCTION.
@@ -329,30 +368,8 @@ searched for in `find-function-source-path' if non-nil, otherwise
 in `load-path'."
   (if (not function)
     (error "You didn't specify a function"))
-  (let ((def (symbol-function (find-function-advised-original function)))
-        aliases)
-    ;; FIXME for completeness, it might be nice to print something like:
-    ;; foo (which is advised), which is an alias for bar (which is advised).
-    (while (symbolp def)
-      (or (eq def function)
-          (if aliases
-              (setq aliases (concat aliases
-                                    (format ", which is an alias for `%s'"
-                                            (symbol-name def))))
-            (setq aliases (format "`%s' is an alias for `%s'"
-                                  function (symbol-name def)))))
-      (setq function (symbol-function (find-function-advised-original function))
-            def (symbol-function (find-function-advised-original function))))
-    (if aliases
-        (message "%s" aliases))
-    (let ((library
-           (cond ((autoloadp def) (nth 1 def))
-                 ((subrp def)
-                  (if lisp-only
-                      (error "%s is a built-in function" function))
-                  (help-C-file-name def 'subr))
-                 ((symbol-file function 'defun)))))
-      (find-function-search-for-symbol function nil library))))
+  (let ((func-lib (find-function-library function lisp-only t)))
+    (find-function-search-for-symbol (car func-lib) nil (cdr func-lib))))
 
 (defun find-function-read (&optional type)
   "Read and return an interned symbol, defaulting to the one near point.
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 6f0ea0f57de..0007b15a76a 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-29  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * mm-decode.el (mm-shr): Bind `shr-width' to `fill-column' so that
+        lines don't get overlong when responding.
+
 2014-12-18  Paul Eggert  <eggert@cs.ucla.edu>
 
         * registry.el (registry-db): Set default slot later.
diff --git a/lisp/gnus/gnus-cloud.el b/lisp/gnus/gnus-cloud.el
index ec016eeeb77..a42bcc06e94 100644
--- a/lisp/gnus/gnus-cloud.el
+++ b/lisp/gnus/gnus-cloud.el
@@ -329,6 +329,15 @@
 (defun gnus-cloud-server-p (server)
   (member server gnus-cloud-covered-servers))
 
+(defun gnus-cloud-collect-full-newsrc ()
+  (let ((infos nil))
+    (dolist (info (cdr gnus-newsrc-alist))
+      (when (gnus-cloud-server-p
+             (gnus-method-to-server
+              (gnus-find-method-for-group (gnus-info-group info))))
+        (push info infos)))
+    ))
+
 (provide 'gnus-cloud)
 
 ;;; gnus-cloud.el ends here
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index d58a2922217..ee5d824a852 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -5849,7 +5849,7 @@ give as trustworthy answer as possible."
 
 (defun message-make-fqdn ()
   "Return user's fully qualified domain name."
-  (let* ((system-name (system-name))
+  (let* ((sysname (system-name))
          (user-mail (message-user-mail-address))
          (user-domain
           (if (and user-mail
@@ -5863,10 +5863,10 @@ give as trustworthy answer as possible."
            (not (string-match message-bogus-system-names message-user-fqdn)))
       ;; `message-user-fqdn' seems to be valid
       message-user-fqdn)
-     ((and (string-match message-valid-fqdn-regexp system-name)
-           (not (string-match message-bogus-system-names system-name)))
+     ((and (string-match message-valid-fqdn-regexp sysname)
+           (not (string-match message-bogus-system-names sysname)))
       ;; `system-name' returned the right result.
-      system-name)
+      sysname)
      ;; Try `mail-host-address'.
      ((and (boundp 'mail-host-address)
            (stringp mail-host-address)
@@ -5881,7 +5881,7 @@ give as trustworthy answer as possible."
       user-domain)
      ;; Default to this bogus thing.
      (t
-      (concat system-name
+      (concat sysname
               ".i-did-not-set--mail-host-address--so-tickle-me")))))
 
 (defun message-make-domain ()
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index f5b4d7cba88..3913ecc0b4e 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -1814,6 +1814,7 @@ If RECURSIVE, search recursively."
   ;; Require since we bind its variables.
   (require 'shr)
   (let ((article-buffer (current-buffer))
+        (shr-width fill-column)
         (shr-content-function (lambda (id)
                                 (let ((handle (mm-get-content-id id)))
                                   (when handle
diff --git a/lisp/gnus/nnvirtual.el b/lisp/gnus/nnvirtual.el
index f67943a336a..61bf5560e2e 100644
--- a/lisp/gnus/nnvirtual.el
+++ b/lisp/gnus/nnvirtual.el
@@ -99,7 +99,7 @@ component group will show up when you enter the virtual group.")
         (let ((vbuf (nnheader-set-temp-buffer
                      (get-buffer-create " *virtual headers*")))
               (carticles (nnvirtual-partition-sequence articles))
-              (system-name (system-name))
+              (sysname (system-name))
               cgroup carticle article result prefix)
           (while carticles
             (setq cgroup (caar carticles))
@@ -151,7 +151,7 @@ component group will show up when you enter the virtual group.")
                   ;; and clean up the xrefs.
                   (princ article nntp-server-buffer)
                   (nnvirtual-update-xref-header cgroup carticle
-                                                prefix system-name)
+                                                prefix sysname)
                   (forward-line 1))
                 )
 
@@ -378,7 +378,7 @@ component group will show up when you enter the virtual group.")
       (mapc 'nnheader-insert-nov headers))))
 
 
-(defun nnvirtual-update-xref-header (group article prefix system-name)
+(defun nnvirtual-update-xref-header (group article prefix sysname)
   "Edit current NOV header in current buffer to have an xref to the component group, and also server prefix any existing xref lines."
   ;; Move to beginning of Xref field, creating a slot if needed.
   (beginning-of-line)
@@ -393,7 +393,7 @@ component group will show up when you enter the virtual group.")
     (forward-char -1)
     (delete-char 1))
 
-  (insert "Xref: " system-name " " group ":")
+  (insert "Xref: " sysname " " group ":")
   (princ article (current-buffer))
   (insert " ")
 
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index bb8111e416f..392ecff021a 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -593,6 +593,29 @@ as the single-shift area.")
 The remaining arguments must come in pairs ATTRIBUTE VALUE.  ATTRIBUTE
 may be any symbol.
 
+A coding system specifies a rule to decode (i.e. to convert a
+byte sequence to a character sequence) and a rule to encode (the
+opposite of decoding).
+
+The decoding is done by at most 3 steps; the first is to convert
+a byte sequence to a character sequence by one of Emacs'
+internal routines specified by `:coding-type' attribute.  The
+optional second step is to convert the character sequence (the
+result of the first step) by a translation table specified
+by `:decode-translation-table' attribute.  The optional third step
+is to convert the above result by a Lisp function specified
+by `:post-read-conversion' attribute.
+
+The encoding is done by at most 3 steps, which are the reverse
+of the decoding steps.  The optional first step converts a
+character sequence to another character sequence by a Lisp
+function specified by `:pre-write-conversion' attribute.  The
+optional second step converts the above result by a translation
+table specified by `:encode-translation-table' attribute.  The
+third step converts the above result to a byte sequence by one
+of the Emacs's internal routines specified by the `:coding-type'
+attribute.
+
 The following attributes have special meanings.  Those labeled as
 \"(required)\" should not be omitted.
 
@@ -602,27 +625,72 @@ VALUE is a character to display on mode line for the coding system.
 
 `:coding-type' (required)
 
-VALUE must be one of `charset', `utf-8', `utf-16', `iso-2022',
-`emacs-mule', `shift-jis', `ccl', `raw-text', `undecided'.
+VALUE specifies the format of byte sequence the coding system
+decodes and encodes to.  It must be one of `charset', `utf-8',
+`utf-16', `iso-2022', `emacs-mule', `shift-jis', `ccl',
+`raw-text', `undecided'.
+
+If VALUE is `charset', the coding system is for handling a
+byte sequence in which each byte or every two- to four-byte
+sequence represents a character code of a charset specified
+by the `:charset-list' attribute.
+
+If VALUE is `utf-8', the coding system is for handling Unicode
+UTF-8 byte sequences.  See also the documentation of the
+attribute `:bom'.
+
+If VALUE is `utf-16', the coding system is for handling Unicode
+UTF-16 byte sequences.  See also the documentation of the
+attributes :bom and `:endian'.
+
+If VALUE is `iso-2022', the coding system is for handling byte
+sequences conforming to ISO/IEC 2022.  See also the documentation
+of the attributes `:charset-list', `:flags', and `:designation'.
+
+If VALUE is `emacs-mule', the coding system is for handling
+byte sequences which Emacs 20 and 21 used for their internal
+representation of characters.
+
+If VALUE is `shift-jis', the coding system is for handling byte
+sequences of Shift_JIS format.  See also the attribute `:charset-list'.
+
+If VALUE is `ccl', the coding system uses CCL programs to decode
+and encode byte sequences.  The CCL programs must be
+specified by the attributes `:ccl-decoder' and `:ccl-encoder'.
+
+If VALUE is `raw-text', the coding system decodes byte sequences
+without any conversions.
 
 `:eol-type'
 
 VALUE is the EOL (end-of-line) format of the coding system.  It must be
 one of `unix', `dos', `mac'.  The symbol `unix' means Unix-like EOL
-\(i.e. single LF), `dos' means DOS-like EOL \(i.e. sequence of CR LF),
-and `mac' means Mac-like EOL \(i.e. single CR).  If omitted, Emacs
-detects the EOL format automatically when decoding.
+\(i.e. a single LF character), `dos' means DOS-like EOL \(i.e. a sequence
+of CR followed by LF), and `mac' means Mac-like EOL \(i.e. a single CR).
+If omitted, Emacs detects the EOL format automatically when decoding.
+
+`:charset-list' (required if `:coding-type' is `charset' or `shift-jis')
+
+VALUE must be a list of charsets supported by the coding system.
+
+If `coding-type:' is `charset', then on decoding and encoding by the
+coding system, if a character belongs to multiple charsets in the
+list, a charset that comes first in the list is selected.
 
-`:charset-list'
+If `:coding-type' is `iso-2022', VALUE may be `iso-2022', which
+indicates that the coding system supports all ISO-2022 based
+charsets.
 
-VALUE must be a list of charsets supported by the coding system.  On
-encoding by the coding system, if a character belongs to multiple
-charsets in the list, a charset that comes earlier in the list is
-selected.  If `:coding-type' is `iso-2022', VALUE may be `iso-2022',
-which indicates that the coding system supports all ISO-2022 based
-charsets.  If `:coding-type' is `emacs-mule', VALUE may be
-`emacs-mule', which indicates that the coding system supports all
-charsets that have the `:emacs-mule-id' property.
+If `:coding-type' is `shift-jis', VALUE must be a list of three
+to four charsets supported by Shift_JIS encoding scheme.  The
+first charset (one dimension) is for code space 0x00..0x7F, the
+second (one dimension) for 0xA1..0xDF, the third (two dimension)
+for 0x8140..0xEFFC, the optional fourth (three dimension) for
+0xF040..0xFCFC.
+
+If `:coding-type' is `emacs-mule', VALUE may be `emacs-mule',
+which indicates that the coding system supports all charsets that
+have the `:emacs-mule-id' property.
 
 `:ascii-compatible-p'
 
@@ -643,9 +711,9 @@ VALUE must be a translation table to use on encoding.
 VALUE must be a function to call after some text is inserted and
 decoded by the coding system itself and before any functions in
 `after-insert-functions' are called.  This function is passed one
-argument; the number of characters in the text to convert, with
+argument: the number of characters in the text to convert, with
 point at the start of the text.  The function should leave point
-the same, and return the new character count.
+unchanged, and should return the new character count.
 
 `:pre-write-conversion'
 
@@ -674,7 +742,7 @@ to lower case.
 `:mime-text-unsuitable'
 
 VALUE non-nil means the `:mime-charset' property names a charset which
-is unsuitable for the top-level media type \"text\".
+is unsuitable for the top-level media of type \"text\".
 
 `:flags'
 
@@ -704,8 +772,8 @@ This attribute is meaningful only when `:coding-type' is `iso-2022'.
 
 `:bom'
 
-This attributes specifies whether the coding system uses a `byte order
-mark'.  VALUE must be nil, t, or cons of coding systems whose
+This attributes specifies whether the coding system uses a \"byte order
+mark\".  VALUE must be nil, t, or a cons cell of coding systems whose
 `:coding-type' is `utf-16' or `utf-8'.
 
 If the value is nil, on decoding, don't treat the first two-byte as
@@ -714,9 +782,9 @@ BOM, and on encoding, don't produce BOM bytes.
 If the value is t, on decoding, skip the first two-byte as BOM, and on
 encoding, produce BOM bytes according to the value of `:endian'.
 
-If the value is cons, on decoding, check the first two-byte.  If they
-are 0xFE 0xFF, use the car part coding system of the value.  If they
-are 0xFF 0xFE, use the cdr part coding system of the value.
+If the value is a cons cell, on decoding, check the first two bytes.
+If they are 0xFE 0xFF, use the car part coding system of the value.
+If they are 0xFF 0xFE, use the cdr part coding system of the value.
 Otherwise, treat them as bytes for a normal character.  On encoding,
 produce BOM bytes according to the value of `:endian'.
 
@@ -730,17 +798,17 @@ little-endian respectively.  The default value is `big'.
 
 This attribute is meaningful only when `:coding-type' is `utf-16'.
 
-`:ccl-decoder'
+`:ccl-decoder' (required if :coding-type is `ccl')
 
-VALUE is a symbol representing the registered CCL program used for
-decoding.  This attribute is meaningful only when `:coding-type' is
-`ccl'.
+VALUE is a CCL program name defined by `define-ccl-program'.  The
+CCL program reads a byte sequence and writes a character sequence
+as a decoding result.
 
-`:ccl-encoder'
+`:ccl-encoder' (required if :coding-type is `ccl')
 
-VALUE is a symbol representing the registered CCL program used for
-encoding.  This attribute is meaningful only when `:coding-type' is
-`ccl'.
+VALUE is a CCL program name defined by `define-ccl-program'.  The
+CCL program reads a character sequence and writes a byte sequence
+as an encoding result.
 
 `:inhibit-null-byte-detection'
 
@@ -2249,7 +2317,13 @@ ALIST is an alist, each element has the form (FROM . TO).
 FROM and TO are a character or a vector of characters.
 If FROM is a character, that character is translated to TO.
 If FROM is a vector of characters, that sequence is translated to TO.
-The first extra-slot of the value is a translation table for reverse mapping."
+The first extra-slot of the value is a translation table for reverse mapping.
+
+FROM and TO may be nil.  If TO is nil, the translation from FROM
+to nothing is defined in the translation table and that element
+is ignored in the reverse map.  If FROM is nil, the translation
+from TO to nothing is defined in the reverse map only.  A vector
+of length zero has the same meaning as specifying nil."
   (let ((tables (vector (make-char-table 'translation-table)
                         (make-char-table 'translation-table)))
         table max-lookup from to idx val)
@@ -2262,20 +2336,23 @@ The first extra-slot of the value is a translation table for reverse mapping."
           (setq from (cdr elt) to (car elt)))
         (if (characterp from)
             (setq idx from)
-          (setq idx (aref from 0)
-                max-lookup (max max-lookup (length from))))
-        (setq val (aref table idx))
-        (if val
-            (progn
-              (or (consp val)
-                  (setq val (list (cons (vector idx) val))))
-              (if (characterp from)
-                  (setq from (vector from)))
-              (setq val (nconc val (list (cons from to)))))
-          (if (characterp from)
-              (setq val to)
-            (setq val (list (cons from to)))))
-        (aset table idx val))
+          (if (= (length from) 0)
+              (setq idx nil)
+            (setq idx (aref from 0)
+                  max-lookup (max max-lookup (length from)))))
+        (when idx
+          (setq val (aref table idx))
+          (if val
+              (progn
+                (or (consp val)
+                    (setq val (list (cons (vector idx) val))))
+                (if (characterp from)
+                    (setq from (vector from)))
+                (setq val (nconc val (list (cons from to)))))
+            (if (characterp from)
+                (setq val to)
+              (setq val (list (cons from to)))))
+          (aset table idx val)))
       (set-char-table-extra-slot table 1 max-lookup))
     (set-char-table-extra-slot (aref tables 0) 0 (aref tables 1))
     (aref tables 0)))
diff --git a/lisp/language/misc-lang.el b/lisp/language/misc-lang.el
index ee06e34eef4..b56d31f6e16 100644
--- a/lisp/language/misc-lang.el
+++ b/lisp/language/misc-lang.el
@@ -78,7 +78,8 @@ and Italian.")))
 (set-char-table-range
  composition-function-table
  '(#x600 . #x6FF)
- (list ["[\u0600-\u06FF]+" 0 font-shape-gstring]))
+ (list ["\u200D?[\u0600-\u074F]+[\u200D\u200C]*[\u0600-\u074F]+\u200D?"
+        0 font-shape-gstring]))
 
 (provide 'misc-lang)
 
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 8f33641a746..ea5794dfd0b 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -373,35 +373,29 @@
 
     (bindings--define-key menu [set-tags-name]
       '(menu-item "Set Tags File Name..." visit-tags-table
-                  :help "Tell Tags commands which tag table file to use"))
+                  :visible (menu-bar-goto-uses-etags-p)
+                  :help "Tell navigation commands which tag table file to use"))
 
     (bindings--define-key menu [separator-tag-file]
-      menu-bar-separator)
+      '(menu-item "--" nil :visible (menu-bar-goto-uses-etags-p)))
+
+    (bindings--define-key menu [xref-pop]
+      '(menu-item "Back" xref-pop-marker-stack
+                  :help "Back to the position of the last search"))
 
-    (bindings--define-key menu [apropos-tags]
-      '(menu-item "Tags Apropos..." tags-apropos
+    (bindings--define-key menu [xref-apropos]
+      '(menu-item "Find Apropos..." xref-find-apropos
                   :help "Find function/variables whose names match regexp"))
-    (bindings--define-key menu [next-tag-otherw]
-      '(menu-item "Next Tag in Other Window"
-                  menu-bar-next-tag-other-window
-                  :enable (and (boundp 'tags-location-ring)
-                               (not (ring-empty-p tags-location-ring)))
-                  :help "Find next function/variable matching last tag name in another window"))
-
-    (bindings--define-key menu [next-tag]
-      '(menu-item "Find Next Tag"
-                  menu-bar-next-tag
-                  :enable (and (boundp 'tags-location-ring)
-                               (not (ring-empty-p tags-location-ring)))
-                  :help "Find next function/variable matching last tag name"))
-    (bindings--define-key menu [find-tag-otherw]
-      '(menu-item "Find Tag in Other Window..." find-tag-other-window
+
+    (bindings--define-key menu [xref-find-otherw]
+      '(menu-item "Find Definition in Other Window..."
+                  xref-find-definitions-other-window
                   :help "Find function/variable definition in another window"))
-    (bindings--define-key menu [find-tag]
-      '(menu-item "Find Tag..." find-tag
+    (bindings--define-key menu [xref-find-def]
+      '(menu-item "Find Definition..." xref-find-definitions
                   :help "Find definition of function or variable"))
 
-    (bindings--define-key menu [separator-tags]
+    (bindings--define-key menu [separator-xref]
       menu-bar-separator)
 
     (bindings--define-key menu [end-of-buf]
@@ -416,6 +410,9 @@
                   :help "Read a line number and go to that line"))
     menu))
 
+(defun menu-bar-goto-uses-etags-p ()
+  (or (not (boundp 'xref-find-function))
+      (eq xref-find-function 'etags-xref-find)))
 
 (defvar yank-menu (cons (purecopy "Select Yank") nil))
 (fset 'yank-menu (cons 'keymap yank-menu))
@@ -514,16 +511,6 @@
 
     menu))
 
-(defun menu-bar-next-tag-other-window ()
-  "Find the next definition of the tag already specified."
-  (interactive)
-  (find-tag-other-window nil t))
-
-(defun menu-bar-next-tag ()
-  "Find the next definition of the tag already specified."
-  (interactive)
-  (find-tag nil t))
-
 (define-obsolete-function-alias
   'menu-bar-kill-ring-save 'kill-ring-save "24.1")
 
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index e1e6b0ee907..91989016067 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1818,8 +1818,9 @@ variables.")
              ,(if (eq (selected-window) (minibuffer-window))
                   'display-buffer-at-bottom
                 'display-buffer-below-selected))
-            ,(when temp-buffer-resize-mode
-               '(window-height . resize-temp-buffer-window))
+            ,(if temp-buffer-resize-mode
+                 '(window-height . resize-temp-buffer-window)
+               '(window-height . shrink-window-if-larger-than-buffer))
             ,(when temp-buffer-resize-mode
                '(preserve-size . (nil . t))))
           nil
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index c6d3bbceda2..af902ded472 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -445,7 +445,7 @@ See the `eww-search-prefix' variable for the search engine used."
                    ("start" . :start)
                    ("home" . :home)
                    ("contents" . :contents)
-                   ("up" . up)))))
+                   ("up" . :up)))))
     (and href
          where
          (plist-put eww-data (cdr where) href))))
@@ -705,6 +705,9 @@ the like."
    (setq-local tool-bar-map eww-tool-bar-map))
   ;; desktop support
   (setq-local desktop-save-buffer 'eww-desktop-misc-data)
+  ;; multi-page isearch support
+  (setq-local multi-isearch-next-buffer-function 'eww-isearch-next-buffer)
+  (setq truncate-lines t)
   (buffer-disable-undo)
   (setq buffer-read-only t))
 
@@ -1884,6 +1887,19 @@ Otherwise, the restored buffer will contain a prompt to do so by using
 (add-to-list 'desktop-buffer-mode-handlers
              '(eww-mode . eww-restore-desktop))
 
+;;; Isearch support
+
+(defun eww-isearch-next-buffer (&optional buffer wrap)
+  "Go to the next page to search using `rel' attribute for navigation."
+  (if wrap
+      (condition-case nil
+          (eww-top-url)
+        (error nil))
+    (if isearch-forward
+        (eww-next-url)
+      (eww-previous-url)))
+  (current-buffer))
+
 (provide 'eww)
 
 ;;; eww.el ends here
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 387bb024a52..6553fd3958c 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -78,11 +78,12 @@ If nil, don't draw horizontal table lines."
   :group 'shr
   :type 'character)
 
-(defcustom shr-width fill-column
+(defcustom shr-width nil
   "Frame width to use for rendering.
 May either be an integer specifying a fixed width in characters,
 or nil, meaning that the full width of the window should be
 used."
+  :version "25.1"
   :type '(choice (integer :tag "Fixed width in characters")
                  (const   :tag "Use the width of the window" nil))
   :group 'shr)
@@ -1439,10 +1440,11 @@ The preference is a float determined from `shr-prefer-media-type'."
 
 (defun shr-tag-table (dom)
   (shr-ensure-paragraph)
-  (let* ((caption (dom-child-by-tag dom 'caption))
-         (header (dom-child-by-tag dom 'thead))
-         (body (or (dom-child-by-tag dom 'tbody) dom))
-         (footer (dom-child-by-tag dom 'tfoot))
+  (let* ((caption (dom-children (dom-child-by-tag dom 'caption)))
+         (header (dom-non-text-children (dom-child-by-tag dom 'thead)))
+         (body (dom-non-text-children (or (dom-child-by-tag dom 'tbody)
+                                          dom)))
+         (footer (dom-non-text-children (dom-child-by-tag dom 'tfoot)))
          (bgcolor (dom-attr dom 'bgcolor))
          (start (point))
          (shr-stylesheet (nconc (list (cons 'background-color bgcolor))
@@ -1461,42 +1463,62 @@ The preference is a float determined from `shr-prefer-media-type'."
       ;; It's a real table, so render it.
       (shr-tag-table-1
        (nconc
-        (if caption `((tr (td ,@caption))))
-        (if header
-            (if footer
-                ;; header + body + footer
-                (if (= nheader nbody)
-                    (if (= nbody nfooter)
-                        `((tr (td (table (tbody ,@header ,@body ,@footer)))))
-                      (nconc `((tr (td (table (tbody ,@header ,@body)))))
-                             (if (= nfooter 1)
-                                 footer
-                               `((tr (td (table (tbody ,@footer))))))))
-                  (nconc `((tr (td (table (tbody ,@header)))))
-                         (if (= nbody nfooter)
-                             `((tr (td (table (tbody ,@body ,@footer)))))
-                           (nconc `((tr (td (table (tbody ,@body)))))
-                                  (if (= nfooter 1)
-                                      footer
-                                    `((tr (td (table (tbody ,@footer))))))))))
-              ;; header + body
-              (if (= nheader nbody)
-                  `((tr (td (table (tbody ,@header ,@body)))))
-                (if (= nheader 1)
-                    `(,@header (tr (td (table (tbody ,@body)))))
-                  `((tr (td (table (tbody ,@header))))
-                    (tr (td (table (tbody ,@body))))))))
-          (if footer
-              ;; body + footer
-              (if (= nbody nfooter)
-                  `((tr (td (table (tbody ,@body ,@footer)))))
-                (nconc `((tr (td (table (tbody ,@body)))))
-                       (if (= nfooter 1)
-                           footer
-                         `((tr (td (table (tbody ,@footer))))))))
-            (if caption
-                `((tr (td (table (tbody ,@body)))))
-              body))))))
+        (list 'table nil)
+        (if caption `((tr nil (td nil ,@caption))))
+        (cond (header
+               (if footer
+                   ;; header + body + footer
+                   (if (= nheader nbody)
+                       (if (= nbody nfooter)
+                           `((tr nil (td nil (table nil
+                                                    (tbody nil ,@header
+                                                           ,@body ,@footer)))))
+                         (nconc `((tr nil (td nil (table nil
+                                                         (tbody nil ,@header
+                                                                ,@body)))))
+                                (if (= nfooter 1)
+                                    footer
+                                  `((tr nil (td nil (table
+                                                     nil (tbody
+                                                          nil ,@footer))))))))
+                     (nconc `((tr nil (td nil (table nil (tbody
+                                                          nil ,@header)))))
+                            (if (= nbody nfooter)
+                                `((tr nil (td nil (table
+                                                   nil (tbody nil ,@body
+                                                              ,@footer)))))
+                              (nconc `((tr nil (td nil (table
+                                                        nil (tbody nil
+                                                                   ,@body)))))
+                                     (if (= nfooter 1)
+                                         footer
+                                       `((tr nil (td nil (table
+                                                          nil
+                                                          (tbody
+                                                           nil
+                                                           ,@footer))))))))))
+                 ;; header + body
+                 (if (= nheader nbody)
+                     `((tr nil (td nil (table nil (tbody nil ,@header
+                                                         ,@body)))))
+                   (if (= nheader 1)
+                       `(,@header (tr nil (td nil (table
+                                                   nil (tbody nil ,@body)))))
+                     `((tr nil (td nil (table nil (tbody nil ,@header))))
+                       (tr nil (td nil (table nil (tbody nil ,@body)))))))))
+              (footer
+               ;; body + footer
+               (if (= nbody nfooter)
+                   `((tr nil (td nil (table
+                                      nil (tbody nil ,@body ,@footer)))))
+                 (nconc `((tr nil (td nil (table nil (tbody nil ,@body)))))
+                        (if (= nfooter 1)
+                            footer
+                          `((tr nil (td nil (table
+                                             nil (tbody nil ,@footer)))))))))
+              (caption
+               `((tr nil (td nil (table nil (tbody nil ,@body))))))
+              (body)))))
     (when bgcolor
       (shr-colorize-region start (point) (cdr (assq 'color shr-stylesheet))
                            bgcolor))
diff --git a/lisp/net/tramp-gw.el b/lisp/net/tramp-gw.el
index 0decd8847cc..e21aaf78914 100644
--- a/lisp/net/tramp-gw.el
+++ b/lisp/net/tramp-gw.el
@@ -195,11 +195,12 @@ instead of the host name declared in TARGET-VEC."
     (setq tramp-gw-gw-proc
           (funcall
            socks-function
-           (tramp-get-connection-name gw-vec)
-           (tramp-get-connection-buffer gw-vec)
+           (let ((tramp-verbose 0)) (tramp-get-connection-name gw-vec))
+           (let ((tramp-verbose 0)) (tramp-get-connection-buffer gw-vec))
            (tramp-file-name-real-host target-vec)
            (tramp-file-name-port target-vec)))
     (set-process-sentinel tramp-gw-gw-proc 'tramp-gw-gw-proc-sentinel)
+    (set-process-coding-system tramp-gw-gw-proc 'binary 'binary)
     (tramp-compat-set-process-query-on-exit-flag tramp-gw-gw-proc nil)
     (tramp-message
      vec 4 "Opened %s process `%s'"
@@ -260,6 +261,10 @@ authentication is requested from proxy server, provide it."
           (200 (setq found t))
           ;; We need basic authentication.
           (401 (setq authentication (tramp-gw-basic-authentication nil first)))
+          ;; Access forbidden.
+          (403 (tramp-error-with-buffer
+                (current-buffer) tramp-gw-vector 'file-error
+                "Connection to %s:%d forbidden." host service))
           ;; Target host not found.
           (404 (tramp-error-with-buffer
                 (current-buffer) tramp-gw-vector 'file-error
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index ba7b7d95a4b..6fc2effbe0f 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -2471,8 +2471,12 @@ The method used must be an out-of-band method."
                    (mapconcat 'identity (process-command p) " "))
                   (tramp-set-connection-property p "vector" orig-vec)
                   (tramp-compat-set-process-query-on-exit-flag p nil)
-                  (tramp-process-actions
-                   p v nil tramp-actions-copy-out-of-band)
+
+                  ;; We must adapt `tramp-local-end-of-line' for
+                  ;; sending the password.
+                  (let ((tramp-local-end-of-line tramp-rsh-end-of-line))
+                    (tramp-process-actions
+                     p v nil tramp-actions-copy-out-of-band))
 
                   ;; Check the return code.
                   (goto-char (point-max))
@@ -2883,7 +2887,7 @@ the result will be a local, non-Tramp, file name."
            (name1 name)
            (i 0)
            ;; We do not want to raise an error when
-           ;; `start-file-process' has been started several time in
+           ;; `start-file-process' has been started several times in
            ;; `eshell' and friends.
            (tramp-current-connection nil))
 
@@ -4510,7 +4514,8 @@ Gateway hops are already opened."
         ;; Therefore, we must remember the gateway vector.  But we
         ;; cannot do it as connection property, because it shouldn't
         ;; be persistent.  And we have no started process yet either.
-        (tramp-set-file-property (car target-alist) "" "gateway" hop)))
+        (let ((tramp-verbose 0))
+          (tramp-set-file-property (car target-alist) "" "gateway" hop))))
 
     ;; Foreign and out-of-band methods are not supported for multi-hops.
     (when (cdr target-alist)
@@ -4687,7 +4692,8 @@ connection if a previous connection has died for some reason."
                            l-method 'tramp-connection-timeout))
                          (gw-args
                           (tramp-get-method-parameter l-method 'tramp-gw-args))
-                         (gw (tramp-get-file-property hop "" "gateway" nil))
+                         (gw (let ((tramp-verbose 0))
+                               (tramp-get-file-property hop "" "gateway" nil)))
                          (g-method (and gw (tramp-file-name-method gw)))
                          (g-user (and gw (tramp-file-name-user gw)))
                          (g-host (and gw (tramp-file-name-real-host gw)))
@@ -4715,8 +4721,10 @@ connection if a previous connection has died for some reason."
                       (setq login-args (append async-args login-args)))
 
                     ;; Add gateway arguments if necessary.
-                    (when (and gw gw-args)
-                      (setq login-args (append gw-args login-args)))
+                    (when gw
+                      (tramp-set-connection-property p "gateway" t)
+                      (when gw-args
+                        (setq login-args (append gw-args login-args))))
 
                     ;; Check for port number.  Until now, there's no
                     ;; need for handling like method, user, host.
@@ -4902,8 +4910,9 @@ FMT and ARGS which are passed to `error'."
   (or (tramp-send-command-and-check vec command)
       (apply 'tramp-error vec 'file-error fmt args)))
 
-(defun tramp-send-command-and-read (vec command &optional noerror)
+(defun tramp-send-command-and-read (vec command &optional noerror marker)
   "Run COMMAND and return the output, which must be a Lisp expression.
+If MARKER is a regexp, read the output after that string.
 In case there is no valid Lisp expression and NOERROR is nil, it
 raises an error."
   (when (if noerror
@@ -4911,8 +4920,17 @@ raises an error."
           (tramp-barf-unless-okay
            vec command "`%s' returns with error" command))
     (with-current-buffer (tramp-get-connection-buffer vec)
-      ;; Read the expression.
       (goto-char (point-min))
+      ;; Read the marker.
+      (when (stringp marker)
+        (condition-case nil
+            (re-search-forward marker)
+          (error (unless noerror
+                   (tramp-error
+                    vec 'file-error
+                    "`%s' does not return the marker `%s': `%s'"
+                    command marker (buffer-string))))))
+      ;; Read the expression.
       (condition-case nil
           (prog1 (read (current-buffer))
             ;; Error handling.
@@ -5064,25 +5082,22 @@ Return ATTR."
                    "/bin:/usr/bin")
                   "/bin:/usr/bin"))))
            (own-remote-path
-            ;; We cannot apply `tramp-send-command-and-read' because
-            ;; the login shell could return more than just the $PATH
-            ;; string.  So we emulate that function.
+            ;; The login shell could return more than just the $PATH
+            ;; string.  So we use `tramp-end-of-heredoc' as marker.
             (when elt2
-              (tramp-send-command
+              (tramp-send-command-and-read
                vec
                (format
-                "%s -l %s 'echo \\\"$PATH\\\"'"
+                "%s -l %s 'echo %s \\\"$PATH\\\"'"
                 (tramp-get-method-parameter
                  (tramp-file-name-method vec) 'tramp-remote-shell)
                 (mapconcat
                  'identity
                  (tramp-get-method-parameter
                   (tramp-file-name-method vec) 'tramp-remote-shell-args)
-                 " ")))
-              (with-current-buffer (tramp-get-connection-buffer vec)
-                (goto-char (point-max))
-                (forward-line -1)
-                (read (current-buffer))))))
+                 " ")
+                (tramp-shell-quote-argument tramp-end-of-heredoc))
+               nil (regexp-quote tramp-end-of-heredoc)))))
 
       ;; Replace place holder `tramp-default-remote-path'.
       (when elt1
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 2cf9d45b965..3c8b5bbd60e 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -1610,7 +1610,7 @@ an input event arrives.  The other arguments are passed to `tramp-error'."
           (let ((enable-recursive-minibuffers t))
             ;; `tramp-error' does not show messages.  So we must do it
             ;; ourselves.
-            (message fmt-string arguments)
+            (apply 'message fmt-string arguments)
             ;; Show buffer.
             (pop-to-buffer buf)
             (discard-input)
@@ -3086,115 +3086,118 @@ User is always nil."
   (setq filename (expand-file-name filename))
   (let (result local-copy remote-copy)
     (with-parsed-tramp-file-name filename nil
-      (with-tramp-progress-reporter
-          v 3 (format "Inserting `%s'" filename)
-        (unwind-protect
-            (if (not (file-exists-p filename))
-                (progn
-                  ;; We don't raise a Tramp error, because it might be
-                  ;; suppressed, like in `find-file-noselect-1'.
-                  (tramp-message
-                   v 1 "File not `%s' found on remote host" filename)
-                  (signal 'file-error
-                          (list "File not found on remote host" filename)))
-
-              (if (and (tramp-local-host-p v)
-                       (let (file-name-handler-alist)
-                         (file-readable-p localname)))
-                  ;; Short track: if we are on the local host, we can
-                  ;; run directly.
-                  (setq result
-                        (tramp-run-real-handler
-                         'insert-file-contents
-                         (list localname visit beg end replace)))
-
-                ;; When we shall insert only a part of the file, we
-                ;; copy this part.  This works only for the shell file
-                ;; name handlers.
-                (when (and (or beg end)
-                           (tramp-get-method-parameter
-                            (tramp-file-name-method v) 'tramp-login-program))
-                  (setq remote-copy (tramp-make-tramp-temp-file v))
-                  ;; This is defined in tramp-sh.el.  Let's assume
-                  ;; this is loaded already.
-                  (tramp-compat-funcall
-                   'tramp-send-command
-                   v
-                   (cond
-                    ((and beg end)
-                     (format "dd bs=1 skip=%d if=%s count=%d of=%s"
-                             beg (tramp-shell-quote-argument localname)
-                             (- end beg) remote-copy))
-                    (beg
-                     (format "dd bs=1 skip=%d if=%s of=%s"
-                             beg (tramp-shell-quote-argument localname)
-                             remote-copy))
-                    (end
-                     (format "dd bs=1 count=%d if=%s of=%s"
-                             end (tramp-shell-quote-argument localname)
-                             remote-copy))))
-                  (setq tramp-temp-buffer-file-name nil beg nil end nil))
-
-                ;; `insert-file-contents-literally' takes care to
-                ;; avoid calling jka-compr.  By let-binding
-                ;; `inhibit-file-name-operation', we propagate that
-                ;; care to the `file-local-copy' operation.
-                (setq local-copy
-                      (let ((inhibit-file-name-operation
-                             (when (eq inhibit-file-name-operation
-                                       'insert-file-contents)
-                               'file-local-copy)))
-                        (cond
-                         ((stringp remote-copy)
-                          (file-local-copy
-                           (tramp-make-tramp-file-name
-                            method user host remote-copy)))
-                         ((stringp tramp-temp-buffer-file-name)
-                          (copy-file filename tramp-temp-buffer-file-name 'ok)
-                          tramp-temp-buffer-file-name)
-                         (t (file-local-copy filename)))))
-
-                ;; When the file is not readable for the owner, it
-                ;; cannot be inserted, even if it is readable for the
-                ;; group or for everybody.
-                (set-file-modes
-                 local-copy (tramp-compat-octal-to-decimal "0600"))
-
-                (when (and (null remote-copy)
-                           (tramp-get-method-parameter
-                            method 'tramp-copy-keep-tmpfile))
-                  ;; We keep the local file for performance reasons,
-                  ;; useful for "rsync".
-                  (setq tramp-temp-buffer-file-name local-copy))
-
-                ;; We must ensure that `file-coding-system-alist'
-                ;; matches `local-copy'.  We must also use `visit',
-                ;; otherwise there might be an error in the
-                ;; `revert-buffer' function under XEmacs.
-                (let ((file-coding-system-alist
-                       (tramp-find-file-name-coding-system-alist
-                        filename local-copy)))
-                  (setq result
-                        (insert-file-contents
-                         local-copy visit beg end replace)))))
-
-          ;; Save exit.
-          (progn
-            (when visit
-              (setq buffer-file-name filename)
-              (setq buffer-read-only (not (file-writable-p filename)))
-              (set-visited-file-modtime)
-              (set-buffer-modified-p nil))
-            (when (and (stringp local-copy)
-                       (or remote-copy (null tramp-temp-buffer-file-name)))
-              (delete-file local-copy))
-            (when (stringp remote-copy)
-              (delete-file
-               (tramp-make-tramp-file-name method user host remote-copy)))))))
-
-    ;; Result.
-    (list (expand-file-name filename)
-          (cadr result))))
+      (unwind-protect
+          (if (not (file-exists-p filename))
+              (tramp-error
+               v 'file-error "File `%s' not found on remote host" filename)
+
+            (with-tramp-progress-reporter
+                v 3 (format "Inserting `%s'" filename)
+              (condition-case err
+                  (if (and (tramp-local-host-p v)
+                           (let (file-name-handler-alist)
+                             (file-readable-p localname)))
+                      ;; Short track: if we are on the local host, we can
+                      ;; run directly.
+                      (setq result
+                            (tramp-run-real-handler
+                             'insert-file-contents
+                             (list localname visit beg end replace)))
+
+                    ;; When we shall insert only a part of the file, we
+                    ;; copy this part.  This works only for the shell file
+                    ;; name handlers.
+                    (when (and (or beg end)
+                               (tramp-get-method-parameter
+                                (tramp-file-name-method v)
+                                'tramp-login-program))
+                      (setq remote-copy (tramp-make-tramp-temp-file v))
+                      ;; This is defined in tramp-sh.el.  Let's assume
+                      ;; this is loaded already.
+                      (tramp-compat-funcall
+                       'tramp-send-command
+                       v
+                       (cond
+                        ((and beg end)
+                         (format "dd bs=1 skip=%d if=%s count=%d of=%s"
+                                 beg (tramp-shell-quote-argument localname)
+                                 (- end beg) remote-copy))
+                        (beg
+                         (format "dd bs=1 skip=%d if=%s of=%s"
+                                 beg (tramp-shell-quote-argument localname)
+                                 remote-copy))
+                        (end
+                         (format "dd bs=1 count=%d if=%s of=%s"
+                                 end (tramp-shell-quote-argument localname)
+                                 remote-copy))))
+                      (setq tramp-temp-buffer-file-name nil beg nil end nil))
+
+                    ;; `insert-file-contents-literally' takes care to
+                    ;; avoid calling jka-compr.  By let-binding
+                    ;; `inhibit-file-name-operation', we propagate that
+                    ;; care to the `file-local-copy' operation.
+                    (setq local-copy
+                          (let ((inhibit-file-name-operation
+                                 (when (eq inhibit-file-name-operation
+                                           'insert-file-contents)
+                                   'file-local-copy)))
+                            (cond
+                             ((stringp remote-copy)
+                              (file-local-copy
+                               (tramp-make-tramp-file-name
+                                method user host remote-copy)))
+                             ((stringp tramp-temp-buffer-file-name)
+                              (copy-file
+                               filename tramp-temp-buffer-file-name 'ok)
+                              tramp-temp-buffer-file-name)
+                             (t (file-local-copy filename)))))
+
+                    ;; When the file is not readable for the owner, it
+                    ;; cannot be inserted, even if it is readable for the
+                    ;; group or for everybody.
+                    (set-file-modes
+                     local-copy (tramp-compat-octal-to-decimal "0600"))
+
+                    (when (and (null remote-copy)
+                               (tramp-get-method-parameter
+                                method 'tramp-copy-keep-tmpfile))
+                      ;; We keep the local file for performance reasons,
+                      ;; useful for "rsync".
+                      (setq tramp-temp-buffer-file-name local-copy))
+
+                    ;; We must ensure that `file-coding-system-alist'
+                    ;; matches `local-copy'.  We must also use `visit',
+                    ;; otherwise there might be an error in the
+                    ;; `revert-buffer' function under XEmacs.
+                    (let ((file-coding-system-alist
+                           (tramp-find-file-name-coding-system-alist
+                            filename local-copy)))
+                      (setq result
+                            (insert-file-contents
+                             local-copy visit beg end replace))))
+                (error
+                 (add-hook 'find-file-not-found-functions
+                           `(lambda () (signal ',(car err) ',(cdr err)))
+                           nil t)
+                 (signal (car err) (cdr err))))))
+
+        ;; Save exit.
+        (progn
+          (when visit
+            (setq buffer-file-name filename)
+            (setq buffer-read-only (not (file-writable-p filename)))
+            (set-visited-file-modtime)
+            (set-buffer-modified-p nil))
+          (when (and (stringp local-copy)
+                     (or remote-copy (null tramp-temp-buffer-file-name)))
+            (delete-file local-copy))
+          (when (stringp remote-copy)
+            (delete-file
+             (tramp-make-tramp-file-name method user host remote-copy)))))
+
+      ;; Result.
+      (list (expand-file-name filename)
+            (cadr result)))))
 
 (defun tramp-handle-load (file &optional noerror nomessage nosuffix must-suffix)
   "Like `load' for Tramp files."
@@ -3609,15 +3612,19 @@ connection buffer."
 This is needed in order to hide `last-coding-system-used', which is set
 for process communication also."
   (with-current-buffer (process-buffer proc)
-    (tramp-message proc 10 "%s %s" proc (process-status proc))
-    (let (buffer-read-only last-coding-system-used)
+    ;; FIXME: If there is a gateway process, we need communication
+    ;; between several processes.  Too complicate to implement, so we
+    ;; read output from all processes.
+    (let ((p (if (tramp-get-connection-property proc "gateway" nil) nil proc))
+          buffer-read-only last-coding-system-used)
       ;; Under Windows XP, accept-process-output doesn't return
       ;; sometimes.  So we add an additional timeout.
       (with-timeout ((or timeout 1))
         (if (featurep 'xemacs)
-            (accept-process-output proc timeout timeout-msecs)
-          (accept-process-output proc timeout timeout-msecs (and proc t)))))
-    (tramp-message proc 10 "\n%s" (buffer-string))))
+            (accept-process-output p timeout timeout-msecs)
+          (accept-process-output p timeout timeout-msecs (and proc t))))
+      (tramp-message proc 10 "%s %s %s\n%s"
+                     proc (process-status proc) p (buffer-string)))))
 
 (defun tramp-check-for-regexp (proc regexp)
   "Check, whether REGEXP is contained in process buffer of PROC.
@@ -4184,25 +4191,27 @@ Invokes `password-read' if available, `read-passwd' else."
                ;; it's bound.  `auth-source-user-or-password' is an
                ;; obsoleted function, it has been replaced by
                ;; `auth-source-search'.
-               (and (boundp 'auth-sources)
-                    (tramp-get-connection-property
-                     v "first-password-request" nil)
-                    ;; Try with Tramp's current method.
-                    (if (fboundp 'auth-source-search)
-                        (setq auth-info
-                              (tramp-compat-funcall
-                               'auth-source-search
-                               :max 1
-                               :user (or tramp-current-user t)
-                               :host tramp-current-host
-                               :port tramp-current-method)
-                              auth-passwd (plist-get (nth 0 auth-info) :secret)
-                              auth-passwd (if (functionp auth-passwd)
-                                              (funcall auth-passwd)
-                                            auth-passwd))
-                      (tramp-compat-funcall
-                       'auth-source-user-or-password
-                       "password" tramp-current-host tramp-current-method)))
+               (ignore-errors
+                 (and (boundp 'auth-sources)
+                      (tramp-get-connection-property
+                       v "first-password-request" nil)
+                      ;; Try with Tramp's current method.
+                      (if (fboundp 'auth-source-search)
+                          (setq auth-info
+                                (tramp-compat-funcall
+                                 'auth-source-search
+                                 :max 1
+                                 :user (or tramp-current-user t)
+                                 :host tramp-current-host
+                                 :port tramp-current-method)
+                                auth-passwd (plist-get
+                                             (nth 0 auth-info) :secret)
+                                auth-passwd (if (functionp auth-passwd)
+                                                (funcall auth-passwd)
+                                              auth-passwd))
+                        (tramp-compat-funcall
+                         'auth-source-user-or-password
+                         "password" tramp-current-host tramp-current-method))))
                ;; Try the password cache.
                (when (functionp 'password-read)
                  (let ((password
diff --git a/lisp/nxml/rng-uri.el b/lisp/nxml/rng-uri.el
index b93624a4f22..43218ec7c88 100644
--- a/lisp/nxml/rng-uri.el
+++ b/lisp/nxml/rng-uri.el
@@ -85,7 +85,7 @@ Signal an error if URI is not a valid file URL."
           ((not (string= (downcase scheme) "file"))
            (rng-uri-error "URI `%s' does not use the `file:' scheme" uri)))
     (when (not (member authority
-                       (cons system-name '(nil "" "localhost"))))
+                       (cons (system-name) '(nil "" "localhost"))))
       (rng-uri-error "URI `%s' does not start with `file:///' or `file://localhost/'"
              uri))
     (when query
diff --git a/lisp/obsolete/pc-select.el b/lisp/obsolete/pc-select.el
index 5ee0818a1e5..5404f490b88 100644
--- a/lisp/obsolete/pc-select.el
+++ b/lisp/obsolete/pc-select.el
@@ -337,7 +337,7 @@ but before calling PC Selection mode):
                             (cadr pc-select-meta-moves-sexps-key-bindings))
                           (if  (or pc-select-selection-keys-only
                                    (eq window-system 'x)
-                                   (memq system-name '(ms-dos windows-nt)))
+                                   (memq system-type '(ms-dos windows-nt)))
                               nil
                             pc-select-tty-key-bindings)))
 
@@ -346,7 +346,7 @@ but before calling PC Selection mode):
 
             (unless  (or pc-select-selection-keys-only
                          (eq window-system 'x)
-                         (memq system-name '(ms-dos windows-nt)))
+                         (memq system-type '(ms-dos windows-nt)))
               ;; it is not clear that we need the following line
               ;; I hope it doesn't do too much harm to leave it in, though...
               (setq pc-select-old-M-delete-binding
@@ -355,7 +355,7 @@ but before calling PC Selection mode):
 
             (when (and (not pc-select-selection-keys-only)
                        (or (eq window-system 'x)
-                           (memq system-name '(ms-dos windows-nt)))
+                           (memq system-type '(ms-dos windows-nt)))
                        (fboundp 'normal-erase-is-backspace-mode))
               (pc-select-save-and-set-mode normal-erase-is-backspace-mode 1
                                            normal-erase-is-backspace))
@@ -378,13 +378,13 @@ but before calling PC Selection mode):
                                (current-global-map))
         (unless  (or pc-select-selection-keys-only
                      (eq window-system 'x)
-                     (memq system-name '(ms-dos windows-nt)))
+                     (memq system-type '(ms-dos windows-nt)))
           ;; it is not clear that we need the following line
           ;; I hope it doesn't do too much harm to leave it in, though...
           (define-key function-key-map  [M-delete] [?\M-d]))
         (when (and (not pc-select-selection-keys-only)
                    (or (eq window-system 'x)
-                       (memq system-name '(ms-dos windows-nt)))
+                       (memq system-type '(ms-dos windows-nt)))
                    (fboundp 'normal-erase-is-backspace-mode))
           (normal-erase-is-backspace-mode 1))
         (setq highlight-nonselected-windows nil)
@@ -395,7 +395,7 @@ but before calling PC Selection mode):
     (when pc-select-key-bindings-alist
       (when (and (not pc-select-selection-keys-only)
                  (or (eq window-system 'x)
-                     (memq system-name '(ms-dos windows-nt))))
+                     (memq system-type '(ms-dos windows-nt))))
         (pc-select-restore-mode normal-erase-is-backspace-mode))
 
       (pc-select-restore-keys
diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el
index 51c87892a9c..c9287586e4e 100644
--- a/lisp/org/org-clock.el
+++ b/lisp/org/org-clock.el
@@ -2811,8 +2811,8 @@ The details of what will be saved are regulated by the variable
           (delete-region (point-min) (point-max))
           ;;Store clock
           (insert (format ";; org-persist.el - %s at %s\n"
-                          system-name (format-time-string
-                                       (cdr org-time-stamp-formats))))
+                          (system-name) (format-time-string
+                                         (cdr org-time-stamp-formats))))
           (if (and (memq org-clock-persist '(t clock))
                    (setq b (org-clocking-buffer))
                    (setq b (or (buffer-base-buffer b) b))
diff --git a/lisp/org/org-ctags.el b/lisp/org/org-ctags.el
index 41775bdab6d..faf543be1b5 100644
--- a/lisp/org/org-ctags.el
+++ b/lisp/org/org-ctags.el
@@ -63,19 +63,19 @@
 ;; with the same name as the link; then, if unsuccessful, ask the user if
 ;; he/she wants to rebuild the 'TAGS' database and try again; then ask if
 ;; the user wishes to append 'tag' as a new toplevel heading at the end of
-;; the buffer; and finally, defer to org's default behaviour which is to
+;; the buffer; and finally, defer to org's default behavior which is to
 ;; search the entire text of the current buffer for 'tag'.
 ;;
-;; This behaviour can be modified by changing the value of
+;; This behavior can be modified by changing the value of
 ;; ORG-CTAGS-OPEN-LINK-FUNCTIONS. For example I have the following in my
-;; .emacs, which describes the same behaviour as the above paragraph with
+;; .emacs, which describes the same behavior as the above paragraph with
 ;; one difference:
 ;;
 ;; (setq org-ctags-open-link-functions
 ;;       '(org-ctags-find-tag
 ;;         org-ctags-ask-rebuild-tags-file-then-find-tag
 ;;         org-ctags-ask-append-topic
-;;         org-ctags-fail-silently))  ; <-- prevents org default behaviour
+;;         org-ctags-fail-silently))  ; <-- prevents org default behavior
 ;;
 ;;
 ;; Usage
diff --git a/lisp/org/ox-html.el b/lisp/org/ox-html.el
index a3f0b501da6..c952a826db8 100644
--- a/lisp/org/ox-html.el
+++ b/lisp/org/ox-html.el
@@ -581,7 +581,7 @@ The function must accept two parameters:
 The function should return the string to be exported.
 
 For example, the variable could be set to the following function
-in order to mimic default behaviour:
+in order to mimic default behavior:
 
 The default value simply returns the value of CONTENTS."
   :group 'org-export-html
diff --git a/lisp/org/ox-latex.el b/lisp/org/ox-latex.el
index 2c71f7d785a..f6f3b220b43 100644
--- a/lisp/org/ox-latex.el
+++ b/lisp/org/ox-latex.el
@@ -589,7 +589,7 @@ The function must accept six parameters:
 The function should return the string to be exported.
 
 For example, the variable could be set to the following function
-in order to mimic default behaviour:
+in order to mimic default behavior:
 
 \(defun org-latex-format-inlinetask \(todo type priority name tags contents\)
 \"Format an inline task element for LaTeX export.\"
diff --git a/lisp/org/ox-publish.el b/lisp/org/ox-publish.el
index efc70d22a83..b33ba459877 100644
--- a/lisp/org/ox-publish.el
+++ b/lisp/org/ox-publish.el
@@ -228,7 +228,7 @@ If you create a site-map file, adjust the sorting like this:
   `:sitemap-sort-files'
 
     The site map is normally sorted alphabetically.  You can
-    change this behaviour setting this to `anti-chronologically',
+    change this behavior setting this to `anti-chronologically',
     `chronologically', or nil.
 
   `:sitemap-ignore-case'
diff --git a/lisp/org/ox.el b/lisp/org/ox.el
index 1327ae409ed..2b0978dfdf0 100644
--- a/lisp/org/ox.el
+++ b/lisp/org/ox.el
@@ -493,7 +493,7 @@ t           Allow export of math snippets."
   "The last level which is still exported as a headline.
 
 Inferior levels will usually produce itemize or enumerate lists
-when exported, but back-end behaviour may differ.
+when exported, but back-end behavior may differ.
 
 This option can also be set with the OPTIONS keyword,
 e.g. \"H:2\"."
@@ -1736,13 +1736,13 @@ Assume buffer is in Org mode.  Narrowing, if any, is ignored."
                       (t
                        ;; Options in `org-export-options-alist'.
                        (dolist (property (funcall find-properties key))
-                         (let ((behaviour (nth 4 (assq property options))))
+                         (let ((behavior (nth 4 (assq property options))))
                            (setq plist
                                  (plist-put
                                   plist property
                                   ;; Handle value depending on specified
                                   ;; BEHAVIOR.
-                                  (case behaviour
+                                  (case behavior
                                     (space
                                      (if (not (plist-get plist property))
                                          (org-trim val)
diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index ef619f0899a..c6cab1257a5 100644
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -418,40 +418,19 @@ It can be quoted, or be inside a quoted form."
          (match-string 0 doc))))
 
 (declare-function find-library-name "find-func" (library))
-
-(defvar elisp--identifier-types '(defun defvar feature defface))
-
-(defun elisp--identifier-location (type sym)
-  (pcase (cons type sym)
-    (`(defun . ,(pred fboundp))
-     (find-definition-noselect sym nil))
-    (`(defvar . ,(pred boundp))
-     (find-definition-noselect sym 'defvar))
-    (`(defface . ,(pred facep))
-     (find-definition-noselect sym 'defface))
-    (`(feature . ,(pred featurep))
-     (require 'find-func)
-     (cons (find-file-noselect (find-library-name
-                                (symbol-name sym)))
-           1))))
+(declare-function find-function-library "find-func" (function &optional l-o v))
 
 (defun elisp--company-location (str)
-  (catch 'res
-    (let ((sym (intern-soft str)))
-      (when sym
-        (dolist (type elisp--identifier-types)
-          (let ((loc (elisp--identifier-location type sym)))
-            (and loc (throw 'res loc))))))))
-
-(defvar elisp--identifier-completion-table
-  (apply-partially #'completion-table-with-predicate
-                   obarray
-                   (lambda (sym)
-                     (or (boundp sym)
-                         (fboundp sym)
-                         (featurep sym)
-                         (symbol-plist sym)))
-                   'strict))
+  (let ((sym (intern-soft str)))
+    (cond
+     ((fboundp sym) (find-definition-noselect sym nil))
+     ((boundp sym) (find-definition-noselect sym 'defvar))
+     ((featurep sym)
+      (require 'find-func)
+      (cons (find-file-noselect (find-library-name
+                                 (symbol-name sym)))
+            0))
+     ((facep sym) (find-definition-noselect sym 'defface)))))
 
 (defun elisp-completion-at-point ()
   "Function used for `completion-at-point-functions' in `emacs-lisp-mode'."
@@ -493,8 +472,13 @@ It can be quoted, or be inside a quoted form."
                            :company-docsig #'elisp--company-doc-string
                            :company-location #'elisp--company-location))
                     ((elisp--form-quoted-p beg)
-                     ;; Don't include all symbols (bug#16646).
-                     (list nil elisp--identifier-completion-table
+                     (list nil obarray
+                           ;; Don't include all symbols (bug#16646).
+                           :predicate (lambda (sym)
+                                        (or (boundp sym)
+                                            (fboundp sym)
+                                            (featurep sym)
+                                            (symbol-plist sym)))
                            :annotation-function
                            (lambda (str) (if (fboundp (intern-soft str)) " <f>"))
                            :company-doc-buffer #'elisp--company-doc-buffer
@@ -572,11 +556,12 @@ It can be quoted, or be inside a quoted form."
 
 ;;; Xref backend
 
-(declare-function xref-make-buffer-location "xref" (buffer position))
+(declare-function xref-make-elisp-location "xref" (symbol type file))
 (declare-function xref-make-bogus-location "xref" (message))
 (declare-function xref-make "xref" (description location))
 
 (defun elisp-xref-find (action id)
+  (require 'find-func)
   (pcase action
     (`definitions
       (let ((sym (intern-soft id)))
@@ -585,16 +570,34 @@ It can be quoted, or be inside a quoted form."
     (`apropos
      (elisp--xref-find-apropos id))))
 
+(defun elisp--xref-identifier-location (type sym)
+  (let ((file
+         (pcase type
+           (`defun (when (fboundp sym)
+                     (let ((fun-lib
+                            (find-function-library sym)))
+                       (setq sym (car fun-lib))
+                       (cdr fun-lib))))
+           (`defvar (when (boundp sym)
+                      (or (symbol-file sym 'defvar)
+                          (help-C-file-name sym 'var))))
+           (`feature (when (featurep sym)
+                       (ignore-errors
+                         (find-library-name (symbol-name sym)))))
+           (`defface (when (facep sym)
+                       (symbol-file sym 'defface))))))
+    (when file
+      (when (string-match-p "\\.elc\\'" file)
+        (setq file (substring file 0 -1)))
+      (xref-make-elisp-location sym type file))))
+
 (defun elisp--xref-find-definitions (symbol)
   (save-excursion
     (let (lst)
-      (dolist (type elisp--identifier-types)
+      (dolist (type '(feature defface defvar defun))
         (let ((loc
                (condition-case err
-                   (let ((buf-pos (elisp--identifier-location type symbol)))
-                     (when buf-pos
-                       (xref-make-buffer-location (car buf-pos)
-                                                  (or (cdr buf-pos) 1))))
+                   (elisp--xref-identifier-location type symbol)
                  (error
                   (xref-make-bogus-location (error-message-string err))))))
           (when loc
@@ -611,8 +614,18 @@ It can be quoted, or be inside a quoted form."
             (push (elisp--xref-find-definitions sym) lst))
            (nreverse lst))))
 
+(defvar elisp--xref-identifier-completion-table
+  (apply-partially #'completion-table-with-predicate
+                   obarray
+                   (lambda (sym)
+                     (or (boundp sym)
+                         (fboundp sym)
+                         (featurep sym)
+                         (facep sym)))
+                   'strict))
+
 (defun elisp--xref-identifier-completion-table ()
-  elisp--identifier-completion-table)
+  elisp--xref-identifier-completion-table)
 
 ;;; Elisp Interaction mode
 
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index 0be99794356..be0dabf17b2 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -975,6 +975,7 @@ onto a ring and may be popped back to with \\[pop-tag-mark].
 Contrast this with the ring of marks gone to by the command.
 
 See documentation of variable `tags-file-name'."
+  (declare (obsolete xref-find-definitions-other-window "25.1"))
   (interactive (find-tag-interactive "Find tag other window: "))
 
   ;; This hair is to deal with the case where the tag is found in the
@@ -1015,6 +1016,7 @@ onto a ring and may be popped back to with \\[pop-tag-mark].
 Contrast this with the ring of marks gone to by the command.
 
 See documentation of variable `tags-file-name'."
+  (declare (obsolete xref-find-definitions-other-frame "25.1"))
   (interactive (find-tag-interactive "Find tag other frame: "))
   (let ((pop-up-frames t))
     (find-tag-other-window tagname next-p)))
@@ -1037,6 +1039,7 @@ onto a ring and may be popped back to with \\[pop-tag-mark].
 Contrast this with the ring of marks gone to by the command.
 
 See documentation of variable `tags-file-name'."
+  (declare (obsolete xref-find-apropos "25.1"))
   (interactive (find-tag-interactive "Find tag regexp: " t))
   ;; We go through find-tag-other-window to do all the display hair there.
   (funcall (if other-window 'find-tag-other-window 'find-tag)
@@ -1786,6 +1789,7 @@ Two variables control the processing we do on each file: the value of
 interesting (it returns non-nil if so) and `tags-loop-operate' is a form to
 evaluate to operate on an interesting file.  If the latter evaluates to
 nil, we exit; otherwise we scan the next file."
+  (declare (obsolete "use `xref-find-definitions' interface instead." "25.1"))
   (interactive)
   (let (new
         ;; Non-nil means we have finished one file
@@ -1929,6 +1933,7 @@ directory specification."
 ;;;###autoload
 (defun tags-apropos (regexp)
   "Display list of all tags in tags table REGEXP matches."
+  (declare (obsolete xref-find-apropos "25.1"))
   (interactive "sTags apropos (regexp): ")
   (with-output-to-temp-buffer "*Tags List*"
     (princ "Click mouse-2 to follow tags.\n\nTags matching regexp `")
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 45074d338d3..f6a9440610e 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -1673,7 +1673,7 @@ This performs fontification according to `js--class-styles'."
     ;; We can probably just add +, -, !, <, >, %, ^, ~, |, &, ?, : at which
     ;; point I think only * and / would be missing which could also be added,
     ;; but need care to avoid affecting the // and */ comment markers.
-    ("\\(?:^\\|[=([{,:;]\\)\\(?:[ \t]\\)*\\(/\\)[^/*]"
+    ("\\(?:^\\|[=([{,:;]\\|\\_<return\\_>\\)\\(?:[ \t]\\)*\\(/\\)[^/*]"
      (1 (ignore
          (forward-char -1)
          (when (or (not (memq (char-after (match-beginning 0)) '(?\s ?\t)))
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 35e24e14e1c..c46c5d68019 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -69,7 +69,7 @@
 ;; Besides that only the standard CPython (2.x and 3.x) shell and
 ;; IPython are officially supported out of the box, the interaction
 ;; should support any other readline based Python shells as well
-;; (e.g. Jython and Pypy have been reported to work).  You can change
+;; (e.g. Jython and PyPy have been reported to work).  You can change
 ;; your default interpreter and commandline arguments by setting the
 ;; `python-shell-interpreter' and `python-shell-interpreter-args'
 ;; variables.  This example enables IPython globally:
@@ -119,18 +119,24 @@
 ;; modify its behavior.
 
 ;; Shell completion: hitting tab will try to complete the current
-;; word.  Shell completion is implemented in such way that if you
-;; change the `python-shell-interpreter' it should be possible to
-;; integrate custom logic to calculate completions.  To achieve this
-;; you just need to set `python-shell-completion-setup-code' and
-;; `python-shell-completion-string-code'.  The default provided code,
-;; enables autocompletion for both CPython and IPython (and ideally
-;; any readline based Python shell).  This code depends on the
-;; readline module, so if you are using some Operating System that
-;; bundles Python without it (like Windows), installing pyreadline
-;; from URL `http://ipython.scipy.org/moin/PyReadline/Intro' should
-;; suffice.  To troubleshoot why you are not getting any completions
-;; you can try the following in your Python shell:
+;; word.  The two built-in mechanisms depend on Python's readline
+;; module: the "native" completion is tried first and is activated
+;; when `python-shell-completion-native-enable' is non-nil, the
+;; current `python-shell-interpreter' is not a member of the
+;; `python-shell-completion-native-disabled-interpreters' variable and
+;; `python-shell-completion-native-setup' succeeds; the "fallback" or
+;; "legacy" mechanism works by executing Python code in the background
+;; and enables auto-completion for shells that do not support
+;; receiving escape sequences (with some limitations, i.e. completion
+;; in blocks does not work).  The code executed for the "fallback"
+;; completion can be found in `python-shell-completion-setup-code' and
+;; `python-shell-completion-string-code' variables.  Their default
+;; values enable completion for both CPython and IPython, and probably
+;; any readline based shell (it's known to work with PyPy).  If your
+;; Python installation lacks readline (like CPython for Windows),
+;; installing pyreadline (URL `http://ipython.org/pyreadline.html')
+;; should suffice.  To troubleshoot why you are not getting any
+;; completions, you can try the following in your Python shell:
 
 ;; >>> import readline, rlcompleter
 
@@ -256,6 +262,7 @@
 (defvar outline-heading-end-regexp)
 
 (autoload 'comint-mode "comint")
+(autoload 'help-function-arglist "help-fns")
 
 ;;;###autoload
 (add-to-list 'auto-mode-alist (cons (purecopy "\\.py\\'")  'python-mode))
@@ -395,7 +402,18 @@
                                          (* ?\\ ?\\) (any ?\' ?\")))
                                 (* ?\\ ?\\)
                                 ;; Match single or triple quotes of any kind.
-                                (group (or  "\"" "\"\"\"" "'" "'''"))))))
+                                (group (or  "\"" "\"\"\"" "'" "'''")))))
+      (coding-cookie . ,(rx line-start ?# (* space)
+                            (or
+                             ;; # coding=<encoding name>
+                             (: "coding" (or ?: ?=) (* space) (group-n 1 (+ (or word ?-))))
+                             ;; # -*- coding: <encoding name> -*-
+                             (: "-*-" (* space) "coding:" (* space)
+                                (group-n 1 (+ (or word ?-))) (* space) "-*-")
+                             ;; # vim: set fileencoding=<encoding name> :
+                             (: "vim:" (* space) "set" (+ space)
+                                "fileencoding" (* space) ?= (* space)
+                                (group-n 1 (+ (or word ?-))) (* space) ":")))))
     "Additional Python specific sexps for `python-rx'")
 
   (defmacro python-rx (&rest regexps)
@@ -1206,12 +1224,18 @@ the line will be re-indented automatically if needed."
            (eolp)
            ;; Avoid re-indenting on extra colon
            (not (equal ?: (char-before (1- (point)))))
-           (not (python-syntax-comment-or-string-p))
-           ;; Never re-indent at beginning of defun
-           (not (save-excursion
-                  (python-nav-beginning-of-statement)
-                  (python-info-looking-at-beginning-of-defun))))
-      (python-indent-line)))))
+           (not (python-syntax-comment-or-string-p)))
+      ;; Just re-indent dedenters
+      (let ((dedenter-pos (python-info-dedenter-statement-p))
+            (current-pos (point)))
+        (when dedenter-pos
+          (save-excursion
+            (goto-char dedenter-pos)
+            (python-indent-line)
+            (unless (= (line-number-at-pos dedenter-pos)
+                       (line-number-at-pos current-pos))
+              ;; Reindent region if this is a multiline statement
+              (python-indent-region dedenter-pos current-pos)))))))))
 
 
 ;;; Navigation
@@ -2087,36 +2111,18 @@ and `python-shell-output-prompt-regexp' using the values from
 
 (defun python-shell-get-process-name (dedicated)
   "Calculate the appropriate process name for inferior Python process.
-If DEDICATED is t and the variable `buffer-file-name' is non-nil
-returns a string with the form
-`python-shell-buffer-name'[variable `buffer-file-name'] else
-returns the value of `python-shell-buffer-name'."
-  (let ((process-name
-         (if (and dedicated
-                  buffer-file-name)
-             (format "%s[%s]" python-shell-buffer-name buffer-file-name)
-           (format "%s" python-shell-buffer-name))))
-    process-name))
+If DEDICATED is t returns a string with the form
+`python-shell-buffer-name'[`buffer-name'] else returns the value
+of `python-shell-buffer-name'."
+  (if dedicated
+      (format "%s[%s]" python-shell-buffer-name (buffer-name))
+    python-shell-buffer-name))
 
 (defun python-shell-internal-get-process-name ()
   "Calculate the appropriate process name for Internal Python process.
 The name is calculated from `python-shell-global-buffer-name' and
-a hash of all relevant global shell settings in order to ensure
-uniqueness for different types of configurations."
-  (format "%s [%s]"
-          python-shell-internal-buffer-name
-          (md5
-           (concat
-            python-shell-interpreter
-            python-shell-interpreter-args
-            python-shell--prompt-calculated-input-regexp
-            python-shell--prompt-calculated-output-regexp
-            (mapconcat #'symbol-value python-shell-setup-codes "")
-            (mapconcat #'identity python-shell-process-environment "")
-            (mapconcat #'identity python-shell-extra-pythonpaths "")
-            (mapconcat #'identity python-shell-exec-path "")
-            (or python-shell-virtualenv-root "")
-            (mapconcat #'identity python-shell-exec-path "")))))
+the `buffer-name'."
+  (format "%s[%s]" python-shell-internal-buffer-name (buffer-name)))
 
 (defun python-shell-calculate-command ()
   "Calculate the string used to execute the inferior Python process."
@@ -2256,11 +2262,9 @@ Avoids `recenter' calls until OUTPUT is completely sent."
   "Execute the forms in BODY with the shell buffer temporarily current.
 Signals an error if no shell buffer is available for current buffer."
   (declare (indent 0) (debug t))
-  (let ((shell-buffer (make-symbol "shell-buffer")))
-    `(let ((,shell-buffer (python-shell-get-buffer)))
-       (when (not ,shell-buffer)
-         (error "No inferior Python buffer available."))
-       (with-current-buffer ,shell-buffer
+  (let ((shell-process (make-symbol "shell-process")))
+    `(let ((,shell-process (python-shell-get-process-or-error)))
+       (with-current-buffer (process-buffer ,shell-process)
          ,@body))))
 
 (defvar python-shell--font-lock-buffer nil)
@@ -2472,12 +2476,12 @@ variable.
   (python-shell-accept-process-output
    (get-buffer-process (current-buffer))))
 
-(defun python-shell-make-comint (cmd proc-name &optional pop internal)
+(defun python-shell-make-comint (cmd proc-name &optional show internal)
   "Create a Python shell comint buffer.
 CMD is the Python command to be executed and PROC-NAME is the
 process name the comint buffer will get.  After the comint buffer
 is created the `inferior-python-mode' is activated.  When
-optional argument POP is non-nil the buffer is shown.  When
+optional argument SHOW is non-nil the buffer is shown.  When
 optional argument INTERNAL is non-nil this process is run on a
 buffer with a name that starts with a space, following the Emacs
 convention for temporary/internal buffers, and also makes sure
@@ -2506,16 +2510,13 @@ killed."
                 (mapconcat #'identity args " ")))
           (with-current-buffer buffer
             (inferior-python-mode))
-          (and pop (pop-to-buffer buffer t))
+          (when show (display-buffer buffer))
           (and internal (set-process-query-on-exit-flag process nil))))
       proc-buffer-name)))
 
 ;;;###autoload
 (defun run-python (&optional cmd dedicated show)
   "Run an inferior Python process.
-Input and output via buffer named after
-`python-shell-buffer-name'.  If there is a process already
-running in that buffer, just switch to it.
 
 Argument CMD defaults to `python-shell-calculate-command' return
 value.  When called interactively with `prefix-arg', it allows
@@ -2523,6 +2524,11 @@ the user to edit such value and choose whether the interpreter
 should be DEDICATED for the current buffer.  When numeric prefix
 arg is other than 0 or 4 do not SHOW.
 
+For a given buffer and same values of DEDICATED, if a process is
+already running for it, it will do nothing.  This means that if
+the current buffer is using a global process, the user is still
+able to switch it to use a dedicated one.
+
 Runs the hook `inferior-python-mode-hook' after
 `comint-mode-hook' is run.  (Type \\[describe-mode] in the
 process buffer for a list of commands.)"
@@ -2533,10 +2539,10 @@ process buffer for a list of commands.)"
         (y-or-n-p "Make dedicated process? ")
         (= (prefix-numeric-value current-prefix-arg) 4))
      (list (python-shell-calculate-command) nil t)))
-  (python-shell-make-comint
-   (or cmd (python-shell-calculate-command))
-   (python-shell-get-process-name dedicated) show)
-  dedicated)
+  (get-buffer-process
+   (python-shell-make-comint
+    (or cmd (python-shell-calculate-command))
+    (python-shell-get-process-name dedicated) show)))
 
 (defun run-python-internal ()
   "Run an inferior Internal Python process.
@@ -2579,6 +2585,21 @@ If current buffer is in `inferior-python-mode', return it."
   "Return inferior Python process for current buffer."
   (get-buffer-process (python-shell-get-buffer)))
 
+(defun python-shell-get-process-or-error (&optional interactivep)
+  "Return inferior Python process for current buffer or signal error.
+When argument INTERACTIVEP is non-nil, use `user-error' instead
+of `error' with a user-friendly message."
+  (or (python-shell-get-process)
+      (if interactivep
+          (user-error
+           "Start a Python process first with `M-x run-python' or `%s'."
+           ;; Get the binding.
+           (key-description
+            (where-is-internal
+             #'run-python overriding-local-map t)))
+        (error
+         "No inferior Python process running."))))
+
 (defun python-shell-get-or-create-process (&optional cmd dedicated show)
   "Get or create an inferior Python process for current buffer and return it.
 Arguments CMD, DEDICATED and SHOW are those of `run-python' and
@@ -2594,6 +2615,11 @@ be asked for their values."
         (run-python cmd dedicated show)))
     (or shell-process (python-shell-get-process))))
 
+(make-obsolete
+ #'python-shell-get-or-create-process
+ "Instead call `python-shell-get-process' and create one if returns nil."
+ "25.1")
+
 (defvar python-shell-internal-buffer nil
   "Current internal shell buffer for the current buffer.
 This is really not necessary at all for the code to work but it's
@@ -2606,12 +2632,10 @@ there for compatibility with CEDET.")
 
 (defun python-shell-internal-get-or-create-process ()
   "Get or create an inferior Internal Python process."
-  (let* ((proc-name (python-shell-internal-get-process-name))
-         (proc-buffer-name (format " *%s*" proc-name)))
-    (when (not (process-live-p proc-name))
-      (run-python-internal)
-      (setq python-shell-internal-buffer proc-buffer-name))
-    (get-buffer-process proc-buffer-name)))
+  (let ((proc-name (python-shell-internal-get-process-name)))
+    (if (process-live-p proc-name)
+        (get-process proc-name)
+      (run-python-internal))))
 
 (define-obsolete-function-alias
   'python-proc 'python-shell-internal-get-or-create-process "24.3")
@@ -2628,20 +2652,24 @@ there for compatibility with CEDET.")
               (concat (file-remote-p default-directory) "/tmp")
             temporary-file-directory))
          (temp-file-name (make-temp-file "py"))
-         (coding-system-for-write 'utf-8))
+         (coding-system-for-write (python-info-encoding)))
     (with-temp-file temp-file-name
-      (insert "# -*- coding: utf-8 -*-\n") ;Not needed for Python-3.
       (insert string)
       (delete-trailing-whitespace))
     temp-file-name))
 
-(defun python-shell-send-string (string &optional process)
-  "Send STRING to inferior Python PROCESS."
-  (interactive "sPython command: ")
-  (let ((process (or process (python-shell-get-or-create-process))))
+(defun python-shell-send-string (string &optional process msg)
+  "Send STRING to inferior Python PROCESS.
+When optional argument MSG is non-nil, forces display of a
+user-friendly message if there's no process running; defaults to
+t when called interactively."
+  (interactive
+   (list (read-string "Python command: ") nil t))
+  (let ((process (or process (python-shell-get-process-or-error msg))))
     (if (string-match ".\n+." string)   ;Multiline.
-        (let* ((temp-file-name (python-shell--save-temp-file string)))
-          (python-shell-send-file temp-file-name process temp-file-name t))
+        (let* ((temp-file-name (python-shell--save-temp-file string))
+               (file-name (or (buffer-file-name) temp-file-name)))
+          (python-shell-send-file file-name process temp-file-name t))
       (comint-send-string process string)
       (when (or (not (string-match "\n\\'" string))
                 (string-match "\n[ \t].*\n?\\'" string))
@@ -2680,7 +2708,7 @@ detecting a prompt at the end of the buffer."
 (defun python-shell-send-string-no-output (string &optional process)
   "Send STRING to PROCESS and inhibit output.
 Return the output."
-  (let ((process (or process (python-shell-get-or-create-process)))
+  (let ((process (or process (python-shell-get-process-or-error)))
         (comint-preoutput-filter-functions
          '(python-shell-output-filter))
         (python-shell-output-filter-in-progress t)
@@ -2717,12 +2745,6 @@ Returns the output.  See `python-shell-send-string-no-output'."
 (define-obsolete-function-alias
   'python-send-string 'python-shell-internal-send-string "24.3")
 
-(defvar python--use-fake-loc nil
-  "If non-nil, use `compilation-fake-loc' to trace errors back to the buffer.
-If nil, regions of text are prepended by the corresponding number of empty
-lines and Python is told to output error messages referring to the whole
-source file.")
-
 (defun python-shell-buffer-substring (start end &optional nomain)
   "Send buffer substring from START to END formatted for shell.
 This is a wrapper over `buffer-substring' that takes care of
@@ -2732,27 +2754,32 @@ the python shell:
      \"if __name__ == '__main__'\" block will be removed.
   2. When a subregion of the buffer is sent, it takes care of
      appending extra empty lines so tracebacks are correct.
-  3. Wraps indented regions under an \"if True:\" block so the
+  3. When the region sent is a substring of the current buffer, a
+     coding cookie is added.
+  4. Wraps indented regions under an \"if True:\" block so the
      interpreter evaluates them correctly."
-  (let ((substring (buffer-substring-no-properties start end))
-        (fillstr (unless python--use-fake-loc
-                   (make-string (1- (line-number-at-pos start)) ?\n)))
-        (toplevel-block-p (save-excursion
-                            (goto-char start)
-                            (or (zerop (line-number-at-pos start))
-                                (progn
-                                  (python-util-forward-comment 1)
-                                  (zerop (current-indentation)))))))
+  (let* ((substring (buffer-substring-no-properties start end))
+         (starts-at-point-min-p (save-restriction
+                                  (widen)
+                                  (= (point-min) start)))
+         (encoding (python-info-encoding))
+         (fillstr (when (not starts-at-point-min-p)
+                    (concat
+                     (format "# -*- coding: %s -*-\n" encoding)
+                     (make-string
+                      ;; Substract 2 because of the coding cookie.
+                      (- (line-number-at-pos start) 2) ?\n))))
+         (toplevel-block-p (save-excursion
+                             (goto-char start)
+                             (or (zerop (line-number-at-pos start))
+                                 (progn
+                                   (python-util-forward-comment 1)
+                                   (zerop (current-indentation)))))))
     (with-temp-buffer
       (python-mode)
       (if fillstr (insert fillstr))
       (insert substring)
       (goto-char (point-min))
-      (unless python--use-fake-loc
-        ;; python-shell--save-temp-file adds an extra coding line, which would
-        ;; throw off the line-counts, so let's try to compensate here.
-        (if (looking-at "[ \t]*[#\n]")
-            (delete-region (point) (line-beginning-position 2))))
       (when (not toplevel-block-p)
         (insert "if True:")
         (delete-region (point) (line-end-position)))
@@ -2763,53 +2790,65 @@ the python shell:
                        (when (python-nav-if-name-main)
                          (cons (point)
                                (progn (python-nav-forward-sexp-safe)
+                                      ;; Include ending newline
+                                      (forward-line 1)
                                       (point)))))))
                ;; Oh destructuring bind, how I miss you.
                (if-name-main-start (car if-name-main-start-end))
-               (if-name-main-end (cdr if-name-main-start-end)))
+               (if-name-main-end (cdr if-name-main-start-end))
+               (fillstr (make-string
+                         (- (line-number-at-pos if-name-main-end)
+                            (line-number-at-pos if-name-main-start)) ?\n)))
           (when if-name-main-start-end
             (goto-char if-name-main-start)
             (delete-region if-name-main-start if-name-main-end)
-            (insert
-             (make-string
-              (- (line-number-at-pos if-name-main-end)
-                 (line-number-at-pos if-name-main-start)) ?\n)))))
+            (insert fillstr))))
+      ;; Ensure there's only one coding cookie in the generated string.
+      (goto-char (point-min))
+      (when (looking-at-p (python-rx coding-cookie))
+        (forward-line 1)
+        (when (looking-at-p (python-rx coding-cookie))
+          (delete-region
+           (line-beginning-position) (line-end-position))))
       (buffer-substring-no-properties (point-min) (point-max)))))
 
-(declare-function compilation-fake-loc "compile"
-                  (marker file &optional line col))
-
-(defun python-shell-send-region (start end &optional nomain)
-  "Send the region delimited by START and END to inferior Python process."
-  (interactive "r")
-  (let* ((python--use-fake-loc
-          (or python--use-fake-loc (not buffer-file-name)))
-         (string (python-shell-buffer-substring start end nomain))
-         (process (python-shell-get-or-create-process))
-         (_ (string-match "\\`\n*\\(.*\\)" string)))
-    (message "Sent: %s..." (match-string 1 string))
-    (let* ((temp-file-name (python-shell--save-temp-file string))
-           (file-name (or (buffer-file-name) temp-file-name)))
-      (python-shell-send-file file-name process temp-file-name t)
-      (unless python--use-fake-loc
-        (with-current-buffer (process-buffer process)
-          (compilation-fake-loc (copy-marker start) temp-file-name
-                                2)) ;; Not 1, because of the added coding line.
-        ))))
-
-(defun python-shell-send-buffer (&optional arg)
+(defun python-shell-send-region (start end &optional send-main msg)
+  "Send the region delimited by START and END to inferior Python process.
+When optional argument SEND-MAIN is non-nil, allow execution of
+code inside blocks delimited by \"if __name__== '__main__':\".
+When called interactively SEND-MAIN defaults to nil, unless it's
+called with prefix argument.  When optional argument MSG is
+non-nil, forces display of a user-friendly message if there's no
+process running; defaults to t when called interactively."
+  (interactive
+   (list (region-beginning) (region-end) current-prefix-arg t))
+  (let* ((string (python-shell-buffer-substring start end (not send-main)))
+         (process (python-shell-get-process-or-error msg))
+         (original-string (buffer-substring-no-properties start end))
+         (_ (string-match "\\`\n*\\(.*\\)" original-string)))
+    (message "Sent: %s..." (match-string 1 original-string))
+    (python-shell-send-string string process)))
+
+(defun python-shell-send-buffer (&optional send-main msg)
   "Send the entire buffer to inferior Python process.
-With prefix ARG allow execution of code inside blocks delimited
-by \"if __name__== '__main__':\"."
-  (interactive "P")
+When optional argument SEND-MAIN is non-nil, allow execution of
+code inside blocks delimited by \"if __name__== '__main__':\".
+When called interactively SEND-MAIN defaults to nil, unless it's
+called with prefix argument.  When optional argument MSG is
+non-nil, forces display of a user-friendly message if there's no
+process running; defaults to t when called interactively."
+  (interactive (list current-prefix-arg t))
   (save-restriction
     (widen)
-    (python-shell-send-region (point-min) (point-max) (not arg))))
+    (python-shell-send-region (point-min) (point-max) send-main msg)))
 
-(defun python-shell-send-defun (arg)
+(defun python-shell-send-defun (&optional arg msg)
   "Send the current defun to inferior Python process.
-When argument ARG is non-nil do not include decorators."
-  (interactive "P")
+When argument ARG is non-nil do not include decorators.  When
+optional argument MSG is non-nil, forces display of a
+user-friendly message if there's no process running; defaults to
+t when called interactively."
+  (interactive (list current-prefix-arg t))
   (save-excursion
     (python-shell-send-region
      (progn
@@ -2825,42 +2864,60 @@ When argument ARG is non-nil do not include decorators."
      (progn
        (or (python-nav-end-of-defun)
            (end-of-line 1))
-       (point-marker)))))
+       (point-marker))
+     nil  ;; noop
+     msg)))
 
 (defun python-shell-send-file (file-name &optional process temp-file-name
-                                         delete)
+                                         delete msg)
   "Send FILE-NAME to inferior Python PROCESS.
 If TEMP-FILE-NAME is passed then that file is used for processing
-instead, while internally the shell will continue to use FILE-NAME.
-If DELETE is non-nil, delete the file afterwards."
-  (interactive "fFile to send: ")
-  (let* ((process (or process (python-shell-get-or-create-process)))
+instead, while internally the shell will continue to use
+FILE-NAME.  If TEMP-FILE-NAME and DELETE are non-nil, then
+TEMP-FILE-NAME is deleted after evaluation is performed.  When
+optional argument MSG is non-nil, forces display of a
+user-friendly message if there's no process running; defaults to
+t when called interactively."
+  (interactive
+   (list
+    (read-file-name "File to send: ")   ; file-name
+    nil                                 ; process
+    nil                                 ; temp-file-name
+    nil                                 ; delete
+    t))                                 ; msg
+  (let* ((process (or process (python-shell-get-process-or-error msg)))
+         (encoding (with-temp-buffer
+                     (insert-file-contents
+                      (or temp-file-name file-name))
+                     (python-info-encoding)))
+         (file-name (expand-file-name
+                     (or (file-remote-p file-name 'localname)
+                         file-name)))
          (temp-file-name (when temp-file-name
                            (expand-file-name
                             (or (file-remote-p temp-file-name 'localname)
-                                temp-file-name))))
-         (file-name (or (when file-name
-                          (expand-file-name
-                           (or (file-remote-p file-name 'localname)
-                               file-name)))
-                        temp-file-name)))
-    (when (not file-name)
-      (error "If FILE-NAME is nil then TEMP-FILE-NAME must be non-nil"))
+                                temp-file-name)))))
     (python-shell-send-string
      (format
-      (concat "__pyfile = open('''%s''');"
-              "exec(compile(__pyfile.read(), '''%s''', 'exec'));"
-              "__pyfile.close()%s")
-      (or temp-file-name file-name) file-name
-      (if delete (format "; import os; os.remove('''%s''')"
-                         (or temp-file-name file-name))
-        ""))
+      (concat
+       "import codecs, os;"
+       "__pyfile = codecs.open('''%s''', encoding='''%s''');"
+       "__code = __pyfile.read().encode('''%s''');"
+       "__pyfile.close();"
+       (when (and delete temp-file-name)
+         (format "os.remove('''%s''');" temp-file-name))
+       "exec(compile(__code, '''%s''', 'exec'));")
+      (or temp-file-name file-name) encoding encoding file-name)
      process)))
 
-(defun python-shell-switch-to-shell ()
-  "Switch to inferior Python process buffer."
-  (interactive)
-  (process-buffer (python-shell-get-or-create-process)) t)
+(defun python-shell-switch-to-shell (&optional msg)
+  "Switch to inferior Python process buffer.
+When optional argument MSG is non-nil, forces display of a
+user-friendly message if there's no process running; defaults to
+t when called interactively."
+  (interactive "p")
+  (pop-to-buffer
+   (process-buffer (python-shell-get-process-or-error msg)) nil t))
 
 (defun python-shell-send-setup-code ()
   "Send all setup code for shell.
@@ -2947,6 +3004,194 @@ the full statement in the case of imports."
   "25.1"
   "Completion string code must work for (i)pdb.")
 
+(defcustom python-shell-completion-native-disabled-interpreters
+  ;; PyPy's readline cannot handle some escape sequences yet.
+  (list "pypy")
+  "List of disabled interpreters.
+When a match is found, native completion is disabled."
+  :type '(repeat string))
+
+(defcustom python-shell-completion-native-enable t
+  "Enable readline based native completion."
+  :type 'boolean)
+
+(defcustom python-shell-completion-native-output-timeout 0.01
+  "Time in seconds to wait for completion output before giving up."
+  :type 'float)
+
+(defvar python-shell-completion-native-redirect-buffer
+  " *Python completions redirect*"
+  "Buffer to be used to redirect output of readline commands.")
+
+(defun python-shell-completion-native-interpreter-disabled-p ()
+  "Return non-nil if interpreter has native completion disabled."
+  (when python-shell-completion-native-disabled-interpreters
+    (string-match
+     (regexp-opt python-shell-completion-native-disabled-interpreters)
+     (file-name-nondirectory python-shell-interpreter))))
+
+(defun python-shell-completion-native-try ()
+  "Return non-nil if can trigger native completion."
+  (let ((python-shell-completion-native-enable t))
+    (python-shell-completion-native-get-completions
+     (get-buffer-process (current-buffer))
+     nil "int")))
+
+(defun python-shell-completion-native-setup ()
+  "Try to setup native completion, return non-nil on success."
+  (let ((process (python-shell-get-process)))
+    (python-shell-send-string
+     (funcall
+      'mapconcat
+      #'identity
+      (list
+       "try:"
+       "    import readline, rlcompleter"
+       ;; Remove parens on callables as it breaks completion on
+       ;; arguments (e.g. str(Ari<tab>)).
+       "    class Completer(rlcompleter.Completer):"
+       "        def _callable_postfix(self, val, word):"
+       "            return word"
+       "    readline.set_completer(Completer().complete)"
+       "    if readline.__doc__ and 'libedit' in readline.__doc__:"
+       "        readline.parse_and_bind('bind ^I rl_complete')"
+       "    else:"
+       "        readline.parse_and_bind('tab: complete')"
+       "    print ('python.el: readline is available')"
+       "except:"
+       "    print ('python.el: readline not available')")
+      "\n")
+     process)
+    (python-shell-accept-process-output process)
+    (when (save-excursion
+            (re-search-backward
+             (regexp-quote "python.el: readline is available") nil t 1))
+      (python-shell-completion-native-try))))
+
+(defun python-shell-completion-native-turn-off (&optional msg)
+  "Turn off shell native completions.
+With argument MSG show deactivation message."
+  (interactive "p")
+  (python-shell-with-shell-buffer
+    (set (make-local-variable 'python-shell-completion-native-enable) nil)
+    (when msg
+      (message "Shell native completion is disabled, using fallback"))))
+
+(defun python-shell-completion-native-turn-on (&optional msg)
+  "Turn on shell native completions.
+With argument MSG show deactivation message."
+  (interactive "p")
+  (python-shell-with-shell-buffer
+    (set (make-local-variable 'python-shell-completion-native-enable) t)
+    (python-shell-completion-native-turn-on-maybe msg)))
+
+(defun python-shell-completion-native-turn-on-maybe (&optional msg)
+  "Turn on native completions if enabled and available.
+With argument MSG show activation/deactivation message."
+  (interactive "p")
+  (python-shell-with-shell-buffer
+    (when python-shell-completion-native-enable
+      (cond
+       ((python-shell-completion-native-interpreter-disabled-p)
+        (python-shell-completion-native-turn-off msg))
+       ((python-shell-completion-native-setup)
+        (when msg
+          (message "Shell native completion is enabled.")))
+       (t (lwarn
+           '(python python-shell-completion-native-turn-on-maybe)
+           :warning
+           (concat
+            "Your `python-shell-interpreter' doesn't seem to "
+            "support readline, yet `python-shell-completion-native' "
+            (format "was `t' and %S is not part of the "
+                    (file-name-nondirectory python-shell-interpreter))
+            "`python-shell-completion-native-disabled-interpreters' "
+            "list.  Native completions have been disabled locally. "))
+          (python-shell-completion-native-turn-off msg))))))
+
+(defun python-shell-completion-native-turn-on-maybe-with-msg ()
+  "Like `python-shell-completion-native-turn-on-maybe' but force messages."
+  (python-shell-completion-native-turn-on-maybe t))
+
+(add-hook 'inferior-python-mode-hook
+          #'python-shell-completion-native-turn-on-maybe-with-msg)
+
+(defun python-shell-completion-native-toggle (&optional msg)
+  "Toggle shell native completion.
+With argument MSG show activation/deactivation message."
+  (interactive "p")
+  (python-shell-with-shell-buffer
+    (if python-shell-completion-native-enable
+        (python-shell-completion-native-turn-off msg)
+      (python-shell-completion-native-turn-on msg))
+    python-shell-completion-native-enable))
+
+(defun python-shell-completion-native-get-completions (process import input)
+  "Get completions using native readline for PROCESS.
+When IMPORT is non-nil takes precedence over INPUT for
+completion."
+  (when (and python-shell-completion-native-enable
+             (python-util-comint-last-prompt)
+             (>= (point) (cdr (python-util-comint-last-prompt))))
+    (let* ((input (or import input))
+           (original-filter-fn (process-filter process))
+           (redirect-buffer (get-buffer-create
+                             python-shell-completion-native-redirect-buffer))
+           (separators (python-rx
+                        (or whitespace open-paren close-paren)))
+           (trigger "\t\t\t")
+           (new-input (concat input trigger))
+           (input-length
+            (save-excursion
+              (+ (- (point-max) (comint-bol)) (length new-input))))
+           (delete-line-command (make-string input-length ?\b))
+           (input-to-send (concat new-input delete-line-command)))
+      ;; Ensure restoring the process filter, even if the user quits
+      ;; or there's some other error.
+      (unwind-protect
+          (with-current-buffer redirect-buffer
+            ;; Cleanup the redirect buffer
+            (delete-region (point-min) (point-max))
+            ;; Mimic `comint-redirect-send-command', unfortunately it
+            ;; can't be used here because it expects a newline in the
+            ;; command and that's exactly what we are trying to avoid.
+            (let ((comint-redirect-echo-input nil)
+                  (comint-redirect-verbose nil)
+                  (comint-redirect-perform-sanity-check nil)
+                  (comint-redirect-insert-matching-regexp nil)
+                  ;; Feed it some regex that will never match.
+                  (comint-redirect-finished-regexp "^\\'$")
+                  (comint-redirect-output-buffer redirect-buffer))
+              ;; Compatibility with Emacs 24.x.  Comint changed and
+              ;; now `comint-redirect-filter' gets 3 args.  This
+              ;; checks which version of `comint-redirect-filter' is
+              ;; in use based on its args and uses `apply-partially'
+              ;; to make it up for the 3 args case.
+              (if (= (length
+                      (help-function-arglist 'comint-redirect-filter)) 3)
+                  (set-process-filter
+                   process (apply-partially
+                            #'comint-redirect-filter original-filter-fn))
+                (set-process-filter process #'comint-redirect-filter))
+              (process-send-string process input-to-send)
+              (accept-process-output
+               process
+               python-shell-completion-native-output-timeout)
+              ;; XXX: can't use `python-shell-accept-process-output'
+              ;; here because there are no guarantees on how output
+              ;; ends.  The workaround here is to call
+              ;; `accept-process-output' until we don't find anything
+              ;; else to accept.
+              (while (accept-process-output
+                      process
+                      python-shell-completion-native-output-timeout))
+              (cl-remove-duplicates
+               (split-string
+                (buffer-substring-no-properties
+                 (point-min) (point-max))
+                separators t))))
+        (set-process-filter process original-filter-fn)))))
+
 (defun python-shell-completion-get-completions (process import input)
   "Do completion at point using PROCESS for IMPORT or INPUT.
 When IMPORT is non-nil takes precedence over INPUT for
@@ -3004,11 +3249,15 @@ using that one instead of current buffer's process."
                 last-prompt-end
               (forward-char (length (match-string-no-properties 0)))
               (point))))
-         (end (point)))
+         (end (point))
+         (completion-fn
+          (if python-shell-completion-native-enable
+              #'python-shell-completion-native-get-completions
+            #'python-shell-completion-get-completions)))
     (list start end
           (completion-table-dynamic
            (apply-partially
-            #'python-shell-completion-get-completions
+            completion-fn
             process import-statement)))))
 
 (define-obsolete-function-alias
@@ -4155,6 +4404,32 @@ operator."
                 (* whitespace) line-end))
     (string-equal "" (match-string-no-properties 1))))
 
+(defun python-info-encoding-from-cookie ()
+  "Detect current buffer's encoding from its coding cookie.
+Returns the enconding as a symbol."
+  (let ((first-two-lines
+         (save-excursion
+           (save-restriction
+             (widen)
+             (goto-char (point-min))
+             (forward-line 2)
+             (buffer-substring-no-properties
+              (point)
+              (point-min))))))
+    (when (string-match (python-rx coding-cookie) first-two-lines)
+      (intern (match-string-no-properties 1 first-two-lines)))))
+
+(defun python-info-encoding ()
+  "Return encoding for file.
+Try `python-info-encoding-from-cookie', if none is found then
+default to utf-8."
+  ;; If no enconding is defined, then it's safe to use UTF-8: Python 2
+  ;; uses ASCII as default while Python 3 uses UTF-8.  This means that
+  ;; in the worst case escenario python.el will make things work for
+  ;; Python 2 files with unicode data and no encoding defined.
+  (or (python-info-encoding-from-cookie)
+      'utf-8))
+
 
 ;;; Utility functions
 
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 524749d6266..904e9dfc289 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -2374,7 +2374,7 @@ Calls the value of `sh-set-shell-hook' if set."
             (sh-make-vars-local))
         (message "Indentation setup for shell type %s" sh-shell))
     (message "No indentation for this shell type.")
-    (setq indent-line-function 'sh-basic-indent-line))
+    (setq-local indent-line-function 'sh-basic-indent-line))
   (when font-lock-mode
     (setq font-lock-set-defaults nil)
     (font-lock-set-defaults)
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index 21c0d6aa6a4..f3dc4bd4cfd 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -136,6 +136,31 @@ actual location is not known.")
 
 (defmethod xref-location-group ((_ xref-bogus-location)) "(No location)")
 
+;; This should be in elisp-mode.el, but it's preloaded, and we can't
+;; preload defclass and defmethod (at least, not yet).
+(defclass xref-elisp-location (xref-location)
+  ((symbol :type symbol :initarg :symbol)
+   (type   :type symbol :initarg :type)
+   (file   :type string :initarg :file
+           :reader xref-location-group))
+  :documentation "Location of an Emacs Lisp symbol definition.")
+
+(defun xref-make-elisp-location (symbol type file)
+  (make-instance 'xref-elisp-location :symbol symbol :type type :file file))
+
+(defmethod xref-location-marker ((l xref-elisp-location))
+  (with-slots (symbol type file) l
+    (let ((buffer-point
+           (pcase type
+             (`defun (find-function-search-for-symbol symbol nil file))
+             ((or `defvar `defface)
+              (find-function-search-for-symbol symbol type file))
+             (`feature
+              (cons (find-file-noselect file) 1)))))
+      (with-current-buffer (car buffer-point)
+        (goto-char (or (cdr buffer-point) (point-min)))
+        (point-marker)))))
+
 
 ;;; Cross-reference
 
@@ -442,7 +467,8 @@ Return an alist of the form ((FILENAME . (XREF ...)) ...)."
 ;;;###autoload
 (defun xref-find-definitions (identifier)
   "Find the definition of the identifier at point.
-With prefix argument, prompt for the identifier."
+With prefix argument or when there's no identifier at point,
+prompt for it."
   (interactive (list (xref--read-identifier "Find definitions of: ")))
   (xref--find-definitions identifier nil))
 
diff --git a/lisp/saveplace.el b/lisp/saveplace.el
index a25dba2e39e..985a52a0fc0 100644
--- a/lisp/saveplace.el
+++ b/lisp/saveplace.el
@@ -138,6 +138,8 @@ disabled, i.e., the position is recorded for all files."
   :version "24.1"
   :type 'regexp :group 'save-place)
 
+(declare-function dired-current-directory "dired" (&optional localp))
+
 (defun toggle-save-place (&optional parg)
   "Toggle whether to save your place in this file between sessions.
 If this mode is enabled, point is recorded when you kill the buffer
@@ -153,7 +155,7 @@ file:
 \(setq-default save-place t)"
   (interactive "P")
   (if (not (or buffer-file-name (and (derived-mode-p 'dired-mode)
-                                     dired-directory)))
+                                     (dired-current-directory))))
       (message "Buffer `%s' not visiting a file or directory" (buffer-name))
     (setq save-place (if parg
                          (> (prefix-numeric-value parg) 0)
@@ -172,12 +174,13 @@ file:
   ;; file.  If not, do so, then feel free to modify the alist.  It
   ;; will be saved again when Emacs is killed.
   (or save-place-loaded (load-save-place-alist-from-file))
-  (let ((item (or buffer-file-name
-                  (and (derived-mode-p 'dired-mode)
-                       dired-directory
-                       (expand-file-name (if (consp dired-directory)
-                                             (car dired-directory)
-                                           dired-directory))))))
+  (let* ((directory (and (derived-mode-p 'dired-mode)
+                         (dired-current-directory)))
+         (item (or buffer-file-name
+                   (and directory
+                        (expand-file-name (if (consp directory)
+                                              (car directory)
+                                            directory))))))
     (when (and item
                (or (not save-place-ignore-files-regexp)
                    (not (string-match save-place-ignore-files-regexp
@@ -186,8 +189,7 @@ file:
             (position (cond ((eq major-mode 'hexl-mode)
                              (with-no-warnings
                                (1+ (hexl-current-address))))
-                            ((and (derived-mode-p 'dired-mode)
-                                  dired-directory)
+                            ((and (derived-mode-p 'dired-mode) directory)
                              (let ((filename (dired-get-filename nil t)))
                                (if filename
                                    `((dired-filename . ,filename))
@@ -305,7 +307,7 @@ may have changed) back to `save-place-alist'."
         ;; save-place checks buffer-file-name too, but we can avoid
         ;; overhead of function call by checking here too.
         (and (or buffer-file-name (and (derived-mode-p 'dired-mode)
-                                       dired-directory))
+                                       (dired-current-directory)))
              (save-place-to-alist))
         (setq buf-list (cdr buf-list))))))
 
@@ -325,19 +327,21 @@ may have changed) back to `save-place-alist'."
 (defun save-place-dired-hook ()
   "Position the point in a Dired buffer."
   (or save-place-loaded (load-save-place-alist-from-file))
-  (let ((cell (assoc (and (derived-mode-p 'dired-mode)
-                          dired-directory
-                          (expand-file-name (if (consp dired-directory)
-                                                (car dired-directory)
-                                              dired-directory)))
-                     save-place-alist)))
+  (let* ((directory (and (derived-mode-p 'dired-mode)
+                         (dired-current-directory)))
+         (cell (assoc (and directory
+                           (expand-file-name (if (consp directory)
+                                                 (car directory)
+                                               directory)))
+                      save-place-alist)))
     (if cell
         (progn
           (or revert-buffer-in-progress-p
-              (if (integerp (cdr cell))
-                  (goto-char (cdr cell))
-                (and (assq 'dired-filename (cdr cell))
-                     (dired-goto-file (cdr (assq 'dired-filename (cdr cell)))))))
+              (cond
+               ((integerp (cdr cell))
+                (goto-char (cdr cell)))
+               ((and (listp (cdr cell)) (assq 'dired-filename (cdr cell)))
+                (dired-goto-file (cdr (assq 'dired-filename (cdr cell)))))))
           ;; and make sure it will be saved again for later
           (setq save-place t)))))
 
diff --git a/lisp/simple.el b/lisp/simple.el
index 0fcd5db45d9..b436dd7699f 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1667,7 +1667,6 @@ invoking, give a prefix argument to `execute-extended-command'."
     (let ((prefix-arg prefixarg))
       (command-execute function 'record))
     ;; If enabled, show which key runs this command.
-    ;; (when binding
     ;; But first wait, and skip the message if there is input.
     (let* ((waited
             ;; If this command displayed something in the echo area;
@@ -1675,10 +1674,11 @@ invoking, give a prefix argument to `execute-extended-command'."
             ;; FIXME: Wait *after* running post-command-hook!
             ;; FIXME: Don't wait if execute-extended-command--shorter won't
             ;; find a better answer anyway!
-            (sit-for (cond
-                      ((zerop (length (current-message))) 0)
-                      ((numberp suggest-key-bindings) suggest-key-bindings)
-                      (t 2)))))
+            (when suggest-key-bindings
+              (sit-for (cond
+                        ((zerop (length (current-message))) 0)
+                        ((numberp suggest-key-bindings) suggest-key-bindings)
+                        (t 2))))))
       (when (and waited (not (consp unread-command-events)))
         (unless (or binding executing-kbd-macro (not (symbolp function))
                     (<= (length (symbol-name function)) 2))
diff --git a/lisp/startup.el b/lisp/startup.el
index 8e981bbc64a..0c5e66a2e6e 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -358,6 +358,8 @@ this variable usefully is to set it while building and dumping Emacs."
   :set (lambda (_variable _value)
           (error "Customizing `site-run-file' does not work")))
 
+(make-obsolete-variable 'system-name "use (system-name) instead" "25.1")
+
 (defcustom mail-host-address nil
   "Name of this machine, for purposes of naming users.
 If non-nil, Emacs uses this instead of `system-name' when constructing
diff --git a/lisp/subr.el b/lisp/subr.el
index 6ce02b79a0a..53ad2729a10 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2166,7 +2166,7 @@ keyboard-quit events while waiting for a valid input."
     char))
 
 (defun sit-for (seconds &optional nodisp obsolete)
-  "Perform redisplay, then wait for SECONDS seconds or until input is available.
+  "Redisplay, then wait for SECONDS seconds.  Stop when input is available.
 SECONDS may be a floating-point value.
 \(On operating systems that do not support waiting for fractions of a
 second, floating-point values are rounded down to the nearest integer.)
@@ -2184,7 +2184,7 @@ floating point support."
   (declare (advertised-calling-convention (seconds &optional nodisp) "22.1"))
   ;; This used to be implemented in C until the following discussion:
   ;; http://lists.gnu.org/archive/html/emacs-devel/2006-07/msg00401.html
-  ;; Then it was moved to C using an implementation based on an idle timer,
+  ;; Then it was moved here using an implementation based on an idle timer,
   ;; which was then replaced by the use of read-event.
   (if (numberp nodisp)
       (setq seconds (+ seconds (* 1e-3 nodisp))
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index 1993ff104f4..12e7fda0f2c 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -1300,18 +1300,48 @@ Inserts the value of `tex-open-quote' (normally ``) or `tex-close-quote'
 \(normally '') depending on the context.  With prefix argument, always
 inserts \" characters."
   (interactive "*P")
+  ;; Discover if we'll be inserting normal double quotes.
+  ;;
   (if (or arg (memq (char-syntax (preceding-char)) '(?/ ?\\))
-          (eq (get-text-property (point) 'face) 'tex-verbatim)
-          (save-excursion
-            (backward-char (length tex-open-quote))
-            (when (or (looking-at (regexp-quote tex-open-quote))
-                      (looking-at (regexp-quote tex-close-quote)))
-              (delete-char (length tex-open-quote))
-              t)))
+          (eq (get-text-property (point) 'face) 'tex-verbatim)
+          ;; Discover if a preceding occurrence of `tex-open-quote'
+          ;; should be morphed to a normal double quote.
+          ;;
+          (and (>= (point) (+ (point-min) (length tex-open-quote)))
+               (save-excursion
+                 (backward-char (length tex-open-quote))
+                 (when (or (looking-at (regexp-quote tex-open-quote))
+                           (looking-at (regexp-quote tex-close-quote)))
+                   (delete-char (length tex-open-quote))
+                   (when (looking-at (regexp-quote tex-close-quote))
+                     (delete-char (length tex-close-quote)))
+                   t))))
+      ;; Insert the normal quote (eventually letting
+      ;; `electric-pair-mode' do its thing).
+      ;;
       (self-insert-command (prefix-numeric-value arg))
-    (insert (if (or (memq (char-syntax (preceding-char)) '(?\( ?> ?\s))
-                    (memq (preceding-char) '(?~)))
-                tex-open-quote tex-close-quote))))
+    ;; We'll be inserting fancy TeX quotes, but consider and imitate
+    ;; `electric-pair-mode''s two behaviors: pair-insertion and
+    ;; region wrapping.
+    ;;
+    (if (and electric-pair-mode (use-region-p))
+        (let* ((saved (point-marker)))
+          (goto-char (mark))
+          (insert (if (> saved (mark)) tex-open-quote tex-close-quote))
+          (goto-char saved)
+          (insert (if (> saved (mark)) tex-close-quote tex-open-quote)))
+      (if (or (memq (char-syntax (preceding-char)) '(?\( ?> ?\s))
+              (memq (preceding-char) '(?~)))
+          (if electric-pair-mode
+              (if (looking-at (regexp-quote tex-close-quote))
+                  (forward-char (length tex-close-quote))
+                (insert tex-open-quote)
+                (insert tex-close-quote)
+                (backward-char (length tex-close-quote)))
+            (insert tex-open-quote))
+        (if (looking-at (regexp-quote tex-close-quote))
+            (forward-char (length tex-close-quote))
+          (insert tex-close-quote))))))
 
 (defun tex-validate-buffer ()
   "Check current buffer for paragraphs containing mismatched braces or $s.
diff --git a/lisp/vc/compare-w.el b/lisp/vc/compare-w.el
index 3b8293cda24..454139e9025 100644
--- a/lisp/vc/compare-w.el
+++ b/lisp/vc/compare-w.el
@@ -30,6 +30,8 @@
 
 ;;; Code:
 
+(require 'diff-mode)                    ; For diff faces.
+
 (defgroup compare-windows nil
   "Compare text between windows."
   :prefix "compare-"
@@ -128,11 +130,19 @@ out all highlighting later with the command `compare-windows-dehighlight'."
   :group 'compare-windows
   :version "22.1")
 
-(defface compare-windows
-  '((t :inherit lazy-highlight))
-  "Face for highlighting of compare-windows difference regions."
+(defface compare-windows-removed
+  '((t :inherit diff-removed))
+  "Face for highlighting of compare-windows removed regions."
   :group 'compare-windows
-  :version "22.1")
+  :version "25.1")
+
+(defface compare-windows-added
+  '((t :inherit diff-added))
+  "Face for highlighting of compare-windows added regions."
+  :group 'compare-windows
+  :version "25.1")
+
+(define-obsolete-face-alias 'compare-windows 'compare-windows-added "25.1")
 
 (defvar compare-windows-overlay1 nil)
 (defvar compare-windows-overlay2 nil)
@@ -158,7 +168,8 @@ then try to get a window on an iconified frame, and finally
 consider all existing frames."
   (or (get-mru-window 'visible t t)
       (get-mru-window 0 t t)
-      (get-mru-window t t t)))
+      (get-mru-window t t t)
+      (error "No other window")))
 
 (defun compare-windows-get-next-window ()
   "Return the window next in the cyclic ordering of windows.
@@ -393,13 +404,13 @@ on third call it again advances points to the next difference and so on."
     (if compare-windows-overlay1
         (move-overlay compare-windows-overlay1 beg1 end1 b1)
       (setq compare-windows-overlay1 (make-overlay beg1 end1 b1))
-      (overlay-put compare-windows-overlay1 'face 'compare-windows)
+      (overlay-put compare-windows-overlay1 'face 'compare-windows-added)
       (overlay-put compare-windows-overlay1 'priority 1000))
     (overlay-put compare-windows-overlay1 'window w1)
     (if compare-windows-overlay2
         (move-overlay compare-windows-overlay2 beg2 end2 b2)
       (setq compare-windows-overlay2 (make-overlay beg2 end2 b2))
-      (overlay-put compare-windows-overlay2 'face 'compare-windows)
+      (overlay-put compare-windows-overlay2 'face 'compare-windows-removed)
       (overlay-put compare-windows-overlay2 'priority 1000))
     (overlay-put compare-windows-overlay2 'window w2)
     (if (not (eq compare-windows-highlight 'persistent))
diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el
index 4955c5abf93..08eb778f804 100644
--- a/lisp/vc/vc-dir.el
+++ b/lisp/vc/vc-dir.el
@@ -169,6 +169,9 @@ See `run-hooks'."
     (define-key map [ise]
       '(menu-item "Isearch Files..." vc-dir-isearch
                   :help "Incremental search a string in the marked files"))
+    (define-key map [display]
+      '(menu-item "Display in Other Window" vc-dir-display-file
+                  :help "Display the file on the current line, in another window"))
     (define-key map [open-other]
       '(menu-item "Open in Other Window" vc-dir-find-file-other-window
                   :help "Find the file on the current line, in another window"))
@@ -273,6 +276,7 @@ See `run-hooks'."
     (define-key map "e" 'vc-dir-find-file) ; dired-mode compatibility
     (define-key map "\C-m" 'vc-dir-find-file)
     (define-key map "o" 'vc-dir-find-file-other-window)
+    (define-key map "\C-o" 'vc-dir-display-file)
     (define-key map "\C-c\C-c" 'vc-dir-kill-dir-status-process)
     (define-key map [down-mouse-3] 'vc-dir-menu)
     (define-key map [mouse-2] 'vc-dir-toggle-mark)
@@ -755,6 +759,13 @@ that share the same state."
   (if event (posn-set-point (event-end event)))
   (find-file-other-window (vc-dir-current-file)))
 
+(defun vc-dir-display-file (&optional event)
+  "Display the file on the current line, in another window."
+  (interactive (list last-nonmenu-event))
+  (if event (posn-set-point (event-end event)))
+  (display-buffer (find-file-noselect (vc-dir-current-file))
+                  t))
+
 (defun vc-dir-isearch ()
   "Search for a string through all marked buffers using Isearch."
   (interactive)
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 65f683c7808..1700bef10b0 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -371,8 +371,7 @@ or an empty string if none."
     (goto-char (point-min))
     (pcase stage
       (`update-index
-       (setq next-stage (if (vc-git--empty-db-p) 'ls-files-added
-                          (if files 'ls-files-up-to-date 'diff-index))))
+       (setq next-stage (if (vc-git--empty-db-p) 'ls-files-added 'diff-index)))
       (`ls-files-added
        (setq next-stage 'ls-files-unknown)
        (while (re-search-forward "\\([0-7]\\{6\\}\\) [0-9a-f]\\{40\\} 0\t\\([^\0]+\\)\0" nil t)
@@ -381,7 +380,7 @@ or an empty string if none."
            (push (list name 'added (vc-git-create-extra-fileinfo 0 new-perm))
                  result))))
       (`ls-files-up-to-date
-       (setq next-stage 'diff-index)
+       (setq next-stage 'ls-files-unknown)
        (while (re-search-forward "\\([0-7]\\{6\\}\\) [0-9a-f]\\{40\\} 0\t\\([^\0]+\\)\0" nil t)
          (let ((perm (string-to-number (match-string 1) 8))
                (name (match-string 2)))
@@ -400,7 +399,7 @@ or an empty string if none."
                      (vc-git-create-extra-fileinfo 0 0))
                result)))
       (`diff-index
-       (setq next-stage 'ls-files-unknown)
+       (setq next-stage (if files 'ls-files-up-to-date 'ls-files-unknown))
        (while (re-search-forward
                ":\\([0-7]\\{6\\}\\) \\([0-7]\\{6\\}\\) [0-9a-f]\\{40\\} [0-9a-f]\\{40\\} \\(\\([ADMUT]\\)\0\\([^\0]+\\)\\|\\([CR]\\)[0-9]*\0\\([^\0]+\\)\0\\([^\0]+\\)\\)\0"
                nil t 1)
diff --git a/lisp/window.el b/lisp/window.el
index 2b593c35a54..21bd2c5829b 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -237,7 +237,12 @@ displays the buffer specified by BUFFER-OR-NAME before running BODY."
               (standard-output ,buffer)
               ,window ,value)
          (with-current-buffer ,buffer
-           (setq ,window (temp-buffer-window-show ,buffer ,vaction)))
+           (setq ,window (temp-buffer-window-show
+                          ,buffer
+                          ;; Remove window-height when it's handled below.
+                          (if (functionp (cdr (assq 'window-height (cdr ,vaction))))
+                              (assq-delete-all 'window-height (copy-sequence ,vaction))
+                            ,vaction))))
 
          (let ((inhibit-read-only t)
                (inhibit-modification-hooks t))