summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Sassoulas <pierre.sassoulas@gmail.com>2022-04-21 10:37:01 +0200
committerPierre Sassoulas <pierre.sassoulas@gmail.com>2022-04-26 09:12:32 +0200
commit1c7f7fc12d53ab1e1d410d6354ffeb20a93728cb (patch)
tree61d6de9ce9af598e0f6f819841813d5d2d54fe9e
parent8482d2ee74cdf96daffa1f32b8d04868d8c6c8e6 (diff)
downloadpylint-git-1c7f7fc12d53ab1e1d410d6354ffeb20a93728cb.tar.gz
[spelling] Capitalize emacs where it makes sense
-rw-r--r--CONTRIBUTORS.txt2
-rw-r--r--ChangeLog12
-rw-r--r--doc/whatsnew/2.13.rst4
-rw-r--r--elisp/startup2
-rwxr-xr-xpylint/epylint.py6
-rw-r--r--pylint/lint/base_options.py2
-rw-r--r--pylint/utils/utils.py2
-rw-r--r--tests/functional/e/.#emacs_file_lock.py2
-rw-r--r--tests/functional/e/.#emacs_file_lock_by_conf.py2
9 files changed, 17 insertions, 17 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index eee789a3e..e525bd336 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -360,7 +360,7 @@ contributors:
- Renat Galimov <renat2017@gmail.com>
- Rebecca Turner <rbt@sent.as> (9999years)
- Randall Leeds <randall@bleeds.info>
-- Ramiro Leal-Cavazos <ramiroleal050@gmail.com> (ramiro050): Fixed bug preventing pylint from working with emacs tramp
+- Ramiro Leal-Cavazos <ramiroleal050@gmail.com> (ramiro050): Fixed bug preventing pylint from working with Emacs tramp
- Qwiddle13 <32040075+Qwiddle13@users.noreply.github.com>
- Quentin Young <qlyoung@users.noreply.github.com>
- Petr Pulc <petrpulc@gmail.com>: require whitespace around annotations
diff --git a/ChangeLog b/ChangeLog
index ed9cc5f8c..62a80db70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -694,7 +694,7 @@ Release date: 2022-03-24
Closes #5333
* By default, pylint does no longer take files starting with ``.#`` into account. Those are
- considered `emacs file locks`. See
+ considered ``Emacs file locks``. See
https://www.gnu.org/software/emacs/manual/html_node/elisp/File-Locks.html.
This behavior can be reverted by redefining the ``ignore-patterns`` option.
@@ -2089,7 +2089,7 @@ Release date: 2021-04-24
Closes #4320
-* Fix issue that caused emacs pylint to fail when used with tramp
+* Fix issue that caused Emacs pylint to fail when used with tramp
* Improve check for invalid PEP 585 syntax inside functions
if postponed evaluation of type annotations is enabled
@@ -6399,7 +6399,7 @@ Release date: 2009-03-25
* don't show information messages by default
- * integration of Yuen Ho Wong's patches on emacs lisp files
+ * integration of Yuen Ho Wong's patches on Emacs lisp files
What's New in Pylint 0.17.0?
@@ -6942,7 +6942,7 @@ What's New in Pylint 0.6.0?
===========================
Release date: 2005-01-20
- * refix pylint emacs mode
+ * refix pylint Emacs mode
* no more traceback when just typing "pylint"
@@ -6995,7 +6995,7 @@ What's New in Pylint 0.4.2?
===========================
Release date: 2004-07-08
- * fix pylint emacs mode
+ * fix pylint Emacs mode
* fix classes checkers to handler twisted interfaces
@@ -7053,7 +7053,7 @@ Release date: 2004-02-17
* added a parsable text output, used when the --parsable option is
provided
- * added an emacs mode using this output, available in the distrib's
+ * added an Emacs mode using this output, available in the distrib's
elisp directory
* fixed some typos in messages
diff --git a/doc/whatsnew/2.13.rst b/doc/whatsnew/2.13.rst
index d353ef706..e69ce7752 100644
--- a/doc/whatsnew/2.13.rst
+++ b/doc/whatsnew/2.13.rst
@@ -232,12 +232,12 @@ Other Changes
Closes #5646
* By default, pylint does no longer take files starting with ``.#`` into account. Those are
- considered `emacs file locks`_. This behavior can be reverted by redefining the
+ considered `Emacs file locks`_. This behavior can be reverted by redefining the
``ignore-patterns`` option.
Closes #367
-.. _`emacs file locks`: https://www.gnu.org/software/emacs/manual/html_node/elisp/File-Locks.html
+.. _`Emacs file locks`: https://www.gnu.org/software/emacs/manual/html_node/elisp/File-Locks.html
* Fix ``super-init-not-called`` when parent or ``self`` is a ``Protocol``
diff --git a/elisp/startup b/elisp/startup
index fd40b427e..2f8fed1d4 100644
--- a/elisp/startup
+++ b/elisp/startup
@@ -7,7 +7,7 @@
;; Adapted for dh-make by Jim Van Zandt <jrv@vanzandt.mv.com>
;; The %PACKAGE% package follows the Debian/GNU Linux 'emacsen' policy and
-;; byte-compiles its elisp files for each 'emacs flavor' (emacs19,
+;; byte-compiles its elisp files for each 'Emacs flavor' (emacs19,
;; xemacs19, emacs20, xemacs20...). The compiled code is then
;; installed in a subdirectory of the respective site-lisp directory.
;; We have to add this to the load-path:
diff --git a/pylint/epylint.py b/pylint/epylint.py
index d9b2d7e2e..8a183e384 100755
--- a/pylint/epylint.py
+++ b/pylint/epylint.py
@@ -7,7 +7,7 @@
"""Emacs and Flymake compatible Pylint.
-This script is for integration with emacs and is compatible with flymake mode.
+This script is for integration with Emacs and is compatible with flymake mode.
epylint walks out of python packages before invoking pylint. This avoids
reporting import errors that occur when a module within a package uses the
@@ -29,7 +29,7 @@ For example:
pylint a/c/y.py
- - As this script will be invoked by emacs within the directory of the file
+ - As this script will be invoked by Emacs within the directory of the file
we are checking we need to go out of it to avoid these false positives.
@@ -65,7 +65,7 @@ def _get_env() -> dict[str, str]:
def lint(filename: str, options: Sequence[str] = ()) -> int:
"""Pylint the given file.
- When run from emacs we will be in the directory of a file, and passed its
+ When run from Emacs we will be in the directory of a file, and passed its
filename. If this file is part of a package and is trying to import other
modules from within its own package or another package rooted in a directory
below it, pylint will classify it as a failed import.
diff --git a/pylint/lint/base_options.py b/pylint/lint/base_options.py
index a06214d04..a25827b2b 100644
--- a/pylint/lint/base_options.py
+++ b/pylint/lint/base_options.py
@@ -58,7 +58,7 @@ def _make_linter_options(linter: PyLinter) -> Options:
"default": (re.compile(r"^\.#"),),
"help": "Files or directories matching the regex patterns are"
" skipped. The regex matches against base names, not paths. The default value "
- "ignores emacs file locks",
+ "ignores Emacs file locks",
},
),
(
diff --git a/pylint/utils/utils.py b/pylint/utils/utils.py
index 190deb862..199f7e829 100644
--- a/pylint/utils/utils.py
+++ b/pylint/utils/utils.py
@@ -202,7 +202,7 @@ def register_plugins(linter: PyLinter, directory: str) -> None:
os.path.join(directory, filename)
)
except ValueError:
- # empty module name (usually emacs auto-save files)
+ # empty module name (usually Emacs auto-save files)
continue
except ImportError as exc:
print(f"Problem importing module {filename}: {exc}", file=sys.stderr)
diff --git a/tests/functional/e/.#emacs_file_lock.py b/tests/functional/e/.#emacs_file_lock.py
index b2674f414..e2ed09d7c 100644
--- a/tests/functional/e/.#emacs_file_lock.py
+++ b/tests/functional/e/.#emacs_file_lock.py
@@ -1,4 +1,4 @@
# The name is invalid, but we should not analyse this file
-# Because its filename reseambles an emacs file lock ignored by default
+# Because its filename reseambles an Emacs file lock ignored by default
# https://www.gnu.org/software/emacs/manual/html_node/elisp/File-Locks.html
# See https://github.com/PyCQA/pylint/issues/367
diff --git a/tests/functional/e/.#emacs_file_lock_by_conf.py b/tests/functional/e/.#emacs_file_lock_by_conf.py
index 151168cc8..a7247f609 100644
--- a/tests/functional/e/.#emacs_file_lock_by_conf.py
+++ b/tests/functional/e/.#emacs_file_lock_by_conf.py
@@ -1,3 +1,3 @@
# The name is invalid, but we should not analyse this file
-# Because it resembles an emacs file lock and is ignored by the configuration
+# Because it resembles an Emacs file lock and is ignored by the configuration
# See https://github.com/PyCQA/pylint/issues/367