[nongnu] elpa/systemd 23c0caf 115/131: extend anchored matches past the current line if \ broken

[ELPA Syncer]

branch: elpa/systemd
commit 23c0caf214ee1ed92eb12a0d7b613682f4091979
Author: Mark Oteiza <mvoteiza@udel.edu>
Commit: Mark Oteiza <mvoteiza@udel.edu>

    extend anchored matches past the current line if \ broken
---
 systemd.el | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/systemd.el b/systemd.el
index 807ebd9..3ce5d32 100644
--- a/systemd.el
+++ b/systemd.el
@@ -266,6 +266,14 @@ file, defaulting to the link under point, if any."
        (1 (when (systemd-construct-start-p) (string-to-syntax "<")))))
      start end)))
 
+(defun systemd-value-extend-region ()
+  "Return the EOL position of the last line of the construct at point."
+  (while (and (= (char-before (line-end-position)) ?\\)
+              (skip-chars-forward " \t")
+              (not (memq (following-char) '(?# ?\;)))
+              (zerop (forward-line))))
+  (line-end-position))
+
 (defun systemd-font-lock-extend-region ()
   (goto-char font-lock-beg)
   (while (and (zerop (forward-line -1))
@@ -274,11 +282,7 @@ file, defaulting to the link under point, if any."
               (not (memq (following-char) '(?# ?\;)))))
   (setq font-lock-beg (point-marker))
   (goto-char font-lock-end)
-  (while (and (= (char-before (line-end-position)) ?\\)
-              (skip-chars-forward " \t")
-              (not (memq (following-char) '(?# ?\;)))
-              (zerop (forward-line))))
-  (setq font-lock-end (line-end-position)))
+  (setq font-lock-end (systemd-value-extend-region)))
 
 (defmacro define-systemd-matcher (name regexp &optional docstring)
   "Define a new function NAME that matches REGEXP in a multi-line construct.
@@ -330,9 +334,11 @@ See `font-lock-keywords' and (info \"(elisp) Search-based 
Fontification\")."
      (systemd-exec-prefix-anchored-matcher
       nil nil (0 'font-lock-negation-char-face))
      ;; environment variables
-     ("\\$[A-Z_]+\\>" nil nil (0 'font-lock-variable-name-face))
+     ("\\$[A-Z_]+\\>"
+      (systemd-value-extend-region) nil (0 'font-lock-variable-name-face))
      ;; specifiers
-     ("%[nNpPiIfcrRtuUhsmbHv%]" nil nil (0 'font-lock-constant-face))))
+     ("%[nNpPiIfcrRtuUhsmbHv%]"
+      (systemd-value-extend-region) nil (0 'font-lock-constant-face))))
   "Extended expressions to highlight in `systemd-mode'.")
 
 (defconst systemd-font-lock-keywords-3