diff options
| author | Glenn Morris | 2019-04-12 07:51:35 -0700 |
|---|---|---|
| committer | Glenn Morris | 2019-04-12 07:51:35 -0700 |
| commit | a25f4d6ef5f8c3724274f6d0bb91300bcbe076ae (patch) | |
| tree | b42c66e58f9e306c9965d22baf1d034b8c5dd413 /src | |
| parent | d4b90e598e77c90fadff9ce8bd7da31dd62225a4 (diff) | |
| parent | 818a68b1cab9eb27d552ba825470fda802dbebcd (diff) | |
| download | emacs-a25f4d6ef5f8c3724274f6d0bb91300bcbe076ae.tar.gz emacs-a25f4d6ef5f8c3724274f6d0bb91300bcbe076ae.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/emacs.c | 9 | ||||
| -rw-r--r-- | src/minibuf.c | 3 |
2 files changed, 9 insertions, 3 deletions
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; | |||
| 157 | /* To run as a background daemon under Cocoa or Windows, | 157 | /* To run as a background daemon under Cocoa or Windows, |
| 158 | we must do a fork+exec, not a simple fork. | 158 | we must do a fork+exec, not a simple fork. |
| 159 | 159 | ||
| 160 | On Cocoa, CoreFoundation lib fails in forked process: | 160 | On Cocoa, CoreFoundation lib fails in forked process, see Mac OS X |
| 161 | Leopard Developer Release Notes for CoreFoundation Framework: | ||
| 162 | |||
| 161 | http://developer.apple.com/ReleaseNotes/ | 163 | http://developer.apple.com/ReleaseNotes/ |
| 162 | CoreFoundation/CoreFoundation.html) | 164 | CoreFoundation/CoreFoundation.html |
| 165 | |||
| 166 | Note: the above is no longer available on-line, but it can be found | ||
| 167 | via the "Wayback machine", https://web.archive.org. | ||
| 163 | 168 | ||
| 164 | On Windows, a Cygwin fork child cannot access the USER subsystem. | 169 | On Windows, a Cygwin fork child cannot access the USER subsystem. |
| 165 | 170 | ||
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'. */) | |||
| 995 | DEFUN ("read-command", Fread_command, Sread_command, 1, 2, 0, | 995 | DEFUN ("read-command", Fread_command, Sread_command, 1, 2, 0, |
| 996 | doc: /* Read the name of a command and return as a symbol. | 996 | doc: /* Read the name of a command and return as a symbol. |
| 997 | Prompt with PROMPT. By default, return DEFAULT-VALUE or its first element | 997 | Prompt with PROMPT. By default, return DEFAULT-VALUE or its first element |
| 998 | if it is a list. */) | 998 | if it is a list. If DEFAULT-VALUE is omitted or nil, and the user enters |
| 999 | null input, return a symbol whose name is an empty string. */) | ||
| 999 | (Lisp_Object prompt, Lisp_Object default_value) | 1000 | (Lisp_Object prompt, Lisp_Object default_value) |
| 1000 | { | 1001 | { |
| 1001 | Lisp_Object name, default_string; | 1002 | Lisp_Object name, default_string; |