* lisp/term/screen.el (xterm-screen-extra-capabilities): New custom

(terminal-init-screen): Use it (bug#20356).
* lisp/term/xterm.el: Provide `term/xterm' instead of `xterm'.
(xterm--extra-capabilities-type): New const.
(xterm-extra-capabilities): Use it.
(xterm--version-handler): Lower the pseudo-version for `screen'.

1 files changed, 7 insertions, 0 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 74976527d6f..715295bc6bb 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -238,6 +238,8 @@ Unicode standards.
 
 * Changes in Specialized Modes and Packages in Emacs 25.1
 
+** New `xterm-screen-extra-capabilities' config.
+
 ** The `save-place' variable is replaced by a `save-place-mode'.
 
 ** Midnight-mode
@@ -691,6 +693,11 @@ a typographically-correct documents.
 
 * Incompatible Lisp Changes in Emacs 25.1
 
+** `indirect-function' does not signal `void-function' any more.
+This is mostly a bug-fix, since this change was missed back in 24.4 when
+symbol-function was changed not to signal `void-function' any more.
+*** As a consequence, the second arg of `indirect-function' is now obsolete.
+
 ** Comint, term, and compile do not set the EMACS env var any more.
 Use the INSIDE_EMACS environment variable instead.