summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2019-04-12 07:51:35 -0700
committerGlenn Morris <rgm@gnu.org>2019-04-12 07:51:35 -0700
commita25f4d6ef5f8c3724274f6d0bb91300bcbe076ae (patch)
treeb42c66e58f9e306c9965d22baf1d034b8c5dd413
parentd4b90e598e77c90fadff9ce8bd7da31dd62225a4 (diff)
parent818a68b1cab9eb27d552ba825470fda802dbebcd (diff)
downloademacs-a25f4d6ef5f8c3724274f6d0bb91300bcbe076ae.tar.gz
Merge from origin/emacs-26
818a68b * etc/HISTORY: Update for Emacs 26.2 release. e04aa5a ; ChangeLog.3 update 8297e97 * etc/AUTHORS: Update. 8582936 Improve documentation of 'read-command' dc81c05 ; * CONTRIBUTE: Mention where to ask for the copyright assign... b77723a Fix an outdated URL in a comment
-rw-r--r--CONTRIBUTE6
-rw-r--r--ChangeLog.3147
-rw-r--r--doc/lispref/minibuf.texi3
-rw-r--r--etc/AUTHORS24
-rw-r--r--etc/HISTORY2
-rw-r--r--src/emacs.c9
-rw-r--r--src/minibuf.c3
7 files changed, 178 insertions, 16 deletions
diff --git a/CONTRIBUTE b/CONTRIBUTE
index e8bb95df45a..a5433e30d37 100644
--- a/CONTRIBUTE
+++ b/CONTRIBUTE
@@ -54,6 +54,12 @@ packages the patch's commit message and changes. To send just one
such patch without additional remarks, you can use a command like
'git send-email --to=bug-gnu-emacs@gnu.org 0001-DESCRIPTION.patch'.
+Once the cumulative amount of your submissions exceeds about 15 lines
+of non-trivial changes, we will need you to assign to the FSF the
+copyright for your contributions. Ask on emacs-devel@gnu.org, and we
+will send you the necessary form together with the instructions to
+fill and email it, in order to start this legal paperwork.
+
** Issue tracker (a.k.a. "bug tracker")
The Emacs issue tracker at https://debbugs.gnu.org lets you view bug
diff --git a/ChangeLog.3 b/ChangeLog.3
index 235c8bb180e..e7f4d866326 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -1,3 +1,148 @@
+2019-04-11 Eli Zaretskii <eliz@gnu.org>
+
+ Improve documentation of 'read-command'
+
+ * src/minibuf.c (Fread_command): Document the return value
+ when DEFAULT-VALUE is nil and the user enters nothing.
+ * doc/lispref/minibuf.texi (High-Level Completion): Document
+ the printed representation of a symbol whose name is empty.
+ (Bug#3522)
+
+2019-04-11 Eli Zaretskii <eliz@gnu.org>
+
+ Fix an outdated URL in a comment
+
+ * src/emacs.c: Fix reference to Cocoa CoreFoundation Release
+ Notes. (Bug#35225)
+
+2019-04-11 Basil L. Contovounesios <contovob@tcd.ie>
+
+ Backport: Fix comment-empty-lines docstring (bug#35152)
+
+ * lisp/newcomment.el (comment-empty-lines): Consistently use US
+ commas in docstring. Fix indentation of and typo in custom :type.
+
+ (cherry picked from commit 690c678fb6c1fb5b2f828f9bb90782bd0b01c399)
+
+2019-04-11 Alex Branham <alex.branham@gmail.com>
+
+ Backport: Update documentation for indent-relative functions
+
+ * lisp/indent.el (indent-relative): Document what happens when there
+ is no previous nonblank line.
+ * doc/lispref/text.texi (Relative Indent): Document
+ indent-relative-first-indent-point instead of obsolete
+ indent-relative-maybe. Fix documentation of which argument from
+ 'indent-relative' is used.
+
+ Bug#34858
+
+ (cherry picked from commit 10cd65878c741d2a22a1f2c36c54fcad4e516f72)
+
+2019-04-11 Noam Postavsky <npostavs@gmail.com>
+
+ Update nxml-mode.texi: completion now gives xmlns="-!-"
+
+ * doc/misc/nxml-mode.texi (Completion): As of 2016-01-16 "* lisp/nxml:
+ Use standard completion; it also works for company-mode", completing
+ an attribute when there is only one candidate inserts both quotes.
+ Update the example accordingly.
+
+2019-04-10 Eric Abrahamsen <eric@ericabrahamsen.net>
+
+ Note that choose-completion-string-functions funcs take four args
+
+ * lisp/simple.el (choose-completion-string-functions): Functions in
+ this list actually need to accept four arguments, though the fourth
+ should be ignored.
+
+2019-04-10 Gemini Lasswell <gazally@runbox.com>
+
+ Address name conflicts in EIEIO documentation (bug#31660)
+
+ * doc/misc/eieio.texi (Quick Start): Rename the class used in the
+ example from 'record' to 'person'.
+ (Building Classes): Advise user to check for name conflicts before
+ naming a class. Add a missing apostrophe.
+ (Making New Objects): Correct grammar. Rename the class used in the
+ example from 'record' to 'my-class'.
+
+2019-04-09 Mattias Engdegård <mattiase@acm.org>
+
+ Clarify the TESTFN argument to `alist-get'
+
+ * lisp/subr.el (alist-get):
+ Rephrase the initial text to clarify the meaning of the TESTFN argument.
+ It's an equality predicate, not a look-up function (Bug#35206).
+
+ (cherry picked from commit c81465580fe262f28ce47502c00f4afcbe3b8f8d)
+
+2019-04-08 Eli Zaretskii <eliz@gnu.org>
+
+ * src/editfns.c (Fnarrow_to_region): Doc fix. (Bug#35163)
+
+2019-04-06 Eli Zaretskii <eliz@gnu.org>
+
+ Fix doc strings of 'vc-version-diff' and 'vc-version-ediff'
+
+ * lisp/vc/vc.el (vc-version-diff, vc-version-ediff): Describe
+ arguments in the doc strings. (Bug#35019)
+
+2019-04-06 Eli Zaretskii <eliz@gnu.org>
+
+ Improve documentation of set-window-start
+
+ * doc/lispref/windows.texi (Window Start and End):
+ * src/window.c (Fset_window_start): Document that reliable
+ setting of a window start position requires to adjust point to
+ be visible. (Bug#34038)
+
+2019-04-06 Eli Zaretskii <eliz@gnu.org>
+
+ Improve documentation of window parameters
+
+ * doc/lispref/windows.texi (Cyclic Window Ordering): Describe
+ the effect of the 'other-window' window parameter.
+ (Window Parameters): Improve the descriptions of window
+ parameters. Move the detailed description of the
+ 'quit-restore' window parameter from here...
+ (Quitting Windows): ...to here. (Bug#35063)
+
+2019-04-06 Eli Zaretskii <eliz@gnu.org>
+
+ Improve commentary in frame.el
+
+ * lisp/frame.el: Improve commentary for display-* functions.
+ (Bug#35058)
+
+2019-04-06 Mauro Aranda <maurooaranda@gmail.com>
+
+ Fix typo in a doc string
+
+ * lisp/autorevert.el (global-auto-revert-mode): Fix a typo.
+ (Bug#35165)
+
+2019-03-20 Paul Eggert <eggert@cs.ucla.edu>
+
+ Say which regexp ranges should be avoided
+
+ * doc/lispref/searching.texi (Regexp Special): Say that
+ regular expressions like "[a-m-z]" and "[[:alpha:]-~]" should
+ be avoided, for the same reason that regular expressions like
+ "+" and "*" should be avoided: POSIX says their behavior is
+ undefined, and they are confusing anyway. Also, explain
+ better what happens when the bound of a range is a raw 8-bit
+ byte; the old explanation appears to have been obsolete
+ anyway. Finally, say that ranges like "[\u00FF-\xFF]" that
+ mix non-ASCII characters and raw 8-bit bytes should be
+ avoided, since it’s not clear what they should mean.
+
+2019-03-20 Nicolas Petton <nicolas@petton.fr>
+
+ * etc/AUTHORS: Update.
+
+ * ; ChangeLog.3 update
+
2019-03-20 Eli Zaretskii <eliz@gnu.org>
Improve indexing of the user manual
@@ -64946,7 +65091,7 @@
This file records repository revisions from
commit 9d56a21e6a696ad19ac65c4b405aeca44785884a (exclusive) to
-commit 0f523deec1c1e9e2a5a3474f912aa2183d3fe33d (inclusive).
+commit 85829363f728c410e33ffdc3839202977b2115cc (inclusive).
See ChangeLog.1 for earlier changes.
;; Local Variables:
diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi
index 6c37fa92d6c..cfea336a9e5 100644
--- a/doc/lispref/minibuf.texi
+++ b/doc/lispref/minibuf.texi
@@ -1333,7 +1333,8 @@ is a string, @code{read-command} interns it before returning it.
If it is a list, @code{read-command} interns the first element of this list.
If @var{default} is @code{nil}, that means no default has been
specified; then if the user enters null input, the return value is
-@code{(intern "")}, that is, a symbol whose name is an empty string.
+@code{(intern "")}, that is, a symbol whose name is an empty string,
+and whose printed representation is @code{##} (@pxref{Symbol Type}).
@example
(read-command "Command name? ")
diff --git a/etc/AUTHORS b/etc/AUTHORS
index 73c5245678f..2f7e01575bd 100644
--- a/etc/AUTHORS
+++ b/etc/AUTHORS
@@ -163,7 +163,7 @@ Alexandru Harsanyi: wrote soap-client.el soap-inspect.el
and changed emacs3.py vc-hooks.el vc.el xml.el
Alex Branham: changed bibtex.el dired-x.el dired.el em-rebind.el eww.el
- imenu.el modes.texi programs.texi
+ imenu.el indent.el modes.texi programs.texi text.texi
Alex Coventry: changed files.el
@@ -442,8 +442,8 @@ Bartosz Duszel: changed allout.el bib-mode.el cc-cmds.el hexl.el icon.el
Basil L. Contovounesios: changed simple.el message.el sequences.texi
bibtex.el css-mode-tests.el css-mode.el customize.texi display.texi
- gnus-art.el json-tests.el json.el lists.texi man.el modes.texi rcirc.el
- shr-color.el text.texi url-handlers.el
+ gnus-art.el json-tests.el json.el lists.texi man.el modes.texi
+ newcomment.el rcirc.el shr-color.el text.texi url-handlers.el
Bastian Beischer: changed include.el mru-bookmark.el refs.el
semantic/complete.el senator.el
@@ -1354,8 +1354,8 @@ Eli Zaretskii: wrote [bidirectional display in xdisp.c]
tty-colors.el
and changed xdisp.c msdos.c w32.c display.texi w32fns.c simple.el
files.el fileio.c keyboard.c w32proc.c files.texi w32term.c text.texi
- dispnew.c frames.texi emacs.c dispextern.h lisp.h process.c term.c
- window.c and 1125 other files
+ dispnew.c emacs.c frames.texi dispextern.h lisp.h window.c process.c
+ term.c and 1125 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
@@ -1380,7 +1380,7 @@ Eric Abrahamsen: changed eieio-base.el registry.el nnimap.el
gnus-registry.el files.el files.texi windows.texi eieio-test-persist.el
eieio.el gnus-start.el gnus-sum.el gnus.texi nnir.el buffers.texi
checkdoc.el files-tests.el gnus-bcklg.el gnus-group.el nnmairix.el
- org.el org.texi and 3 other files
+ org.el org.texi and 4 other files
Eric Bélanger: changed image.c
@@ -1682,9 +1682,9 @@ Geert Kloosterman: changed which-func.el
Gemini Lasswell: wrote edebug-tests.el kmacro-tests.el testcover-tests.el
and changed edebug.el cl-macs.el cl-generic.el ert-x.el cl-print.el
edebug-test-code.el edebug.texi eieio-compat.el generator.el subr.el
- autorevert-tests.el cl-print-tests.el emacs-lisp/debug.el eval-tests.el
- eval.c filenotify-tests.el generator-tests.el kmacro.el lread.c
- map-tests.el map.el and 9 other files
+ autorevert-tests.el cl-print-tests.el eieio.texi emacs-lisp/debug.el
+ eval-tests.el eval.c filenotify-tests.el generator-tests.el kmacro.el
+ lread.c map-tests.el and 10 other files
Geoff Gole: changed align.el ibuffer.el whitespace.el
@@ -3258,6 +3258,8 @@ Matt Hodges: changed textmodes/table.el faces.el iswitchb.el simple.el
edebug.texi eldoc.el em-hist.el em-pred.el fixit.texi icon.el ido.el
locate.el paragraphs.el pcomplete.el repeat.el and 3 other files
+Mattias Engdegård: changed subr.el
+
Matt Lundin: changed org-agenda.el org.el org-bibtex.el org-footnote.el
ox-publish.el org-bbdb.el org-datetree.el org-gnus.el
@@ -3270,7 +3272,7 @@ Matt Simmons: changed message.el
Matt Swift: changed dired.el editfns.c lisp-mode.el mm-decode.el
outline.el progmodes/compile.el rx.el simple.el startup.el
-Mauro Aranda: changed files.texi os.texi
+Mauro Aranda: changed autorevert.el files.texi os.texi
Maxime Edouard Robert Froumentin: changed gnus-art.el mml.el
@@ -3649,7 +3651,7 @@ Noam Postavsky: changed lisp-mode.el progmodes/python.el xdisp.c
cl-macs.el lisp-mode-tests.el emacs-lisp/debug.el data.c simple.el
term.el ert.el subr.el help-fns.el bytecomp.el cl-print.el
elisp-mode.el eval.c ffap.el modes.texi search.c sh-script.el
- cl-preloaded.el and 248 other files
+ cl-preloaded.el and 249 other files
Nobuyoshi Nakada: co-wrote ruby-mode.el
diff --git a/etc/HISTORY b/etc/HISTORY
index b239904253b..bf03692d3ff 100644
--- a/etc/HISTORY
+++ b/etc/HISTORY
@@ -216,6 +216,8 @@ GNU Emacs 25.3 (2017-09-11) emacs-25.3
GNU Emacs 26.1 (2018-05-28) emacs-26.1
+GNU Emacs 26.2 (2019-04-12) emacs-26.2
+
----------------------------------------------------------------------
This file is part of GNU Emacs.
diff --git a/src/emacs.c b/src/emacs.c
index 68835cac985..6ed4b0ed87a 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -157,9 +157,14 @@ static uprintmax_t heap_bss_diff;
/* To run as a background daemon under Cocoa or Windows,
we must do a fork+exec, not a simple fork.
- On Cocoa, CoreFoundation lib fails in forked process:
+ On Cocoa, CoreFoundation lib fails in forked process, see Mac OS X
+ Leopard Developer Release Notes for CoreFoundation Framework:
+
http://developer.apple.com/ReleaseNotes/
- CoreFoundation/CoreFoundation.html)
+ CoreFoundation/CoreFoundation.html
+
+ Note: the above is no longer available on-line, but it can be found
+ via the "Wayback machine", https://web.archive.org.
On Windows, a Cygwin fork child cannot access the USER subsystem.
diff --git a/src/minibuf.c b/src/minibuf.c
index a0025e22720..10fd5e56ac3 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -995,7 +995,8 @@ the current input method and the setting of`enable-multibyte-characters'. */)
DEFUN ("read-command", Fread_command, Sread_command, 1, 2, 0,
doc: /* Read the name of a command and return as a symbol.
Prompt with PROMPT. By default, return DEFAULT-VALUE or its first element
-if it is a list. */)
+if it is a list. If DEFAULT-VALUE is omitted or nil, and the user enters
+null input, return a symbol whose name is an empty string. */)
(Lisp_Object prompt, Lisp_Object default_value)
{
Lisp_Object name, default_string;