Merge from origin/emacs-25

927afa1 ; Update ChangeLog.2 and ldef-boot.el for Emacs 25.1 RC2
6bf83b5 * etc/AUTHORS: Update the AUTHORS file
73cbb81 ; ChangeLog spelling fixes
9b99772 Some assorted documentation clarifications
37d4723 Improve commentary in src/character.h
5ccd593 ; Fix typo in /etc/NEWS
96e3d16 * etc/NEWS: Mention the change in json-encode-string.
2e524034 ; * etc/NEWS: Mention incompatible change in url-http-create...
2e4e74e Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emac...
66dea65 ; * doc/lispref/windows.texi (Window Parameters): Grammar twe...

# Conflicts:
#	ChangeLog.2
#	lisp/ldefs-boot.el

2 files changed, 34 insertions, 24 deletions

diff --git a/etc/AUTHORS b/etc/AUTHORS
index 8272009639..0b300d0dbc 100644
--- a/etc/AUTHORS
+++ b/etc/AUTHORS
@@ -105,7 +105,7 @@ Alan Shutko: changed diary-lib.el calendar.el bindings.el cal-hebrew.el
   solar.el
 
 Alan Third: wrote dabbrev-tests.el
-and changed nsterm.m emacs.c nsterm.h picture.el
+and changed nsterm.m nsterm.h emacs.c picture.el
 
 Alastair Burt: changed gnus-art.el smiley.el
 
@@ -486,7 +486,7 @@ Bob Rogers: changed vc-dir.el vc-svn.el cperl-mode.el diff.el ewoc.el
   ffap.el files.el maintaining.texi sql.el thingatpt.el vc.el
   vc1-xtra.texi
 
-Bob Weiner: changed dframe.el etags.c info.el rmail.el rmailsum.el speedbar.el
+Bob Weiner: changed info.el quail.el
 
 Bojan Petrovic: changed pop3.el
 
@@ -626,7 +626,7 @@ and co-wrote longlines.el tango-dark-theme.el tango-theme.el
 and changed simple.el display.texi xdisp.c files.el frames.texi
   cus-edit.el files.texi custom.el subr.el text.texi faces.el keyboard.c
   startup.el package.el misc.texi emacs.texi modes.texi mouse.el
-  custom.texi image.c window.el and 946 other files
+  custom.texi image.c window.el and 945 other files
 
 Chris Chase: co-wrote idlw-shell.el idlwave.el
 
@@ -1242,9 +1242,9 @@ Eli Zaretskii: wrote [bidirectional display in xdisp.c]
   [tty menus in term.c] abbrev-tests.el bidi.c biditest.el
   coding-tests.el rxvt.el tty-colors.el
 and changed xdisp.c msdos.c w32.c w32fns.c display.texi files.el fileio.c
-  simple.el w32proc.c w32term.c keyboard.c dispnew.c emacs.c dispextern.h
+  simple.el w32proc.c keyboard.c w32term.c dispnew.c emacs.c dispextern.h
   config.bat sed1v2.inp src/Makefile.in term.c window.c INSTALL
-  frames.texi and 994 other files
+  frames.texi and 993 other files
 
 Emanuele Giaquinta: changed configure.ac rxvt.el charset.c etags.c
   fontset.c frame.el gnus-faq.texi loadup.el lread.c sh-script.el
@@ -1327,7 +1327,7 @@ and changed c.srt ede.texi info.el rmail.el speedbspec.el cedet.el
   ede-autoconf.srt ede-make.srt eieio.texi gud.el sb-dir-minus.xpm
   sb-dir-plus.xpm sb-dir.xpm sb-mail.xpm sb-pg-minus.xpm sb-pg-plus.xpm
   sb-pg.xpm sb-tag-gt.xpm sb-tag-minus.xpm sb-tag-plus.xpm
-  sb-tag-type.xpm and 34 other files
+  sb-tag-type.xpm and 33 other files
 
 Eric Schulte: wrote ob-C.el ob-asymptote.el ob-awk.el ob-calc.el
   ob-comint.el ob-css.el ob-ditaa.el ob-dot.el ob-emacs-lisp.el
