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

12 files changed, 459 insertions, 116 deletions

diff --git a/ChangeLog.2 b/ChangeLog.2
index 7e2f5819c3..4e792955e7 100644
--- a/ChangeLog.2
+++ b/ChangeLog.2
@@ -1,3 +1,252 @@
+2016-08-22  Philipp Stephani  <phst@google.com>
+
+	Some assorted documentation clarifications
+
+	* src/fileio.c (Fwrite_region): Clarify that END is ignored if
+	START is nil.
+	* src/editfns.c (Fbuffer_size): Add short discussion about
+	narrowing.
+	* src/callproc.c (Fcall_process_region): Discuss behavior when
+	START and END are not buffer positions.
+
+2016-08-22  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve commentary in src/character.h
+
+	* src/character.h (BYTES_BY_CHAR_HEAD, MULTIBYTE_LENGTH)
+	(MULTIBYTE_LENGTH_NO_CHECK, STRING_CHAR_AND_LENGTH): Remove stale
+	info from commentary and improve it.
+
+2016-08-22  Dmitry Gutov  <dgutov@yandex.ru>
+
+	* etc/NEWS: Mention the change in json-encode-string.
+
+	The change was made to fix bug#20154, and came up again in bug#24239.
+
+2016-08-22  Eli Zaretskii  <eliz@gnu.org>
+
+	* src/doc.c (Fsubstitute_command_keys): Another fix for smart quotes.
+
+	(Bug#24206)
+
+2016-08-22  Eli Zaretskii  <eliz@gnu.org>
+
+	Avoid segfaults due to quoting in 'substitute-command-keys'
+
+	* src/doc.c (Fsubstitute_command_keys): Correct character counts
+	when the input string is unibyte.  (Bug#24206)
+
+2016-08-22  Martin Rudalics  <rudalics@gmx.at>
+
+	In NEWS describe new handling of window margins (Bug#24193)
+
+	* etc/NEWS: Describe new handling of margins when splitting or
+	resizing windows (Bug#24193).
+
+2016-08-22  Martin Rudalics  <rudalics@gmx.at>
+
+	Facultatively ignore margins when splitting and resizing windows (Bug#24193)
+
+	Provide a new window parameter 'min-margins' which allows to
+	ignore the actual widths of a window's margins when splitting or
+	resizing that window horizontally.  This should serve as a
+	workaround for handling the problems raised by Bug#24193.
+
+	* lisp/window.el (window--min-size-1): Handle new window
+	parameter 'min-margins'.
+	(split-window): Fix text of error messages.
+	* doc/lispref/windows.texi (Window Parameters): Describe new
+	parameter 'min-margins'.
+
+2016-08-22  Noam Postavsky  <npostavs@gmail.com>
+
+	Document CATEGORY arg to modify-category-entry
+
+	* src/category.c (Fmodify_category_entry): Document CATEGORY argument.
+
+2016-08-22  Noam Postavsky  <npostavs@gmail.com>
+
+	Document char-script-table's effect on word motion
+
+	* doc/lispref/positions.texi (Word Motion): Talk about
+	char-script-table (Bug #10494).
+
+2016-08-22  Eli Zaretskii  <eliz@gnu.org>
+
+	Further fix for 'url-http-create-request' and multibyte strings
+
+	* lisp/url/url-http.el (url-http-create-request): Run
+	url-mime-charset-string through url-http--encode-string.
+	(Bug#24117)
+
+2016-08-22  Noam Postavsky  <npostavs@gmail.com>
+
+	Fix docstring of eval-expression
+
+	* lisp/simple.el (eval-expression): Fix the docstring to reflect the
+	fact that the prefix argument does not affect formatting for
+	integers (Bug #20691).
+
+2016-08-22  Eli Zaretskii  <eliz@gnu.org>
+
+	Clarify when 'cursor' property is in effect
+
+	* doc/lispref/text.texi (Special Properties): Minor copyedits.
+	(Bug#24179)
+
+2016-08-22  Dmitry Gutov  <dgutov@yandex.ru>
+
+	Convert the remaining strings to unibyte before concatenating
+
+	* lisp/url/url-http.el (url-http--encode-string): New function.
+	(url-http-create-request): Use it to convert ASCII to unibyte.
+	(Bug#24117)
+
+2016-08-22  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix bug with handling the bidi cache
+
+	* src/xdisp.c (redisplay_window): Save and restore the state of
+	the bidi cache before reusing the iterator after calls to
+	try_window and try_window_reusing_current_matrix.
+
+2016-08-22  Eli Zaretskii  <eliz@gnu.org>
+
+	* doc/lispref/text.texi (Change Hooks): Minor copyedits.
+
+2016-08-22  Eli Zaretskii  <eliz@gnu.org>
+
+	Clarify documentation of before/after-change-functions
+
+	* doc/lispref/text.texi (Change Hooks): Clarify that the hooks are
+	not called in balanced pairs.
+
+2016-08-22  Noam Postavsky  <npostavs@gmail.com>
+
+	Document use of vectors in keymaps
+
+	* doc/lispref/keymaps.texi (Format of Keymaps): Mention vector
+	format (Bug #14797).
+
+2016-08-22  Alan Third  <alan@idiocy.org>
+
+	Post AppDefined events from the main thread ONLY (bug#23934)
+
+	* src/nsterm.h: Make nextappdefined var not just GNUStep.
+	* src/nsterm.m (ns_send_appdefined, sendFromMainThread): Remove GNUStep
+
+2016-08-22  John Wiegley  <johnw@newartisans.com>
+
+	Update to the AUTHORS file for Bob Weiner
+
+		* etc/AUTHORS: Update the packages attributed to Bob Weiner
+
+2016-08-22  John Wiegley  <johnw@newartisans.com>
+
+	Revert "Fix local printer set to left aligned string formatter."
+
+	This reverts commit 8a38e948b039516e70176ebe20c5349e2ade6ac5.
+
+2016-08-22  John Wiegley  <johnw@newartisans.com>
+
+	Revert "Fix ses-delete-blanks to delete only blanks + documentation."
+
+	This reverts commit 3c97b0f7589e06aeb1ab0147f0ee32974c32926d.
+
+2016-08-22  John Wiegley  <johnw@newartisans.com>
+
+	Revert "Fix English."
+
+	This reverts commit b275cc76f0c5ab49e81445fcc3420c8772aefd42.
+
+2016-08-22  Eli Zaretskii  <eliz@gnu.org>
+
+	Improve doc strings of 'gud-gdb' and 'gdb'
+
+	* lisp/progmodes/gdb-mi.el (gdb):
+	* lisp/progmodes/gud.el (gud-gdb): Doc fix.  (Bug#24125)
+
+2016-08-22  Eli Zaretskii  <eliz@gnu.org>
+
+	Fix doc string of 'minibuffer-message-timeout'
+
+	* src/keyboard.c (syms_of_keyboard) <minibuffer-message-timeout>:
+	Doc fix.  (Bug#24123)
+
+2016-08-22  Vincent Belaïche  <vincentb1@users.sourceforge.net>
+
+	Fix English.
+
+	* doc/misc/ses.texi (Nonrelocatable references): Fix grammatically
+	  incorrect English.
+
+2016-08-22  Vincent Belaïche  <vincentb1@users.sourceforge.net>
+
+	Fix ses-delete-blanks to delete only blanks + documentation.
+
+	* doc/misc/ses.texi (Quick Tutorial): Mention the '!'
+	'ses-range' modifier as an alternative to 'ses+'.
+	(Advanced Features): Add a refernce to node 'Nonrelocatable
+	references' concerning function 'ses-rename-cell'.
+	(Standard formula functions): Mention the '!' 'ses-range'
+	modifier as an alternative to 'ses-delete-blanks'.
+	(More on cell printing): Fix fallback printer
+	definition.  Minor editorial formatting changes.
+	(Nonrelocatable references): Document the use of
+	'ses-rename-cell' as a better way to make cell reference
+	non-relocatable.
+	(The data area): Document the presence of local printer
+	definitions in the data area.
+
+	* lisp/ses.el (ses-delete-blanks): Do not remove
+	*error*.  Any error in an argument should propagate into the
+	using formula rather than being silently hidden !
+
+2016-08-22  Noam Postavsky  <npostavs@gmail.com>
+
+	profiler: document prefix arg for tree expansion
+
+	* doc/lispref/debugging.texi (Profiling):
+	* lisp/profiler.el (profiler-report-toggle-entry): Document use of
+	prefix argument to expand whole call trees.
+
+2016-08-22  Noam Postavsky  <npostavs@gmail.com>
+
+	Clarify usage of eshell-visual-options
+
+	* lisp/eshell/em-term.el (eshell-visual-options): Add second option to
+	example usage (Bug #19627).
+
+2016-08-22  Noam Postavsky  <npostavs@gmail.com>
+
+	Fix comment in files-in-below-directory
+
+	* doc/lispintro/emacs-lisp-intro.texi (Files List): Comment should not
+	say append, since the code is adding to front of list (Bug #21589).
+
+2016-08-22  Vincent Belaïche  <vincentb1@users.sourceforge.net>
+
+	Fix local printer set to left aligned string formatter.
+
+	* lisp/ses.el (ses-local-printer-compile): Add missing case
+	for left-aligned string formatter.
+
+2016-08-22  Nicolas Petton  <nicolas@petton.fr>
+
+	Bump Emacs version to 25.1 for the first RC
+
+	* README:
+	* configure.ac:
+	* lisp/ldefs-boot.el:
+	* msdos/sed2v2.inp: Bump Emacs version to 25.1.
+
+2016-08-22  Nicolas Petton  <nicolas@petton.fr>
+
+	* etc/AUTHORS: Update the AUTHORS file
+
+	;; * ChangeLog.2: ChangeLog update.
+
+2016-08-22  Nicolas Petton  <nicolas@petton.fr>
 2016-08-05  Nicolas Petton  <nicolas@petton.fr>
 
 	* admin/authors.el (authors-valid-file-names): Addition.
@@ -37378,6 +37627,7 @@
 
 This file records repository revisions from
 commit 9d56a21e6a696ad19ac65c4b405aeca44785884a (exclusive) to
+2016-08-22bb813cfea53e4162409f2adc0a793ab301894 (inclusive).
 2016-08-05faead6df626b3737c10f98e9c4964232aa6b9 (inclusive).
 2016-06-19d77d8dbd5b051bb681bacaee4a6faffbbdde9 (inclusive).
 2016-03-04a00c6cfb5f3cafbad92bd4584a0f50343a568 (inclusive).
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
 
diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9
index e527567a12..b2c36233bb 100644
--- a/lisp/ChangeLog.9
+++ b/lisp/ChangeLog.9
@@ -6523,7 +6523,7 @@
 	* ansi-color.el (ansi-color-process-output): Use markers instead
 	of positions for start and end of region.
 	(ansi-color-apply-on-region): Rewrote code to make it more robust.
-	Previously, occasional mistakes happend when fontifying many
+	Previously, occasional mistakes happened when fontifying many
 	chunks of output (eg. ls --color=yes /dev).  This happened
 	whenever an overlay was created up to the end of the region, which
 	coincided with the process-mark.  New text would then be added
diff --git a/lisp/erc/ChangeLog.1 b/lisp/erc/ChangeLog.1
index 407beb47d7..1564496778 100644
--- a/lisp/erc/ChangeLog.1
+++ b/lisp/erc/ChangeLog.1
@@ -10324,8 +10324,8 @@
 	* TODO: TODO list created.
 	Add comments and expand it.
 
-	* erc.el:
-	Fixed bug in query buffer handling (only happend in mixed-case situations)
+	* erc.el: Fixed bug in query buffer handling (only happened in
+	mixed-case situations)
 
 	* erc.el: shapr checkdoc patch #1
 	massive docfixes! yay, keep going!
diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el
index 4ccb612384..831520c671 100644
--- a/lisp/ldefs-boot.el
+++ b/lisp/ldefs-boot.el
@@ -13449,7 +13449,8 @@ Interactively, reads the register using `register-read-with-preview'.
 
 ;;;***
 
-;;;### (autoloads nil "gdb-mi" "progmodes/gdb-mi.el" (0 0 0 0))
+;;;### (autoloads nil "gdb-mi" "progmodes/gdb-mi.el" (22431 53468
+;;;;;;  724634 231000))
 ;;; Generated autoloads from progmodes/gdb-mi.el
 
 (defvar gdb-enable-debug nil "\
@@ -13470,14 +13471,18 @@ the list) is deleted every time a new one is added (at the front).
 \(fn &optional ARG)" t nil)
 
 (autoload 'gdb "gdb-mi" "\
-Run gdb on program FILE in buffer *gud-FILE*.
-The directory containing FILE becomes the initial working directory
-and source-file directory for your debugger.
-
-COMMAND-LINE is the shell command for starting the gdb session.
-It should be a string consisting of the name of the gdb
-executable followed by command line options.  The command line
-options should include \"-i=mi\" to use gdb's MI text interface.
+Run gdb passing it COMMAND-LINE as arguments.
+
+If COMMAND-LINE names a program FILE to debug, gdb will run in
+a buffer named *gud-FILE*, and the directory containing FILE
+becomes the initial working directory and source-file directory
+for your debugger.
+If COMMAND-LINE requests that gdb attaches to a process PID, gdb
+will run in *gud-PID*, otherwise it will run in *gud*; in these
+cases the initial working directory is the default-directory of
+the buffer in which this command was invoked.
+
+COMMAND-LINE should include \"-i=mi\" to use gdb's MI text interface.
 Note that the old \"--annotate\" option is no longer supported.
 
 If option `gdb-many-windows' is nil (the default value) then gdb just
@@ -14950,13 +14955,20 @@ the form \"WINDOW-ID PIXMAP-ID\".  Value is non-nil if successful.
 
 ;;;***
 
-;;;### (autoloads nil "gud" "progmodes/gud.el" (0 0 0 0))
+;;;### (autoloads nil "gud" "progmodes/gud.el" (22431 53468 725634
+;;;;;;  240000))
 ;;; Generated autoloads from progmodes/gud.el
 
 (autoload 'gud-gdb "gud" "\
-Run gdb on program FILE in buffer *gud-FILE*.
-The directory containing FILE becomes the initial working
-directory and source-file directory for your debugger.
+Run gdb passing it COMMAND-LINE as arguments.
+If COMMAND-LINE names a program FILE to debug, gdb will run in
+a buffer named *gud-FILE*, and the directory containing FILE
+becomes the initial working directory and source-file directory
+for your debugger.
+If COMMAND-LINE requests that gdb attaches to a process PID, gdb
+will run in *gud-PID*, otherwise it will run in *gud*; in these
+cases the initial working directory is the default-directory of
+the buffer in which this command was invoked.
 
 \(fn COMMAND-LINE)" t nil)
 
@@ -25473,7 +25485,8 @@ Proced buffers.
 
 ;;;***
 
-;;;### (autoloads nil "profiler" "profiler.el" (0 0 0 0))
+;;;### (autoloads nil "profiler" "profiler.el" (22431 53468 722634
+;;;;;;  211000))
 ;;; Generated autoloads from profiler.el
 
 (autoload 'profiler-start "profiler" "\
@@ -29302,7 +29315,7 @@ only these files will be asked to be saved.
 
 ;;;***
 
-;;;### (autoloads nil "ses" "ses.el" (0 0 0 0))
+;;;### (autoloads nil "ses" "ses.el" (22457 44247 406108 197000))
 ;;; Generated autoloads from ses.el
 
 (autoload 'ses-mode "ses" "\
@@ -34509,7 +34522,8 @@ if it had been inserted from a file named URL.
 
 ;;;***
 
-;;;### (autoloads nil "url-http" "url/url-http.el" (0 0 0 0))
+;;;### (autoloads nil "url-http" "url/url-http.el" (22457 44247 409108
+;;;;;;  239000))
 ;;; Generated autoloads from url/url-http.el
  (autoload 'url-default-expander "url-expand")
 
@@ -37848,65 +37862,123 @@ Zone out, completely.
 ;;;;;;  "eshell/em-pred.el" "eshell/em-prompt.el" "eshell/em-rebind.el"
 ;;;;;;  "eshell/em-script.el" "eshell/em-smart.el" "eshell/em-term.el"
 ;;;;;;  "eshell/em-tramp.el" "eshell/em-unix.el" "eshell/em-xtra.el"
-;;;;;;  "eshell/esh-groups.el" "facemenu.el" "faces.el" "files.el"
-;;;;;;  "font-core.el" "font-lock.el" "format.el" "frame.el" "help.el"
-;;;;;;  "hfy-cmap.el" "htmlfontify-loaddefs.el" "ibuf-ext.el" "ibuffer-loaddefs.el"
-;;;;;;  "indent.el" "international/characters.el" "international/charprop.el"
-;;;;;;  "international/charscript.el" "international/cp51932.el"
-;;;;;;  "international/eucjp-ms.el" "international/mule-cmds.el"
-;;;;;;  "international/mule-conf.el" "international/mule.el" "international/uni-bidi.el"
-;;;;;;  "international/uni-brackets.el" "international/uni-category.el"
-;;;;;;  "international/uni-combining.el" "international/uni-comment.el"
-;;;;;;  "international/uni-decimal.el" "international/uni-decomposition.el"
-;;;;;;  "international/uni-digit.el" "international/uni-lowercase.el"
-;;;;;;  "international/uni-mirrored.el" "international/uni-name.el"
-;;;;;;  "international/uni-numeric.el" "international/uni-old-name.el"
-;;;;;;  "international/uni-titlecase.el" "international/uni-uppercase.el"
-;;;;;;  "isearch.el" "jit-lock.el" "jka-cmpr-hook.el" "language/burmese.el"
-;;;;;;  "language/cham.el" "language/chinese.el" "language/cyrillic.el"
-;;;;;;  "language/czech.el" "language/english.el" "language/ethiopic.el"
-;;;;;;  "language/european.el" "language/georgian.el" "language/greek.el"
-;;;;;;  "language/hebrew.el" "language/indian.el" "language/japanese.el"
-;;;;;;  "language/khmer.el" "language/korean.el" "language/lao.el"
-;;;;;;  "language/misc-lang.el" "language/romanian.el" "language/sinhala.el"
-;;;;;;  "language/slovak.el" "language/tai-viet.el" "language/thai.el"
-;;;;;;  "language/tibetan.el" "language/utf-8-lang.el" "language/vietnamese.el"
-;;;;;;  "ldefs-boot.el" "leim/quail/arabic.el" "leim/quail/croatian.el"
-;;;;;;  "leim/quail/cyril-jis.el" "leim/quail/cyrillic.el" "leim/quail/czech.el"
+;;;;;;  "eshell/esh-arg.el" "eshell/esh-cmd.el" "eshell/esh-ext.el"
+;;;;;;  "eshell/esh-io.el" "eshell/esh-module.el" "eshell/esh-opt.el"
+;;;;;;  "eshell/esh-proc.el" "eshell/esh-util.el" "eshell/esh-var.el"
+;;;;;;  "ezimage.el" "format-spec.el" "fringe.el" "generic-x.el"
+;;;;;;  "gnus/compface.el" "gnus/gnus-async.el" "gnus/gnus-bcklg.el"
+;;;;;;  "gnus/gnus-cite.el" "gnus/gnus-cloud.el" "gnus/gnus-cus.el"
+;;;;;;  "gnus/gnus-demon.el" "gnus/gnus-dup.el" "gnus/gnus-eform.el"
+;;;;;;  "gnus/gnus-ems.el" "gnus/gnus-icalendar.el" "gnus/gnus-int.el"
+;;;;;;  "gnus/gnus-logic.el" "gnus/gnus-mh.el" "gnus/gnus-salt.el"
+;;;;;;  "gnus/gnus-score.el" "gnus/gnus-srvr.el" "gnus/gnus-topic.el"
+;;;;;;  "gnus/gnus-undo.el" "gnus/gnus-util.el" "gnus/gnus-uu.el"
+;;;;;;  "gnus/gnus-vm.el" "gnus/gssapi.el" "gnus/ietf-drums.el" "gnus/legacy-gnus-agent.el"
+;;;;;;  "gnus/mail-parse.el" "gnus/mail-prsvr.el" "gnus/mail-source.el"
+;;;;;;  "gnus/mailcap.el" "gnus/messcompat.el" "gnus/mm-archive.el"
+;;;;;;  "gnus/mm-bodies.el" "gnus/mm-decode.el" "gnus/mm-util.el"
+;;;;;;  "gnus/mm-view.el" "gnus/mml-sec.el" "gnus/mml-smime.el" "gnus/nnagent.el"
+;;;;;;  "gnus/nnbabyl.el" "gnus/nndir.el" "gnus/nndraft.el" "gnus/nneething.el"
+;;;;;;  "gnus/nngateway.el" "gnus/nnheader.el" "gnus/nnimap.el" "gnus/nnir.el"
+;;;;;;  "gnus/nnmail.el" "gnus/nnmaildir.el" "gnus/nnmairix.el" "gnus/nnmbox.el"
+;;;;;;  "gnus/nnmh.el" "gnus/nnnil.el" "gnus/nnoo.el" "gnus/nnregistry.el"
+;;;;;;  "gnus/nnrss.el" "gnus/nnspool.el" "gnus/nntp.el" "gnus/nnvirtual.el"
+;;;;;;  "gnus/nnweb.el" "gnus/registry.el" "gnus/rfc1843.el" "gnus/rfc2045.el"
+;;;;;;  "gnus/rfc2047.el" "gnus/rfc2231.el" "gnus/rtree.el" "gnus/sieve-manage.el"
+;;;;;;  "gnus/smime.el" "gnus/spam-stat.el" "gnus/spam-wash.el" "hex-util.el"
+;;;;;;  "hfy-cmap.el" "ibuf-ext.el" "international/charscript.el"
+;;;;;;  "international/fontset.el" "international/iso-ascii.el" "international/ja-dic-cnv.el"
+;;;;;;  "international/ja-dic-utl.el" "international/ogonek.el" "kermit.el"
+;;;;;;  "language/hanja-util.el" "language/thai-word.el" "ldefs-boot.el"
+;;;;;;  "leim/quail/arabic.el" "leim/quail/croatian.el" "leim/quail/cyril-jis.el"
+;;;;;;  "leim/quail/cyrillic.el" "leim/quail/czech.el" "leim/quail/ethiopic.el"
 ;;;;;;  "leim/quail/georgian.el" "leim/quail/greek.el" "leim/quail/hanja-jis.el"
 ;;;;;;  "leim/quail/hanja.el" "leim/quail/hanja3.el" "leim/quail/hebrew.el"
-;;;;;;  "leim/quail/ipa-praat.el" "leim/quail/latin-alt.el" "leim/quail/latin-ltx.el"
-;;;;;;  "leim/quail/latin-post.el" "leim/quail/latin-pre.el" "leim/quail/persian.el"
-;;;;;;  "leim/quail/programmer-dvorak.el" "leim/quail/py-punct.el"
-;;;;;;  "leim/quail/pypunct-b5.el" "leim/quail/rfc1345.el" "leim/quail/sgml-input.el"
-;;;;;;  "leim/quail/slovak.el" "leim/quail/symbol-ksc.el" "leim/quail/tamil-dvorak.el"
-;;;;;;  "leim/quail/vntelex.el" "leim/quail/vnvni.el" "leim/quail/welsh.el"
-;;;;;;  "loadup.el" "mail/blessmail.el" "mail/rmail-loaddefs.el"
-;;;;;;  "mail/rmailedit.el" "mail/rmailkwd.el" "mail/rmailmm.el"
-;;;;;;  "mail/rmailmsc.el" "mail/rmailsort.el" "mail/rmailsum.el"
-;;;;;;  "mail/undigest.el" "menu-bar.el" "mh-e/mh-gnus.el" "mh-e/mh-loaddefs.el"
-;;;;;;  "minibuffer.el" "mouse.el" "net/tramp-loaddefs.el" "newcomment.el"
-;;;;;;  "obarray.el" "org/ob-core.el" "org/ob-keys.el" "org/ob-lob.el"
-;;;;;;  "org/ob-matlab.el" "org/ob-tangle.el" "org/ob.el" "org/org-archive.el"
-;;;;;;  "org/org-attach.el" "org/org-bbdb.el" "org/org-clock.el"
-;;;;;;  "org/org-datetree.el" "org/org-element.el" "org/org-feed.el"
-;;;;;;  "org/org-footnote.el" "org/org-id.el" "org/org-indent.el"
-;;;;;;  "org/org-install.el" "org/org-irc.el" "org/org-loaddefs.el"
-;;;;;;  "org/org-mobile.el" "org/org-plot.el" "org/org-table.el"
-;;;;;;  "org/org-timer.el" "org/ox-ascii.el" "org/ox-beamer.el" "org/ox-html.el"
-;;;;;;  "org/ox-icalendar.el" "org/ox-latex.el" "org/ox-man.el" "org/ox-md.el"
-;;;;;;  "org/ox-odt.el" "org/ox-org.el" "org/ox-publish.el" "org/ox-texinfo.el"
-;;;;;;  "org/ox.el" "progmodes/elisp-mode.el" "progmodes/prog-mode.el"
-;;;;;;  "ps-def.el" "ps-mule.el" "ps-print-loaddefs.el" "register.el"
-;;;;;;  "replace.el" "rfn-eshadow.el" "select.el" "simple.el" "startup.el"
-;;;;;;  "subdirs.el" "subr.el" "textmodes/fill.el" "textmodes/page.el"
-;;;;;;  "textmodes/paragraphs.el" "textmodes/reftex-auc.el" "textmodes/reftex-cite.el"
-;;;;;;  "textmodes/reftex-dcr.el" "textmodes/reftex-global.el" "textmodes/reftex-index.el"
-;;;;;;  "textmodes/reftex-loaddefs.el" "textmodes/reftex-parse.el"
-;;;;;;  "textmodes/reftex-ref.el" "textmodes/reftex-sel.el" "textmodes/reftex-toc.el"
-;;;;;;  "textmodes/text-mode.el" "uniquify.el" "vc/ediff-hook.el"
-;;;;;;  "vc/vc-hooks.el" "version.el" "widget.el" "window.el") (0
-;;;;;;  0 0 0))
+;;;;;;  "leim/quail/indian.el" "leim/quail/ipa-praat.el" "leim/quail/ipa.el"
+;;;;;;  "leim/quail/japanese.el" "leim/quail/lao.el" "leim/quail/latin-alt.el"
+;;;;;;  "leim/quail/latin-ltx.el" "leim/quail/latin-post.el" "leim/quail/latin-pre.el"
+;;;;;;  "leim/quail/lrt.el" "leim/quail/persian.el" "leim/quail/programmer-dvorak.el"
+;;;;;;  "leim/quail/py-punct.el" "leim/quail/pypunct-b5.el" "leim/quail/rfc1345.el"
+;;;;;;  "leim/quail/sgml-input.el" "leim/quail/sisheng.el" "leim/quail/slovak.el"
+;;;;;;  "leim/quail/symbol-ksc.el" "leim/quail/tamil-dvorak.el" "leim/quail/thai.el"
+;;;;;;  "leim/quail/tibetan.el" "leim/quail/viqr.el" "leim/quail/vntelex.el"
+;;;;;;  "leim/quail/vnvni.el" "leim/quail/welsh.el" "loadup.el" "mail/blessmail.el"
+;;;;;;  "mail/mailheader.el" "mail/mspools.el" "mail/rfc2368.el"
+;;;;;;  "mail/rfc822.el" "mail/rmail-spam-filter.el" "mail/rmailedit.el"
+;;;;;;  "mail/rmailkwd.el" "mail/rmailmm.el" "mail/rmailmsc.el" "mail/rmailsort.el"
+;;;;;;  "mail/rmailsum.el" "mail/undigest.el" "mh-e/mh-acros.el"
+;;;;;;  "mh-e/mh-alias.el" "mh-e/mh-buffers.el" "mh-e/mh-compat.el"
+;;;;;;  "mh-e/mh-funcs.el" "mh-e/mh-gnus.el" "mh-e/mh-identity.el"
+;;;;;;  "mh-e/mh-inc.el" "mh-e/mh-junk.el" "mh-e/mh-letter.el" "mh-e/mh-limit.el"
+;;;;;;  "mh-e/mh-loaddefs.el" "mh-e/mh-mime.el" "mh-e/mh-print.el"
+;;;;;;  "mh-e/mh-scan.el" "mh-e/mh-search.el" "mh-e/mh-seq.el" "mh-e/mh-show.el"
+;;;;;;  "mh-e/mh-speed.el" "mh-e/mh-thread.el" "mh-e/mh-tool-bar.el"
+;;;;;;  "mh-e/mh-utils.el" "mh-e/mh-xface.el" "mouse-copy.el" "mwheel.el"
+;;;;;;  "net/dns.el" "net/eudc-vars.el" "net/eudcb-bbdb.el" "net/eudcb-ldap.el"
+;;;;;;  "net/eudcb-mab.el" "net/hmac-def.el" "net/hmac-md5.el" "net/imap.el"
+;;;;;;  "net/ldap.el" "net/mairix.el" "net/newsticker.el" "net/nsm.el"
+;;;;;;  "net/rfc2104.el" "net/sasl-cram.el" "net/sasl-digest.el"
+;;;;;;  "net/sasl-scram-rfc.el" "net/sasl.el" "net/shr-color.el"
+;;;;;;  "net/soap-inspect.el" "net/socks.el" "net/tls.el" "net/tramp-adb.el"
+;;;;;;  "net/tramp-cache.el" "net/tramp-cmds.el" "net/tramp-compat.el"
+;;;;;;  "net/tramp-gvfs.el" "net/tramp-gw.el" "net/tramp-loaddefs.el"
+;;;;;;  "net/tramp-sh.el" "net/tramp-smb.el" "net/tramp-uu.el" "net/zeroconf.el"
+;;;;;;  "notifications.el" "nxml/nxml-enc.el" "nxml/nxml-maint.el"
+;;;;;;  "nxml/nxml-ns.el" "nxml/nxml-outln.el" "nxml/nxml-parse.el"
+;;;;;;  "nxml/nxml-rap.el" "nxml/nxml-util.el" "nxml/rng-dt.el" "nxml/rng-loc.el"
+;;;;;;  "nxml/rng-maint.el" "nxml/rng-match.el" "nxml/rng-parse.el"
+;;;;;;  "nxml/rng-pttrn.el" "nxml/rng-uri.el" "nxml/rng-util.el"
+;;;;;;  "nxml/xsd-regexp.el" "obarray.el" "org/ob-C.el" "org/ob-R.el"
+;;;;;;  "org/ob-asymptote.el" "org/ob-awk.el" "org/ob-calc.el" "org/ob-clojure.el"
+;;;;;;  "org/ob-comint.el" "org/ob-core.el" "org/ob-css.el" "org/ob-ditaa.el"
+;;;;;;  "org/ob-dot.el" "org/ob-emacs-lisp.el" "org/ob-eval.el" "org/ob-exp.el"
+;;;;;;  "org/ob-fortran.el" "org/ob-gnuplot.el" "org/ob-haskell.el"
+;;;;;;  "org/ob-io.el" "org/ob-java.el" "org/ob-js.el" "org/ob-keys.el"
+;;;;;;  "org/ob-latex.el" "org/ob-ledger.el" "org/ob-lilypond.el"
+;;;;;;  "org/ob-lisp.el" "org/ob-lob.el" "org/ob-makefile.el" "org/ob-matlab.el"
+;;;;;;  "org/ob-maxima.el" "org/ob-mscgen.el" "org/ob-ocaml.el" "org/ob-octave.el"
+;;;;;;  "org/ob-org.el" "org/ob-perl.el" "org/ob-picolisp.el" "org/ob-plantuml.el"
+;;;;;;  "org/ob-python.el" "org/ob-ref.el" "org/ob-ruby.el" "org/ob-sass.el"
+;;;;;;  "org/ob-scala.el" "org/ob-scheme.el" "org/ob-screen.el" "org/ob-sh.el"
+;;;;;;  "org/ob-shen.el" "org/ob-sql.el" "org/ob-sqlite.el" "org/ob-table.el"
+;;;;;;  "org/ob-tangle.el" "org/ob.el" "org/org-archive.el" "org/org-attach.el"
+;;;;;;  "org/org-bbdb.el" "org/org-bibtex.el" "org/org-clock.el"
+;;;;;;  "org/org-crypt.el" "org/org-ctags.el" "org/org-datetree.el"
+;;;;;;  "org/org-docview.el" "org/org-element.el" "org/org-entities.el"
+;;;;;;  "org/org-eshell.el" "org/org-faces.el" "org/org-feed.el"
+;;;;;;  "org/org-footnote.el" "org/org-gnus.el" "org/org-habit.el"
+;;;;;;  "org/org-id.el" "org/org-indent.el" "org/org-info.el" "org/org-inlinetask.el"
+;;;;;;  "org/org-install.el" "org/org-irc.el" "org/org-list.el" "org/org-macro.el"
+;;;;;;  "org/org-mhe.el" "org/org-mobile.el" "org/org-mouse.el" "org/org-pcomplete.el"
+;;;;;;  "org/org-plot.el" "org/org-protocol.el" "org/org-rmail.el"
+;;;;;;  "org/org-src.el" "org/org-table.el" "org/org-timer.el" "org/org-w3m.el"
+;;;;;;  "org/ox-ascii.el" "org/ox-beamer.el" "org/ox-html.el" "org/ox-icalendar.el"
+;;;;;;  "org/ox-latex.el" "org/ox-man.el" "org/ox-md.el" "org/ox-odt.el"
+;;;;;;  "org/ox-org.el" "org/ox-publish.el" "org/ox-texinfo.el" "org/ox.el"
+;;;;;;  "play/gametree.el" "progmodes/ada-prj.el" "progmodes/cc-align.el"
+;;;;;;  "progmodes/cc-awk.el" "progmodes/cc-bytecomp.el" "progmodes/cc-cmds.el"
+;;;;;;  "progmodes/cc-defs.el" "progmodes/cc-fonts.el" "progmodes/cc-langs.el"
+;;;;;;  "progmodes/cc-menus.el" "progmodes/ebnf-abn.el" "progmodes/ebnf-bnf.el"
+;;;;;;  "progmodes/ebnf-dtd.el" "progmodes/ebnf-ebx.el" "progmodes/ebnf-iso.el"
+;;;;;;  "progmodes/ebnf-otz.el" "progmodes/ebnf-yac.el" "progmodes/idlw-complete-structtag.el"
+;;;;;;  "progmodes/idlw-help.el" "progmodes/idlw-toolbar.el" "progmodes/mantemp.el"
+;;;;;;  "progmodes/xscheme.el" "ps-def.el" "ps-mule.el" "ps-samp.el"
+;;;;;;  "sb-image.el" "scroll-bar.el" "soundex.el" "subdirs.el" "tempo.el"
+;;;;;;  "textmodes/bib-mode.el" "textmodes/makeinfo.el" "textmodes/page-ext.el"
+;;;;;;  "textmodes/refbib.el" "textmodes/refer.el" "textmodes/reftex-auc.el"
+;;;;;;  "textmodes/reftex-cite.el" "textmodes/reftex-dcr.el" "textmodes/reftex-global.el"
+;;;;;;  "textmodes/reftex-index.el" "textmodes/reftex-parse.el" "textmodes/reftex-ref.el"
+;;;;;;  "textmodes/reftex-sel.el" "textmodes/reftex-toc.el" "textmodes/texnfo-upd.el"
+;;;;;;  "timezone.el" "tooltip.el" "tree-widget.el" "url/url-about.el"
+;;;;;;  "url/url-cookie.el" "url/url-dired.el" "url/url-domsuf.el"
+;;;;;;  "url/url-expand.el" "url/url-ftp.el" "url/url-future.el"
+;;;;;;  "url/url-history.el" "url/url-imap.el" "url/url-methods.el"
+;;;;;;  "url/url-nfs.el" "url/url-proxy.el" "url/url-vars.el" "vc/ediff-diff.el"
+;;;;;;  "vc/ediff-init.el" "vc/ediff-merg.el" "vc/ediff-ptch.el"
+;;;;;;  "vc/ediff-vers.el" "vc/ediff-wind.el" "vc/pcvs-info.el" "vc/pcvs-parse.el"
+;;;;;;  "vc/pcvs-util.el" "vc/vc-dav.el" "vc/vc-filewise.el" "vcursor.el"
+;;;;;;  "vt-control.el" "vt100-led.el" "w32-fns.el" "w32-vars.el"
+;;;;;;  "x-dnd.el") (22458 6108 204266 576000))
 
 ;;;***
 
diff --git a/lisp/org/ChangeLog.1 b/lisp/org/ChangeLog.1
index 9b6702f01e..caa461d771 100644
--- a/lisp/org/ChangeLog.1
+++ b/lisp/org/ChangeLog.1
@@ -2809,7 +2809,7 @@
 	* ox-html.el (org-html-style-default): New classes `footpara' and
 	`footdef' for the footnotes paragraphs and definitions.
 	(org-html-format-footnote-definition): Wrap the footnote
-	defintions into their own div.
+	definitions into their own div.
 	(org-html-paragraph): Don't add extra <br/> after a paragraph in a
 	footnote.
 	(org-html-container-element, org-html-divs): Mention that
diff --git a/src/ChangeLog.12 b/src/ChangeLog.12
index b2df482ba7..a1ebd30c8e 100644
--- a/src/ChangeLog.12
+++ b/src/ChangeLog.12
@@ -4382,7 +4382,7 @@
 
 	* nsterm.m (ns_dumpglyphs_image): Only draw slice of image (Bug#12506).
 
-	* nsterm.m (ns_update_auto_hide_menu_bar): Remove defintion of
+	* nsterm.m (ns_update_auto_hide_menu_bar): Remove definition of
 	MAC_OS_X_VERSION_10_6.
 	(syms_of_nsterm): Remove comment about Panther and above for
 	ns-antialias-text.
diff --git a/src/callproc.c b/src/callproc.c
index 487115d60c..454ed6d633 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -1004,6 +1004,13 @@ create_temp_file (ptrdiff_t nargs, Lisp_Object *args,
 DEFUN ("call-process-region", Fcall_process_region, Scall_process_region,
        3, MANY, 0,
        doc: /* Send text from START to END to a synchronous process running PROGRAM.
+
+START and END are normally buffer positions specifying the part of the
+buffer to send to the process.
+If START is nil, that means to use the entire buffer contents; END is
+ignored.
+If START is a string, then send that string to the process
+instead of any buffer contents; END is ignored.
 The remaining arguments are optional.
 Delete the text if fourth arg DELETE is non-nil.
 
diff --git a/src/character.h b/src/character.h
index 586f330fba..0d0e31c4c9 100644
--- a/src/character.h
+++ b/src/character.h
@@ -237,7 +237,8 @@ enum
 #define CHAR_HEAD_P(byte) (((byte) & 0xC0) != 0x80)
 
 /* How many bytes a character that starts with BYTE occupies in a
-   multibyte form.  */
+   multibyte form.  Unlike MULTIBYTE_LENGTH below, this macro does not
+   validate the multibyte form, but looks only at its first byte.  */
 #define BYTES_BY_CHAR_HEAD(byte)	\
   (!((byte) & 0x80) ? 1			\
    : !((byte) & 0x20) ? 2		\
@@ -247,7 +248,9 @@ enum
 
 
 /* The byte length of multibyte form at unibyte string P ending at
-   PEND.  If STR doesn't point to a valid multibyte form, return 0.  */
+   PEND.  If the string doesn't point to a valid multibyte form,
+   return 0.  Unlike BYTES_BY_CHAR_HEAD, this macro validates the
+   multibyte form.  */
 
 #define MULTIBYTE_LENGTH(p, pend)				\
   (p >= pend ? 0						\
@@ -263,7 +266,8 @@ enum
    : 0)
 
 
-/* Like MULTIBYTE_LENGTH, but don't check the ending address.  */
+/* Like MULTIBYTE_LENGTH, but don't check the ending address.  The
+   multibyte form is still validated, unlike BYTES_BY_CHAR_HEAD.  */
 
 #define MULTIBYTE_LENGTH_NO_CHECK(p)			\
   (!((p)[0] & 0x80) ? 1					\
@@ -324,15 +328,7 @@ enum
 
 
 /* Like STRING_CHAR, but set ACTUAL_LEN to the length of multibyte
-   form.
-
-   Note: This macro returns the actual length of the character's
-   multibyte sequence as it is stored in a buffer or string.  The
-   character it returns might have a different codepoint that has a
-   different multibyte sequence of a different length, due to possible
-   unification of CJK characters inside string_char.  Therefore do NOT
-   assume that the length returned by this macro is identical to the
-   length of the multibyte sequence of the character it returns.  */
+   form.  */
 
 #define STRING_CHAR_AND_LENGTH(p, actual_len)			\
   (!((p)[0] & 0x80)						\
diff --git a/src/editfns.c b/src/editfns.c
index 732306af86..26a86c7fab 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -1065,7 +1065,14 @@ usage: (save-current-buffer &rest BODY)  */)
 
 DEFUN ("buffer-size", Fbuffer_size, Sbuffer_size, 0, 1, 0,
        doc: /* Return the number of characters in the current buffer.
-If BUFFER, return the number of characters in that buffer instead.  */)
+If BUFFER is not nil, return the number of characters in that buffer
+instead.
+
+This does not take narrowing into account; to count the number of
+characters in the accessible portion of the current buffer, use
+`(- (point-max) (point-min))', and to count the number of characters
+in some other BUFFER, use
+`(with-current-buffer BUFFER (- (point-max) (point-min)))'.  */)
   (Lisp_Object buffer)
 {
   if (NILP (buffer))
diff --git a/src/fileio.c b/src/fileio.c
index 37948bc0ee..bf6bf622ab 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -4654,7 +4654,8 @@ DEFUN ("write-region", Fwrite_region, Swrite_region, 3, 7,
 When called from a program, requires three arguments:
 START, END and FILENAME.  START and END are normally buffer positions
 specifying the part of the buffer to write.
-If START is nil, that means to use the entire buffer contents.
+If START is nil, that means to use the entire buffer contents; END is
+ignored.
 If START is a string, then output that string to the file
 instead of any buffer contents; END is ignored.