From 12bab2092045876a8193402c9f69af196ea22969 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mattias=20Engdeg=C3=A5rd?= Date: Thu, 6 May 2021 15:50:39 +0200 Subject: [PATCH] Tidy file-matching regexps and remove some ineffective backslashes * lisp/emacs-lisp/package.el (package--delete-directory): * lisp/net/tramp-cmds.el (tramp-recompile-elpa): Escape dot; replace $ with \'. * lisp/help.el (help-for-help): * lisp/transient.el (transient-font-lock-keywords): Remove useless backslashes. --- lisp/emacs-lisp/package.el | 2 +- lisp/help.el | 2 +- lisp/net/tramp-cmds.el | 2 +- lisp/transient.el | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index e1339177519..b68ebfbd887 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -2267,7 +2267,7 @@ Clean-up the corresponding .eln files if Emacs is native compiled." (when (featurep 'native-compile) (cl-loop - for file in (directory-files-recursively dir ".el\\'") + for file in (directory-files-recursively dir "\\.el\\'") do (comp-clean-up-stale-eln (comp-el-to-eln-filename file)))) (delete-directory dir t)) diff --git a/lisp/help.el b/lisp/help.el index e70041aea4b..babaf4adc75 100644 --- a/lisp/help.el +++ b/lisp/help.el @@ -233,7 +233,7 @@ Do not call this in the scope of `with-help-window'." (make-help-screen help-for-help (purecopy "Type a help option: [abcCdefFgiIkKlLmnprstvw.] C-[cdefmnoptw] or ?") (concat - "\(Type " + "(Type " (help--key-description-fontified (kbd "")) " or " (help--key-description-fontified (kbd "")) diff --git a/lisp/net/tramp-cmds.el b/lisp/net/tramp-cmds.el index a3cf6f3211a..1572c2f3e3c 100644 --- a/lisp/net/tramp-cmds.el +++ b/lisp/net/tramp-cmds.el @@ -496,7 +496,7 @@ This is needed if there are compatibility problems." ((dir (tramp-compat-funcall 'package-desc-dir (car (alist-get 'tramp (bound-and-true-p package-alist)))))) - (dolist (elc (directory-files dir 'full "\\.elc$")) + (dolist (elc (directory-files dir 'full "\\.elc\\'")) (delete-file elc)) (with-current-buffer (get-buffer-create byte-compile-log-buffer) (let ((inhibit-read-only t)) diff --git a/lisp/transient.el b/lisp/transient.el index 6e7b5ea876a..2ce7b7c30e1 100644 --- a/lisp/transient.el +++ b/lisp/transient.el @@ -3569,7 +3569,7 @@ we stop there." "transient-define-argument" "transient-define-suffix") t) - "\\_>[ \t'\(]*" + "\\_>[ \t'(]*" "\\(\\(?:\\sw\\|\\s_\\)+\\)?") (1 'font-lock-keyword-face) (2 'font-lock-function-name-face nil t))))) -- 2.39.2