branch: elpa/systemd
commit 0416fe454a484823c560038d2242f242fb701c65
Author: Mark Oteiza <mvote...@udel.edu>
Commit: Mark Oteiza <mvote...@udel.edu>
drop some unneeded eval-when-compile
---
systemd.el | 32 ++++++++++++++------------------
1 file changed, 14 insertions(+), 18 deletions(-)
diff --git a/systemd.el b/systemd.el
index 0059b54..ce662a3 100644
--- a/systemd.el
+++ b/systemd.el
@@ -128,28 +128,25 @@
;;;###autoload
(defconst systemd-autoload-regexp
- (eval-when-compile
- (rx (+? (any "a-zA-Z0-9-_.@\\")) "."
- (or "automount" "busname" "mount" "service" "slice"
- "socket" "swap" "target" "timer" "link" "netdev" "network")
- string-end))
+ (rx (+? (any "a-zA-Z0-9-_.@\\")) "."
+ (or "automount" "busname" "mount" "service" "slice"
+ "socket" "swap" "target" "timer" "link" "netdev" "network")
+ string-end)
"Regexp for file buffers in which to autoload `systemd-mode'.")
;;;###autoload
(defconst systemd-tempfn-autoload-regexp
- (eval-when-compile
- (rx ".#"
- (or (and (+? (any "a-zA-Z0-9-_.@\\")) "."
- (or "automount" "busname" "mount" "service" "slice"
- "socket" "swap" "target" "timer" "link" "netdev"
"network"))
- "override.conf")
- (= 16 (char hex-digit)) string-end))
+ (rx ".#"
+ (or (and (+? (any "a-zA-Z0-9-_.@\\")) "."
+ (or "automount" "busname" "mount" "service" "slice"
+ "socket" "swap" "target" "timer" "link" "netdev" "network"))
+ "override.conf")
+ (= 16 (char hex-digit)) string-end)
"Regexp for temp file buffers in which to autoload `systemd-mode'.")
;;;###autoload
(defconst systemd-dropin-autoload-regexp
- (eval-when-compile
- (rx "/systemd/" (+? anything) ".d/" (+? (not (any ?/))) ".conf"
string-end))
+ (rx "/systemd/" (+? anything) ".d/" (+? (not (any ?/))) ".conf" string-end)
"Regexp for dropin config file buffers in which to autoload `systemd-mode'.")
(defun systemd-get-value (start)
@@ -214,13 +211,12 @@ file, defaulting to the link under point, if any."
(defun systemd-file-network-p (filename)
"Return non-nil if FILENAME has a network-type extension, otherwise nil."
- (string-match-p (eval-when-compile
- (rx "." (or "link" "netdev" "network") string-end))
+ (string-match-p (rx "." (or "link" "netdev" "network") string-end)
filename))
(defun systemd-file-nspawn-p (filename)
"Return non-nil if FILENAME has an nspawn extension, otherwise nil."
- (string-match-p (eval-when-compile (rx ".nspawn" string-end)) filename))
+ (string-match-p (rx ".nspawn" string-end) filename))
(defun systemd-completion-table (&rest _ignore)
"Return a list of completion candidates."
@@ -322,7 +318,7 @@ See `font-lock-keywords' and (info \"(elisp) Search-based
Fontification\")."
(set-match-data res)))))
(defconst systemd-font-lock-keywords-1
- `((systemd-section-matcher 1 'font-lock-type-face)
+ '((systemd-section-matcher 1 'font-lock-type-face)
(systemd-key-matcher 1 'font-lock-keyword-face))
"Minimal expressions to highlight in `systemd-mode'.")
