From fee9deff5309cfc5f952181cb2cae1a344b4cc45 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Sat, 1 Oct 2022 22:32:25 +0200 Subject: [PATCH] Revert "Decrease use of the word "Emacsen" in docs" This reverts commit 55f46cc77cb9d72fbabadb63d8aeab45c5e005e2. Ref. https://lists.gnu.org/r/emacs-devel/2022-10/msg00016.html --- 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, 38 insertions(+), 34 deletions(-) diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 9e5b994a3ef..b1331e79bf4 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 Emacs. +some of which may not be included in distributions of Emacsen. @end itemize diff --git a/doc/misc/widget.texi b/doc/misc/widget.texi index d3634ebc82a..c84b49a038c 100644 --- a/doc/misc/widget.texi +++ b/doc/misc/widget.texi @@ -587,7 +587,8 @@ string. @vindex tag-glyph@r{ keyword} @item :tag-glyph -Name of image to use instead of the string specified by @code{:tag}. +Name of image to use instead of the string specified by @code{:tag} on +Emacsen that supports it. @vindex help-echo@r{ keyword} @item :help-echo @@ -1013,10 +1014,12 @@ 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. +Name of a glyph to be used instead of the @samp{:on} text string, on +emacsen that supports this. @vindex off-glyph@r{ keyword} @item :off-glyph -Name of a glyph to be used instead of the @samp{:off} text string. +Name of a glyph to be used instead of the @samp{:off} text string, on +emacsen that supports this. @end table @node checkbox diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el index 6e880b92d40..d4ce20589e6 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 versions of Emacs, but this will set the mark. + ;; For older Emacsen, 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 2ffce5652da..e24f6128a68 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 versions of Emacs. + ;; with older Emacsen. (declare (obsolete wisent-compiled-grammar "Mar 2021")) (wisent--compile-grammar grammar start-list)) diff --git a/lisp/desktop.el b/lisp/desktop.el index ec321faa630..ef73bc596df 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 older versions of Emacs. + ;; variable for compatibility with previous Emacsen. (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 4a1280fe64d..8a00e711acd 100644 --- a/lisp/erc/erc-compat.el +++ b/lisp/erc/erc-compat.el @@ -1,6 +1,6 @@ -;;; erc-compat.el --- ERC compatibility code for old Emacs versions -*- lexical-binding: t; -*- +;;; erc-compat.el --- ERC compatibility code for older Emacsen -*- lexical-binding: t; -*- -;; Copyright (C) 2002-2022 Free Software Foundation, Inc. +;; Copyright (C) 2002-2003, 2005-2022 Free Software Foundation, Inc. ;; Author: Alex Schroeder ;; Maintainer: Amin Bandali , F. Jason Park diff --git a/lisp/erc/erc-log.el b/lisp/erc/erc-log.el index 7a79754ab45..57093d3fc6c 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 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 +;; 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 ;; 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 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. +;; 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. ;; A third possibility might be to fake lockfiles. However, this -;; might lead to problems if one Emacs crashes, as the lockfile +;; might lead to problems if an 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 2cf1d2f18c7..fe556b155a8 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." +This is a compatibility function for different Emacsen." (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 b2eb0c3e9e8..a594fa3ccb4 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 Emacs. +;; This file provides footnote[1] support for message-mode in emacsen. ;; 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 646ae864526..b343e460df6 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 Emacs (prior 27.1), `tramp-archive-autoload-file-name-regexp' +;; In older Emacsen (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 -;; versions of Emacs. +;; Emacsen. ;;;###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 e55f6bb6ee5..11b3689df60 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 versions of Emacs. +;; available in older Emacsen. ;; * 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 2bbdb299a69..e849c36d132 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 Emacs. +;; base64-encode-region which is built-in to modern Emacsen. ;;; Code: diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 03dc47a053f..ada529d396f 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -3676,7 +3676,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 -;; Emacs, it is save to invoke them via `tramp-compat-funcall'. +;; Emacsen, 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)) @@ -5487,7 +5487,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 old versions of Emacs. + ;; Be kind for older Emacsen. (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 0bd1b5b926c..d1bb5195107 100644 --- a/lisp/org/ol-eww.el +++ b/lisp/org/ol-eww.el @@ -48,7 +48,7 @@ (require 'cl-lib) (require 'eww) -;; For Emacs < 25. +;; For Emacsen < 25. (defvar eww-current-title) (defvar eww-current-url) diff --git a/lisp/org/org-compat.el b/lisp/org/org-compat.el index bbad4ae635d..15f0daa91ae 100644 --- a/lisp/org/org-compat.el +++ b/lisp/org/org-compat.el @@ -1,4 +1,4 @@ -;;; org-compat.el --- Compatibility Code for Older Emacs -*- lexical-binding: t; -*- +;;; org-compat.el --- Compatibility Code for Older Emacsen -*- 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 versions of Emacs." +Implements `define-error' for older emacsen." (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 c8567a7d47e..c1c31fe9c69 100644 --- a/lisp/shadowfile.el +++ b/lisp/shadowfile.el @@ -56,9 +56,8 @@ ;; Bugs & Warnings: ;; -;; - 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. +;; - 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. ;; ;; - 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 174b698e7b5..4290f1fd239 100644 --- a/lisp/winner.el +++ b/lisp/winner.el @@ -171,7 +171,8 @@ You may want to include buffer names such as *Help*, *Apropos*, (/= 0 (minibuffer-depth))) (push (selected-frame) winner-modified-list))) -;; Used as `post-command-hook'. +;; A `post-command-hook' for emacsen with +;; `window-configuration-change-hook'. (defun winner-save-old-configurations () (when (zerop (minibuffer-depth)) (unless (eq this-command winner-last-command) @@ -190,7 +191,8 @@ You may want to include buffer names such as *Help*, *Apropos*, (winner-insert-if-new (selected-frame)) (winner-remember)) -;; Called by `winner-undo' before "undoing". +;; A `post-command-hook' for other emacsen. +;; Also called by `winner-undo' before "undoing". (defun winner-save-conditionally () (when (zerop (minibuffer-depth)) (winner-save-unconditionally))) -- 2.39.2