@@ -1607,7 +1607,7 @@ and changed configure.ac Makefile.in src/Makefile.in calendar.el
   diary-lib.el lisp/Makefile.in files.el rmail.el progmodes/f90.el
   make-dist simple.el bytecomp.el emacs.texi misc/Makefile.in ack.texi
   authors.el lib-src/Makefile.in startup.el admin.el cal-menu.el
-  calendar.texi and 1601 other files
+  calendar.texi and 1600 other files
 
 Glynn Clements: wrote gamegrid.el snake.el tetris.el
 
@@ -2354,7 +2354,7 @@ Juri Linkov: wrote files-x.el misearch.el occur-tests.el
 and changed isearch.el info.el replace.el simple.el progmodes/grep.el
   dired-aux.el dired.el progmodes/compile.el startup.el faces.el files.el
   menu-bar.el bindings.el display.texi descr-text.el desktop.el comint.el
-  image-mode.el ispell.el man.el cus-edit.el and 356 other files
+  image-mode.el ispell.el man.el cus-edit.el and 355 other files
 
 Jussi Lahdenniemi: changed ms-w32.h w32.c w32.h w32fns.c w32heap.c
 
@@ -2373,7 +2373,7 @@ and co-wrote longlines.el tramp-sh.el tramp.el
 and changed message.el gnus-agent.el gnus-sum.el files.el nnmail.el
   tramp.texi nntp.el gnus.el simple.el ange-ftp.el dired.el paragraphs.el
   bindings.el files.texi gnus-art.el gnus-group.el man.el INSTALL
-  Makefile.in crisp.el fileio.c and 45 other files
+  Makefile.in crisp.el fileio.c and 44 other files
 
 Kailash C. Chowksey: changed HELLO ind-util.el kannada.el knd-util.el
   lisp/Makefile.in loadup.el
@@ -2746,7 +2746,7 @@ Luc Teirlinck: wrote help-at-pt.el
 and changed files.el autorevert.el cus-edit.el subr.el simple.el
   frames.texi startup.el display.texi files.texi dired.el comint.el
   modes.texi custom.texi emacs.texi fns.c frame.el ielm.el minibuf.texi
-  variables.texi buffers.texi commands.texi and 213 other files
+  variables.texi buffers.texi commands.texi and 212 other files
 
 Ludovic Courtès: wrote nnregistry.el
 and changed configure.ac gnus.texi loadup.el
@@ -3122,7 +3122,7 @@ Michael Olson: changed erc.el erc-backend.el Makefile erc-track.el
   erc-log.el erc-stamp.el erc-autoaway.el erc-dcc.el erc-goodies.el
   erc-list.el erc-compat.el erc-identd.el erc.texi ERC-NEWS erc-bbdb.el
   erc-match.el erc-notify.el erc-ibuffer.el erc-services.el remember.el
-  erc-button.el and 56 other files
+  erc-button.el and 55 other files
 
 Michael Piotrowski: changed gnus-art.el gnus-sum.el ps-print.el
 
@@ -3341,8 +3341,8 @@ Nicolas Graner: changed message.el
 Nicolas Petton: wrote map-tests.el map.el seq-tests.el seq.el
   thunk-tests.el thunk.el
 and co-wrote auth-source-tests.el subr-tests.el
-and changed sequences.texi emacs.png README authors.el configure.ac
-  sed2v2.inp emacs23.png arc-mode.el cl-extra.el emacs.svg Emacs.icns
+and changed sequences.texi emacs.png README configure.ac sed2v2.inp
+  authors.el emacs23.png arc-mode.el cl-extra.el emacs.svg Emacs.icns
   Makefile.in auth-source.el emacs.ico obarray-tests.el obarray.el data.c
   emacs-document.svg emacs-document23.svg emacs.texi emacs23.svg
   and 6 other files
@@ -3381,9 +3381,10 @@ and changed rsz-mini.el emacs-buffer.gdb comint.el files.el Makefile
 Noah Lavine: changed tramp.el
 
 Noam Postavsky: changed w32.c buffer-tests.el buffer.c buffers.texi
-  cl-macs.el cmdproxy.c cus-edit.el elisp-mode.el files.el find-func.el
-  insdel.c minibuf.texi modes.texi os.texi package.texi process-tests.el
-  processes.texi rect.el search.c sh-script.el subr.el and 4 other files
+  category.c cl-macs.el cmdproxy.c cus-edit.el debugging.texi
+  elisp-mode.el em-term.el emacs-lisp-intro.texi files.el find-func.el
+  insdel.c keymaps.texi minibuf.texi modes.texi os.texi package.texi
+  positions.texi and 12 other files
 
 Nobuyoshi Nakada: co-wrote ruby-mode.el
 
