aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/erc
diff options
context:
space:
mode:
authorStefan Kangas2022-10-01 22:32:25 +0200
committerStefan Kangas2022-10-01 22:34:47 +0200
commitfee9deff5309cfc5f952181cb2cae1a344b4cc45 (patch)
treea76ee68102411f859337b738b0cdcfe55ecf0cef /lisp/erc
parentbe85d2d92070c15da495fa16199112f118f03da5 (diff)
downloademacs-fee9deff5309cfc5f952181cb2cae1a344b4cc45.tar.gz
emacs-fee9deff5309cfc5f952181cb2cae1a344b4cc45.zip
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
Diffstat (limited to 'lisp/erc')
-rw-r--r--lisp/erc/erc-compat.el4
-rw-r--r--lisp/erc/erc-log.el18
2 files changed, 11 insertions, 11 deletions
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 @@
1;;; erc-compat.el --- ERC compatibility code for old Emacs versions -*- lexical-binding: t; -*- 1;;; erc-compat.el --- ERC compatibility code for older Emacsen -*- lexical-binding: t; -*-
2 2
3;; Copyright (C) 2002-2022 Free Software Foundation, Inc. 3;; Copyright (C) 2002-2003, 2005-2022 Free Software Foundation, Inc.
4 4
5;; Author: Alex Schroeder <alex@gnu.org> 5;; Author: Alex Schroeder <alex@gnu.org>
6;; Maintainer: Amin Bandali <bandali@gnu.org>, F. Jason Park <jp@neverwas.me> 6;; 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 7a79754ab45..57093d3fc6c 100644
--- a/lisp/erc/erc-log.el
+++ b/lisp/erc/erc-log.el
@@ -74,21 +74,21 @@
74;;; TODO: 74;;; TODO:
75;; 75;;
76;; * Really, we need to lock the logfiles somehow, so that if a user 76;; * Really, we need to lock the logfiles somehow, so that if a user
77;; is running multiple Emacs processes and/or on the same channel as 77;; is running multiple emacsen and/or on the same channel as more
78;; more than one user, only one process writes to the logfile. This 78;; than one user, only one process writes to the logfile. This is
79;; is especially needed for those logfiles with no nick in them, as 79;; especially needed for those logfiles with no nick in them, as
80;; these would become corrupted. 80;; these would become corrupted.
81;; For a single Emacs process, the problem could be solved using a 81;; For a single emacs process, the problem could be solved using a
82;; variable which contained the names of buffers already being 82;; variable which contained the names of buffers already being
83;; logged. This would require that logging be buffer-local, 83;; logged. This would require that logging be buffer-local,
84;; possibly not a bad thing anyway, since many people don't want to 84;; possibly not a bad thing anyway, since many people don't want to
85;; log the server buffer. 85;; log the server buffer.
86;; For multiple Emacs processes the problem is trickier. On some 86;; For multiple emacsen the problem is trickier. On some systems,
87;; systems, on could use the function `lock-buffer' and 87;; on could use the function `lock-buffer' and `unlock-buffer'.
88;; `unlock-buffer'. However, file locking isn't implemented on all 88;; However, file locking isn't implemented on all platforms, for
89;; platforms, for example, there is none on w32 systems. 89;; example, there is none on w32 systems.
90;; A third possibility might be to fake lockfiles. However, this 90;; A third possibility might be to fake lockfiles. However, this
91;; might lead to problems if one Emacs crashes, as the lockfile 91;; might lead to problems if an emacs crashes, as the lockfile
92;; would be left lying around. 92;; would be left lying around.
93 93
94;;; Code: 94;;; Code: