diff options
| author | Basil L. Contovounesios <contovob@tcd.ie> | 2020-12-07 16:06:14 +0000 |
|---|---|---|
| committer | Basil L. Contovounesios <contovob@tcd.ie> | 2020-12-07 16:07:41 +0000 |
| commit | 1537a8c86351e3225dcf30dc9402de1a5675fdca (patch) | |
| tree | 312d511d77570fbe30d3c214f886fc37adbb6b44 | |
| parent | 6e0080e755b460adc7a1fda74e26f83cb342b6dc (diff) | |
| download | emacs-1537a8c86351e3225dcf30dc9402de1a5675fdca.tar.gz | |
; Fix recent typos/wording in NEWS and server.el
| -rw-r--r-- | etc/NEWS | 7 | ||||
| -rw-r--r-- | lisp/server.el | 4 |
2 files changed, 5 insertions, 6 deletions
@@ -1371,11 +1371,10 @@ This new command (bound to 'C-c C-l') regenerates the current hunk. ** Miscellaneous --- -*** Errors in 'kill-emacs-hook' no longer prevents Emacs from shutting down. +*** Errors in 'kill-emacs-hook' no longer prevent Emacs from shutting down. If a function in that hook signals an error in an interactive Emacs, -the user will be prompted whether to continue or not. If the user -doesn't answer within five seconds, Emacs will continue shutting down -anyway. +the user will be prompted on whether to continue. If the user doesn't +answer within five seconds, Emacs will continue shutting down anyway. --- *** iso-transl is now preloaded. diff --git a/lisp/server.el b/lisp/server.el index 651f801a237..cd55d66a975 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -269,8 +269,8 @@ the \"-f\" switch otherwise." :version "23.1") (defcustom server-client-instructions t - "If non-nil, output instructions on how to exit the client on connection. -If non, no messaging is done." + "If non-nil, display instructions on how to exit the client on connection. +If nil, no instructions are displayed." :version "28.1" :type 'boolean) |