@@ -3648,9 +3649,9 @@ Philipp Rumpf: changed electric.el
 
 Philipp Stephani: wrote xt-mouse-tests.el
 and changed emacs-module.c lisp.h mod-test.c xt-mouse.el xterm.el
-  Makefile alloc.c configure.ac dynlib.c dynlib.h electric-tests.el
-  emacs-module.h eval.c fns.c modhelp.py mule.el src/Makefile.in test.el
-  unexmacosx.c whitespace.el
+  Makefile alloc.c callproc.c configure.ac dynlib.c dynlib.h editfns.c
+  electric-tests.el emacs-module.h eval.c fileio.c fns.c modhelp.py
+  mule.el src/Makefile.in test.el and 3 other files
 
 Phillip Lord: changed undo.c simple.el viper-cmd.el keyboard.c cmds.c
   fileio.c autoload.el automated/Makefile.in cl-extra.el ert.el
@@ -4213,8 +4214,8 @@ Stephen A. Wood: changed fortran.el
 Stephen Berman: co-wrote todo-mode.el
 and changed todo-mode.texi diary-lib.el doc-view.el minibuffer.el
   files.el info.el otodo-mode.el subr.el allout.el compile.texi dframe.el
-  dir dired-aux.el dired.el elpa files.texi find-dired.el floatfns.c
-  frame.c frames.texi gamegrid.el and 28 other files
+  dired-aux.el dired.el elpa files.texi find-dired.el floatfns.c frame.c
+  frames.texi gamegrid.el gnus-group.el and 27 other files
 
 Stephen C. Gilardi: changed configure.ac
 
@@ -4365,7 +4366,7 @@ Teodor Zlatanov: wrote auth-source.el gnus-registry.el gnus-sync.el
 and changed spam.el gnus.el nnimap.el gnus.texi gnus-sum.el gnutls.c
   auth.texi cfengine.el gnus-util.el gnus-start.el netrc.el message.el
   spam-stat.el encrypt.el gnutls.h nnir.el nnmail.el imap.el
-  mail-source.el nnmairix.el nntp.el and 110 other files
+  mail-source.el nnmairix.el nntp.el and 109 other files
 
 Terje Rosten: changed xfns.c version.el xterm.c xterm.h
 
@@ -4639,8 +4640,8 @@ Viktor Rosenfeld: changed ob-sql.el org.el
 
 Ville Skyttä: changed mh-comp.el pgg.el tcl.el
 
-Vincent Belaïche: changed ses.el 5x5.el calc-alg.el calc-vec.el calc.texi
-  compilation.txt ses.texi autotype.texi calc-embed.el calc-help.el
+Vincent Belaïche: changed ses.el ses.texi 5x5.el calc-alg.el calc-vec.el
+  calc.texi compilation.txt autotype.texi calc-embed.el calc-help.el
   calc-misc.el calc.el configure.bat floatfns.c macroexp.el org.el
   package.el progmodes/compile.el recentf.el reftex-parse.el
   reftex-toc.el reftex.el
diff --git a/etc/NEWS b/etc/NEWS
index 694a0eadff..494a091a36 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -913,6 +913,9 @@ GnuTLS encryption functions if possible.
 
 ** JSON
 
+*** 'json-encode-string' now only escapes the characters it has to.
+Which means that the encoded strings can contain non-ASCII characters.
+
 *** 'json-pretty-print' and 'json-pretty-print-buffer' now maintain
 the ordering of object keys by default.
 
@@ -1849,6 +1852,12 @@ Emacs 24.2 and earlier, which did not support unary '/'.
 that happen, 'unhandled-file-name-directory' now defaults to calling
 'file-name-as-directory'.
 
+** The URL package now insists on sending only unibyte strings to server
+This means packages that use URL cannot bind 'url-request-data' to
+multibyte strings.  If non-ASCII characters should be part of the URL
+payload, then 'url-request-data' should be encoded to become a unibyte
+string.
+
 
 * Lisp Changes in Emacs 25.1