; Fix typos

* etc/NEWS: Fix typos.

* lisp/progmodes/flymake.el (flymake-error-echo)
(flymake-warning-echo, flymake-note-echo)
(flymake-show-diagnostics-at-end-of-line): Fix :package-version.

diff --git a/etc/NEWS b/etc/NEWS
index 611dcf3dc7d4d943d5cc7675691b4af374b7d97e..cf0e05078f5bf9e3ae249b68e0b8ebdc7430a8d1 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -176,14 +176,14 @@ to load the edited aliases.
 
 +++
 *** 'rgrep' is now a builtin command.
-Running "rgrep" in Eshell now uses the Emacs grep facility instead of
+Running 'rgrep' in Eshell now uses the Emacs grep facility instead of
 calling external rgrep.
 
 ** Shell Mode
 
 +++
 *** New user option 'shell-get-old-input-include-continuation-lines'.
-When this user option is non-nil, 'shell-get-old-input' (C-RET)
+When this user option is non-nil, 'shell-get-old-input' ('C-RET')
 includes multiple shell "\" continuation lines from command output.
 Default is nil.
 
@@ -259,6 +259,7 @@ following to your init file:
               #'shortdoc-help-fns-examples-function)
 
 ** Package
+
 ---
 *** New user option 'package-vc-register-as-project'.
 When non-nil, it will automatically register every package as a
@@ -266,6 +267,7 @@ project, that you can quickly select using 'project-switch-project'
 ('C-x p p').
 
 ** Flymake
+
 +++
 *** New user option 'flymake-show-diagnostics-at-end-of-line'.
 When non-nil, Flymake shows summarized descriptions of diagnostics at
@@ -332,7 +334,7 @@ hooks named after the feature name, like 'esh-mode-unload-hook'.
 \f
 * Lisp Changes in Emacs 30.1
 
-** New var 'inhibit-auto-fill' to temporarily prevent auto-fill.
+** New variable 'inhibit-auto-fill' to temporarily prevent auto-fill.
 
 ** Functions and variables to transpose sexps
 
@@ -448,7 +450,7 @@ any unwind forms, as in
 
     (unwind-protect (read buffer))
 
-because the behaviour is identical to that of the argument; there is
+because the behavior is identical to that of the argument; there is
 no protection of any kind.  Perhaps the intended unwind forms have
 been misplaced or forgotten, or the use of 'unwind-protect' could be
 simplified away.

diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index f2fe97cb7736c3fe34c61493c64bf1993a3c3a02..ac4081456967c5b658d3a1274d0a3f546ba997ff 100644 (file)
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -434,22 +434,22 @@ verify FILTER, a function, and sort them by COMPARE (using KEY)."
 (defface flymake-error-echo
   '((t :inherit compilation-error))
   "Face used for showing summarized descriptions of errors."
-  :package-version '("Flymake" . "1.3.4"))
+  :package-version '(Flymake . "1.3.4"))
 
 (defface flymake-warning-echo
   '((t :inherit compilation-warning))
   "Face used for showing summarized descriptions of warnings."
-  :package-version '("Flymake" . "1.3.4"))
+  :package-version '(Flymake . "1.3.4"))
 
 (defface flymake-note-echo
   '((t :inherit flymake-note))
   "Face used for showing summarized descriptions of notes."
-  :package-version '("Flymake" . "1.3.4"))
+  :package-version '(Flymake . "1.3.4"))
 
 (defcustom flymake-show-diagnostics-at-end-of-line nil
   "If non-nil, add diagnostic summary messages at end-of-line."
   :type 'boolean
-  :package-version '("Flymake" . "1.3.4"))
+  :package-version '(Flymake . "1.3.4"))
 
 (define-obsolete-face-alias 'flymake-warnline 'flymake-warning "26.1")
 (define-obsolete-face-alias 'flymake-errline 'flymake-error "26.1")