[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 1537a8c: ; Fix recent typos/wording in NEWS and server.el
From: |
Basil L. Contovounesios |
Subject: |
master 1537a8c: ; Fix recent typos/wording in NEWS and server.el |
Date: |
Mon, 7 Dec 2020 11:07:47 -0500 (EST) |
branch: master
commit 1537a8c86351e3225dcf30dc9402de1a5675fdca
Author: Basil L. Contovounesios <contovob@tcd.ie>
Commit: Basil L. Contovounesios <contovob@tcd.ie>
; Fix recent typos/wording in NEWS and server.el
---
etc/NEWS | 7 +++----
lisp/server.el | 4 ++--
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/etc/NEWS b/etc/NEWS
index c80325c..d796a4c 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -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 651f801..cd55d66 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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 1537a8c: ; Fix recent typos/wording in NEWS and server.el,
Basil L. Contovounesios <=