Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

4 files changed, 19 insertions, 6 deletions

diff --git a/etc/NEWS b/etc/NEWS
index e823905e8d3..dbe0de38db6 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -314,17 +314,26 @@ standards.
 
 * Changes in Specialized Modes and Packages in Emacs 25.1
 
+** JSON
+---
+*** `json-pretty-print' and `json-pretty-print-buffer' now maintain
+the ordering of object keys by default.
+
 ** You can recompute the VC state of a file buffer with `M-x vc-refresh-state'
 ** Prog mode has some support for multi-mode indentation.
 See `prog-indentation-context' and `prog-widen'.
 
-** Prettify Symbols mode supports custom composition predicates.  By
+** Prettify Symbols mode
+*** Prettify Symbols mode supports custom composition predicates.  By
 overriding the default `prettify-symbols-compose-predicate', modes can
 specify in which contexts a symbol map be composed to some unicode
 character.  `prettify-symbols-default-compose-p' is the default which
 is suitable for most programming languages such as C or Lisp (but not
 (La)TeX).
 
+*** Symbols can be unprettified while point is inside them.
+New variable `prettify-symbols-unprettify-at-point' configures this.
+
 ** New `xterm-screen-extra-capabilities' config.
 
 ** The `save-place' variable is replaced by a `save-place-mode'.
@@ -634,9 +643,13 @@ you can no longer use commas to separate regular expressions.
 
 ** SES now supports local printer functions; see `ses-define-local-printer'.
 
-** In sh-mode, you can now use `sh-shell' as a file-local variable to
+** sh-script
+*** In sh-mode you can now use `sh-shell' as a file-local variable to
 specify the type of shell in use (bash, csh, etc).
 
+*** New value `always' for sh-indent-after-continuation.
+This provides old-style ("dumb") indentation of continued lines.
+
 ** TLS
 ---
 *** Fatal TLS errors are now silent by default.
diff --git a/etc/compilation.txt b/etc/compilation.txt
index f134f53d00c..da6df8a1bb4 100644
--- a/etc/compilation.txt
+++ b/etc/compilation.txt
@@ -52,6 +52,7 @@ jikes are the ending line and ending column.
     [javac] /src/DataBaseTestCase.java:27: unreported exception ...
     [javac] /src/DataBaseTestCase.java:49: warning: finally clause cannot complete normally
     [jikes]  foo.java:3:5:7:9: blah blah
+  [javadoc] c:\MyProject\Polynomial.java:560: error: unknown tag: math
 
 
 * Bash v2
diff --git a/etc/themes/wombat-theme.el b/etc/themes/wombat-theme.el
index d49f9bf636f..734731a1ffa 100644
--- a/etc/themes/wombat-theme.el
+++ b/etc/themes/wombat-theme.el
@@ -1,4 +1,4 @@
-;;; wombat-theme.el --- Custom face theme for Emacs  -*-coding: utf-8 -*-
+;;; wombat-theme.el --- Custom face theme for Emacs
 
 ;; Copyright (C) 2011-2015 Free Software Foundation, Inc.
 
diff --git a/etc/tutorials/TUTORIAL.cn b/etc/tutorials/TUTORIAL.cn
index 5e187a45ce1..6a558c3f4f2 100644
--- a/etc/tutorials/TUTORIAL.cn
+++ b/etc/tutorials/TUTORIAL.cn
@@ -286,10 +286,9 @@ Emacs 可以有多个“窗格”，每个窗格显示不同的文字。后面�
 
 <Return> 是一个特殊的键，因为按下这个键后，得到的可能不仅仅是一个换行
 符。根据周围文本的不同，Emacs 可能会在换行符之后插入一些空白字符，这样，
-当你在新的一行开始打字时，文本会自动与前一行对齐。我们把这个按下一个键
-时不只是插入其对应字符的特性叫做“电动”（electric）。
+当你在新的一行开始打字时，文本会自动与前一行对齐。
 
->> 这是一个电动 <Return> 的例子。
+>> 这是一个自动���进���例子。
    在这一行的末尾输入 <Return>。
 
 可以看到，在插入换行符之后，Emacs 插入了空格，因此光标移动到了“在”这个