From a56a714ce30fe91bd5afd0ba181d0d4bc508a8c0 Mon Sep 17 00:00:00 2001 From: Craig Jennings Date: Mon, 29 Jun 2026 04:19:31 -0400 Subject: refactor: prefix two collision-prone helpers, document naming audit Two owned helpers carried unprefixed generic names that risk colliding in the single Emacs namespace: car-member (local-repository.el) and unpropertize-kill-ring (system-defaults.el). I renamed them to localrepo--car-member and cj/--unpropertize-kill-ring and updated their callers and tests. Both are non-interactive and contained, so no alias was needed. docs/design/naming-audit.org records the rest of the scan: the allowlist of deliberate module prefixes, the foreign forward-declarations that aren't owned definitions, and a deferred list (keybound commands, the with-timer macro, the ui-theme defcustoms, the user-constants paths) that each want a focused pass rather than an unattended rename. --- modules/local-repository.el | 6 +++--- modules/system-defaults.el | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'modules') diff --git a/modules/local-repository.el b/modules/local-repository.el index a9df09d38..e3c7a227a 100644 --- a/modules/local-repository.el +++ b/modules/local-repository.el @@ -24,7 +24,7 @@ ;; ------------------------------ Utility Function ----------------------------- -(defun car-member (value list) +(defun localrepo--car-member (value list) "Check if VALUE exists as the car of any cons cell in LIST." (member value (mapcar #'car list))) @@ -65,11 +65,11 @@ keep them in source control." (defun localrepo-initialize () "Add the repository to the package archives, then gives it a high priority." - (unless (car-member localrepo-repository-id package-archives) + (unless (localrepo--car-member localrepo-repository-id package-archives) (add-to-list 'package-archives (cons localrepo-repository-id localrepo-repository-location))) - (unless (car-member localrepo-repository-id package-archive-priorities) + (unless (localrepo--car-member localrepo-repository-id package-archive-priorities) (add-to-list 'package-archive-priorities (cons localrepo-repository-id localrepo-repository-priority)))) diff --git a/modules/system-defaults.el b/modules/system-defaults.el index 7230103cc..c63ca0093 100644 --- a/modules/system-defaults.el +++ b/modules/system-defaults.el @@ -266,10 +266,10 @@ appears only once per session." ;; ------------------ Unpropertize Kill Ring For Performance ----------------- -(defun unpropertize-kill-ring () +(defun cj/--unpropertize-kill-ring () (setq kill-ring (mapcar 'substring-no-properties kill-ring))) -(add-hook 'kill-emacs-hook 'unpropertize-kill-ring) +(add-hook 'kill-emacs-hook 'cj/--unpropertize-kill-ring) ;; ------------------------------- GNU 'ls' On BSD ------------------------------- -- cgit v1.2.3