master 55f46cc77c: Decrease use of the word "Emacsen" in docs

[Stefan Kangas]

branch: master
commit 55f46cc77cb9d72fbabadb63d8aeab45c5e005e2
Author: Stefan Kangas <stefankangas@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>

    Decrease use of the word "Emacsen" in docs
    
    "Emacsen" is either a less clear way of saying "old versions of
    Emacs", or an implicit reference to XEmacs.  We recommend against
    using it in the FAQ.  So use the more clear wording instead.
    
    * doc/misc/gnus.texi (Oort Gnus):
    * doc/misc/widget.texi (Basic Types, toggle):
    * lisp/cedet/semantic/bovine/c.el (semantic-c-skip-conditional-section):
    * lisp/cedet/semantic/wisent/comp.el (wisent-compile-grammar):
    * lisp/desktop.el (desktop-save):
    * lisp/erc/erc-compat.el:
    * lisp/erc/erc-log.el:
    * lisp/gnus/gnus-util.el (gnus-replace-in-string):
    * lisp/mail/footnote.el:
    * lisp/net/tramp-archive.el:
    * lisp/net/tramp-smb.el:
    * lisp/net/tramp-uu.el:
    * lisp/net/tramp.el:
    (with-tramp-locked-connection):
    * lisp/org/ol-eww.el:
    * lisp/org/org-compat.el:
    (org-define-error):
    * lisp/shadowfile.el:
    * lisp/winner.el: Don't use the word "Emacsen".
---
 doc/misc/gnus.texi                 |  2 +-
 doc/misc/widget.texi               |  9 +++------
 lisp/cedet/semantic/bovine/c.el    |  2 +-
 lisp/cedet/semantic/wisent/comp.el |  2 +-
 lisp/desktop.el                    |  2 +-
 lisp/erc/erc-compat.el             |  4 ++--
 lisp/erc/erc-log.el                | 18 +++++++++---------
 lisp/gnus/gnus-util.el             |  2 +-
 lisp/mail/footnote.el              |  2 +-
 lisp/net/tramp-archive.el          |  4 ++--
 lisp/net/tramp-smb.el              |  2 +-
 lisp/net/tramp-uu.el               |  2 +-
 lisp/net/tramp.el                  |  4 ++--
 lisp/org/ol-eww.el                 |  2 +-
 lisp/org/org-compat.el             |  4 ++--
 lisp/shadowfile.el                 |  5 +++--
 lisp/winner.el                     |  6 ++----
 17 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index b1331e79bf..9e5b994a3e 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -28121,7 +28121,7 @@ If you use a stand-alone Gnus distribution, you'd 
better add
 lisp directory into load-path.
 
 File @file{gnus-load.el} contains autoload commands, functions and variables,
-some of which may not be included in distributions of Emacsen.
+some of which may not be included in distributions of Emacs.
 
 @end itemize
 
diff --git a/doc/misc/widget.texi b/doc/misc/widget.texi
index c84b49a038..d3634ebc82 100644
--- a/doc/misc/widget.texi
+++ b/doc/misc/widget.texi
@@ -587,8 +587,7 @@ string.
 
 @vindex tag-glyph@r{ keyword}
 @item :tag-glyph
-Name of image to use instead of the string specified by @code{:tag} on
-Emacsen that supports it.
+Name of image to use instead of the string specified by @code{:tag}.
 
 @vindex help-echo@r{ keyword}
 @item :help-echo
@@ -1014,12 +1013,10 @@ A string representing the @samp{off} state.  By default 
the string
 @samp{off}.
 @vindex on-glyph@r{ keyword}
 @item :on-glyph
-Name of a glyph to be used instead of the @samp{:on} text string, on
-emacsen that supports this.
+Name of a glyph to be used instead of the @samp{:on} text string.
 @vindex off-glyph@r{ keyword}
 @item :off-glyph
-Name of a glyph to be used instead of the @samp{:off} text string, on
-emacsen that supports this.
+Name of a glyph to be used instead of the @samp{:off} text string.
 @end table
 
 @node checkbox
diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el
index d4ce20589e..6e880b92d4 100644
--- a/lisp/cedet/semantic/bovine/c.el
+++ b/lisp/cedet/semantic/bovine/c.el
@@ -308,7 +308,7 @@ Moves completely over balanced #if blocks."
        ;; We found a nested if.  Skip it.
        (if (fboundp 'c-scan-conditionals)
            (goto-char (c-scan-conditionals 1))
-         ;; For older Emacsen, but this will set the mark.
+          ;; For older versions of Emacs, but this will set the mark.
          (c-forward-conditional 1)))
        ((looking-at "^\\s-*#\\s-*elif")
        ;; We need to let the preprocessor analyze this one.
diff --git a/lisp/cedet/semantic/wisent/comp.el 
b/lisp/cedet/semantic/wisent/comp.el
index e24f6128a6..2ffce5652d 100644
--- a/lisp/cedet/semantic/wisent/comp.el
+++ b/lisp/cedet/semantic/wisent/comp.el
@@ -3449,7 +3449,7 @@ Automatically called by the Emacs Lisp byte compiler as a
 
 (defun wisent-compile-grammar (grammar &optional start-list)
   ;; This is kept for compatibility with FOO-wy.el files generated
-  ;; with older Emacsen.
+  ;; with older versions of Emacs.
   (declare (obsolete wisent-compiled-grammar "Mar 2021"))
   (wisent--compile-grammar grammar start-list))
 
diff --git a/lisp/desktop.el b/lisp/desktop.el
index ef73bc596d..ec321faa63 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -1186,7 +1186,7 @@ no questions asked."
          (goto-char (point-max))
          (insert "\n;; Global section:\n")
          ;; Called here because we save the window/frame state as a global
-         ;; variable for compatibility with previous Emacsen.
+          ;; variable for compatibility with older versions of Emacs.
          (desktop-save-frameset)
          (unless (memq 'desktop-saved-frameset desktop-globals-to-save)
            (desktop-outvar 'desktop-saved-frameset))
diff --git a/lisp/erc/erc-compat.el b/lisp/erc/erc-compat.el
index 8a00e711ac..4a1280fe64 100644
--- a/lisp/erc/erc-compat.el
+++ b/lisp/erc/erc-compat.el
@@ -1,6 +1,6 @@
-;;; erc-compat.el --- ERC compatibility code for older Emacsen  -*- 
lexical-binding: t; -*-
+;;; erc-compat.el --- ERC compatibility code for old Emacs versions  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2002-2003, 2005-2022 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2022 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; Maintainer: Amin Bandali <bandali@gnu.org>, F. Jason Park <jp@neverwas.me>
diff --git a/lisp/erc/erc-log.el b/lisp/erc/erc-log.el
index 57093d3fc6..7a79754ab4 100644
--- a/lisp/erc/erc-log.el
+++ b/lisp/erc/erc-log.el
@@ -74,21 +74,21 @@
 ;;; TODO:
 ;;
 ;; * Really, we need to lock the logfiles somehow, so that if a user
-;;   is running multiple emacsen and/or on the same channel as more
-;;   than one user, only one process writes to the logfile.  This is
-;;   especially needed for those logfiles with no nick in them, as
+;;   is running multiple Emacs processes and/or on the same channel as
+;;   more than one user, only one process writes to the logfile.  This
+;;   is especially needed for those logfiles with no nick in them, as
 ;;   these would become corrupted.
-;;   For a single emacs process, the problem could be solved using a
+;;   For a single Emacs process, the problem could be solved using a
 ;;   variable which contained the names of buffers already being
 ;;   logged.  This would require that logging be buffer-local,
 ;;   possibly not a bad thing anyway, since many people don't want to
 ;;   log the server buffer.
-;;   For multiple emacsen the problem is trickier.  On some systems,
-;;   on could use the function `lock-buffer' and `unlock-buffer'.
-;;   However, file locking isn't implemented on all platforms, for
-;;   example, there is none on w32 systems.
+;;   For multiple Emacs processes the problem is trickier.  On some
+;;   systems, on could use the function `lock-buffer' and
+;;   `unlock-buffer'.  However, file locking isn't implemented on all
+;;   platforms, for example, there is none on w32 systems.
 ;;   A third possibility might be to fake lockfiles.  However, this
-;;   might lead to problems if an emacs crashes, as the lockfile
+;;   might lead to problems if one Emacs crashes, as the lockfile
 ;;   would be left lying around.
 
 ;;; Code:
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index fe556b155a..2cf1d2f18c 100644
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -78,7 +78,7 @@
 If LITERAL is non-nil, insert NEWTEXT literally.  Return a new
 string containing the replacements.
 
-This is a compatibility function for different Emacsen."
+This is a compatibility function."
   (declare (obsolete replace-regexp-in-string "26.1"))
   (replace-regexp-in-string regexp newtext string nil literal))
 
diff --git a/lisp/mail/footnote.el b/lisp/mail/footnote.el
index a594fa3ccb..b2eb0c3e9e 100644
--- a/lisp/mail/footnote.el
+++ b/lisp/mail/footnote.el
@@ -24,7 +24,7 @@
 
 ;;; Commentary:
 
-;; This file provides footnote[1] support for message-mode in emacsen.
+;; This file provides footnote[1] support for message-mode in Emacs.
 ;; footnote-mode is implemented as a minor mode.
 
 ;; [1] Footnotes look something like this.  Along with some decorative
diff --git a/lisp/net/tramp-archive.el b/lisp/net/tramp-archive.el
index b343e460df..646ae86452 100644
--- a/lisp/net/tramp-archive.el
+++ b/lisp/net/tramp-archive.el
@@ -201,7 +201,7 @@ It must be supported by libarchive(3).")
 
 (put #'tramp-archive-autoload-file-name-regexp 'tramp-autoload t)
 
-;; In older Emacsen (prior 27.1), `tramp-archive-autoload-file-name-regexp'
+;; In older Emacs (prior 27.1), `tramp-archive-autoload-file-name-regexp'
 ;; is not autoloaded.  So we cannot expect it to be known in
 ;; tramp-loaddefs.el.  But it exists, when tramp-archive.el is loaded.
 ;;;###tramp-autoload
@@ -332,7 +332,7 @@ arguments to pass to the OPERATION."
 
 ;; Starting with Emacs 29, `tramp-archive-file-name-handler' is
 ;; autoloaded.  But it must still be in tramp-loaddefs.el for older
-;; Emacsen.
+;; versions of Emacs.
 ;;;###autoload(autoload 'tramp-archive-file-name-handler "tramp-archive")
 ;;;###tramp-autoload
 (defun tramp-archive-file-name-handler (operation &rest args)
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el
index 11b3689df6..e55f6bb6ee 100644
--- a/lisp/net/tramp-smb.el
+++ b/lisp/net/tramp-smb.el
@@ -1761,7 +1761,7 @@ Result is a list of (LOCALNAME MODE SIZE MONTH DAY TIME 
YEAR)."
 ;;
 ;; Problems:
 ;; * Modern regexp constructs, like spy groups and counted repetitions, aren't
-;;   available in older Emacsen.
+;;   available in older versions of Emacs.
 ;; * The length of constructs (file name, size) might exceed the default.
 ;; * File names might contain spaces.
 ;; * Permissions might be empty.
diff --git a/lisp/net/tramp-uu.el b/lisp/net/tramp-uu.el
index e849c36d13..2bbdb299a6 100644
--- a/lisp/net/tramp-uu.el
+++ b/lisp/net/tramp-uu.el
@@ -25,7 +25,7 @@
 ;;; Commentary:
 
 ;; An implementation of "uuencode" in Lisp.  Uses the function
-;; base64-encode-region which is built-in to modern Emacsen.
+;; base64-encode-region which is built-in to modern Emacs.
 
 ;;; Code:
 
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 373392f7c8..5b60aa6313 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -3674,7 +3674,7 @@ Let-bind it when necessary.")
 
 ;; `directory-abbrev-apply' and `directory-abbrev-make-regexp' exists
 ;; since Emacs 29.1.  Since this handler isn't called for older
-;; Emacsen, it is save to invoke them via `tramp-compat-funcall'.
+;; Emacs, it is save to invoke them via `tramp-compat-funcall'.
 (defun tramp-handle-abbreviate-file-name (filename)
   "Like `abbreviate-file-name' for Tramp files."
   (let* ((case-fold-search (file-name-case-insensitive-p filename))
@@ -5485,7 +5485,7 @@ performed successfully.  Any other value means an error."
 Mostly useful to protect BODY from being interrupted by timers."
   (declare (indent 1) (debug t))
   `(if (tramp-get-connection-property ,proc "locked")
-       ;; Be kind for older Emacsen.
+       ;; Be kind for old versions of Emacs.
        (if (member 'remote-file-error debug-ignored-errors)
           (throw 'non-essential 'non-essential)
         (tramp-error
diff --git a/lisp/org/ol-eww.el b/lisp/org/ol-eww.el
index d1bb519510..0bd1b5b926 100644
--- a/lisp/org/ol-eww.el
+++ b/lisp/org/ol-eww.el
@@ -48,7 +48,7 @@
 (require 'cl-lib)
 (require 'eww)
 
-;; For Emacsen < 25.
+;; For Emacs < 25.
 (defvar eww-current-title)
 (defvar eww-current-url)
 
diff --git a/lisp/org/org-compat.el b/lisp/org/org-compat.el
index 15f0daa91a..bbad4ae635 100644
--- a/lisp/org/org-compat.el
+++ b/lisp/org/org-compat.el
@@ -1,4 +1,4 @@
-;;; org-compat.el --- Compatibility Code for Older Emacsen -*- 
lexical-binding: t; -*-
+;;; org-compat.el --- Compatibility Code for Older Emacs -*- lexical-binding: 
t; -*-
 
 ;; Copyright (C) 2004-2022 Free Software Foundation, Inc.
 
@@ -929,7 +929,7 @@ Pass COLUMN and FORCE to `move-to-column'."
   "Define NAME as a new error signal.
 MESSAGE is a string that will be output to the echo area if such
 an error is signaled without being caught by a `condition-case'.
-Implements `define-error' for older emacsen."
+Implements `define-error' for older versions of Emacs."
   (if (fboundp 'define-error) (define-error name message)
     (put name 'error-conditions
          (copy-sequence (cons name (get 'error 'error-conditions))))))
diff --git a/lisp/shadowfile.el b/lisp/shadowfile.el
index c1c31fe9c6..c8567a7d47 100644
--- a/lisp/shadowfile.el
+++ b/lisp/shadowfile.el
@@ -56,8 +56,9 @@
 
 ;; Bugs & Warnings:
 ;;
-;;  - It is bad to have two Emacsen both running shadowfile at the same
-;;  time.  It tries to detect this condition, but is not always successful.
+;;  - It is bad to have two instances of Emacs both running shadowfile
+;;  at the same time.  It tries to detect this condition, but is not
+;;  always successful.
 ;;
 ;;  - You have to be careful not to edit a file in two locations
 ;;  before shadowfile has had a chance to copy it; otherwise
diff --git a/lisp/winner.el b/lisp/winner.el
index 4290f1fd23..174b698e7b 100644
--- a/lisp/winner.el
+++ b/lisp/winner.el
@@ -171,8 +171,7 @@ You may want to include buffer names such as *Help*, 
*Apropos*,
               (/= 0 (minibuffer-depth)))
     (push (selected-frame) winner-modified-list)))
 
-;; A `post-command-hook' for emacsen with
-;; `window-configuration-change-hook'.
+;; Used as `post-command-hook'.
 (defun winner-save-old-configurations ()
   (when (zerop (minibuffer-depth))
     (unless (eq this-command winner-last-command)
@@ -191,8 +190,7 @@ You may want to include buffer names such as *Help*, 
*Apropos*,
   (winner-insert-if-new (selected-frame))
   (winner-remember))
 
-;; A `post-command-hook' for other emacsen.
-;; Also called by `winner-undo' before "undoing".
+;; Called by `winner-undo' before "undoing".
 (defun winner-save-conditionally ()
   (when (zerop (minibuffer-depth))
     (winner-save-unconditionally)))