Commit c325e199 authored by Paul Eggert's avatar Paul Eggert

Merge from origin/emacs-25

927afa1e ; Update ChangeLog.2 and ldef-boot.el for Emacs 25.1 RC2
6bf83b5e * etc/AUTHORS: Update the AUTHORS file
73cbb813 ; ChangeLog spelling fixes
9b99772c Some assorted documentation clarifications
37d4723f Improve commentary in src/character.h
5ccd5933 ; Fix typo in /etc/NEWS
96e3d163 * etc/NEWS: Mention the change in json-encode-string.
2e524034 ; * etc/NEWS: Mention incompatible change in url-http-create...
2e4e74ea Merge branch 'emacs-25' of
66dea652 ; * doc/lispref/windows.texi (Window Parameters): Grammar twe...

# Conflicts:
#	ChangeLog.2
#	lisp/ldefs-boot.el
parents 512b06e4 927afa1e
2016-08-22 Philipp Stephani <>
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
* src/callproc.c (Fcall_process_region): Discuss behavior when
START and END are not buffer positions.
2016-08-22 Eli Zaretskii <>
Improve commentary in src/character.h
info from commentary and improve it.
2016-08-22 Dmitry Gutov <>
* 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 <>
* src/doc.c (Fsubstitute_command_keys): Another fix for smart quotes.
2016-08-22 Eli Zaretskii <>
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 <>
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 <>
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 <>
Document CATEGORY arg to modify-category-entry
* src/category.c (Fmodify_category_entry): Document CATEGORY argument.
2016-08-22 Noam Postavsky <>
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 <>
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.
2016-08-22 Noam Postavsky <>
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 <>
Clarify when 'cursor' property is in effect
* doc/lispref/text.texi (Special Properties): Minor copyedits.
2016-08-22 Dmitry Gutov <>
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.
2016-08-22 Eli Zaretskii <>
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 <>
* doc/lispref/text.texi (Change Hooks): Minor copyedits.
2016-08-22 Eli Zaretskii <>
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 <>
Document use of vectors in keymaps
* doc/lispref/keymaps.texi (Format of Keymaps): Mention vector
format (Bug #14797).
2016-08-22 Alan Third <>
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 <>
Update to the AUTHORS file for Bob Weiner
* etc/AUTHORS: Update the packages attributed to Bob Weiner
2016-08-22 John Wiegley <>
Revert "Fix local printer set to left aligned string formatter."
This reverts commit 8a38e948b039516e70176ebe20c5349e2ade6ac5.
2016-08-22 John Wiegley <>
Revert "Fix ses-delete-blanks to delete only blanks + documentation."
This reverts commit 3c97b0f7589e06aeb1ab0147f0ee32974c32926d.
2016-08-22 John Wiegley <>
Revert "Fix English."
This reverts commit b275cc76f0c5ab49e81445fcc3420c8772aefd42.
2016-08-22 Eli Zaretskii <>
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 <>
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 <>
Fix English.
* doc/misc/ses.texi (Nonrelocatable references): Fix grammatically
incorrect English.
2016-08-22 Vincent Belaïche <>
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
(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 <>
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 <>
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 <>
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 <>
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 <>
Bump Emacs version to 25.1 for the first RC
* lisp/ldefs-boot.el:
* msdos/sed2v2.inp: Bump Emacs version to 25.1.
2016-08-22 Nicolas Petton <>
* etc/AUTHORS: Update the AUTHORS file
;; * ChangeLog.2: ChangeLog update.
2016-08-22 Nicolas Petton <>
2016-08-05 Nicolas Petton <>
* 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).
......@@ -105,7 +105,7 @@ Alan Shutko: changed diary-lib.el calendar.el bindings.el cal-hebrew.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
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/ term.c window.c INSTALL
frames.texi and 994 other files
frames.texi and 993 other files
Emanuele Giaquinta: changed 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 ede.texi info.el rmail.el speedbspec.el cedet.el 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 src/ calendar.el
diary-lib.el lisp/ files.el rmail.el progmodes/f90.el
make-dist simple.el bytecomp.el emacs.texi misc/ ack.texi
authors.el lib-src/ 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 crisp.el fileio.c and 45 other files crisp.el fileio.c and 44 other files
Kailash C. Chowksey: changed HELLO ind-util.el kannada.el knd-util.el
lisp/ 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 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
sed2v2.inp emacs23.png arc-mode.el cl-extra.el emacs.svg Emacs.icns
and changed sequences.texi emacs.png README sed2v2.inp
authors.el emacs23.png arc-mode.el cl-extra.el emacs.svg Emacs.icns 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 dynlib.c dynlib.h electric-tests.el
emacs-module.h eval.c fns.c mule.el src/ test.el
unexmacosx.c whitespace.el
Makefile alloc.c callproc.c dynlib.c dynlib.h editfns.c
electric-tests.el emacs-module.h eval.c fileio.c fns.c
mule.el src/ 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/ 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
......@@ -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
......@@ -913,6 +913,9 @@ GnuTLS encryption functions if possible.
*** '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
** 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
* Lisp Changes in Emacs 25.1
......@@ -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
......@@ -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!
This diff is collapsed.
......@@ -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
(org-html-container-element, org-html-divs): Mention that
......@@ -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
(syms_of_nsterm): Remove comment about Panther and above for
......@@ -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
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.
......@@ -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. */
(!((p)[0] & 0x80) ? 1 \
......@@ -324,15 +328,7 @@ enum
/* Like STRING_CHAR, but set ACTUAL_LEN to the length of multibyte
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) \
......@@ -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
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))
......@@ -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
If START is a string, then output that string to the file
instead of any buffer contents; END is ignored.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment