emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/tuareg 8717bfc 3/6: Fix regexp correctness and style nits


From: ELPA Syncer
Subject: [nongnu] elpa/tuareg 8717bfc 3/6: Fix regexp correctness and style nits
Date: Sat, 28 Aug 2021 12:57:33 -0400 (EDT)

branch: elpa/tuareg
commit 8717bfcbddacfdd1d4cbbeb705a7add6db9ea762
Author: Mattias EngdegÄrd <mattiase@acm.org>
Commit: Christophe Troestler <christophe.Troestler@umons.ac.be>

    Fix regexp correctness and style nits
    
    This includes a bug in `tuareg-smie--label-colon-p`.
    All found by relint.
---
 ocamldebug.el  | 2 +-
 tuareg-opam.el | 6 +++---
 tuareg.el      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ocamldebug.el b/ocamldebug.el
index 712cd87..b1f4309 100644
--- a/ocamldebug.el
+++ b/ocamldebug.el
@@ -272,7 +272,7 @@ representation is simply concatenated with the COMMAND."
   "Go to the execution time TIME.
 
 Without TIME, the command behaves as follows: In the ocamldebug buffer,
-if the point at buffer end, goto time 0\; otherwise, try to obtain the
+if the point at buffer end, goto time 0; otherwise, try to obtain the
 time from context around point.  In an OCaml buffer, try to find the
 time associated in execution history with the current point location.
 
diff --git a/tuareg-opam.el b/tuareg-opam.el
index ae3c3ab..0904845 100644
--- a/tuareg-opam.el
+++ b/tuareg-opam.el
@@ -119,14 +119,14 @@
      1 font-lock-keyword-face)
     (,tuareg-opam-scopes-regex . font-lock-constant-face)
     (,tuareg-opam-variables-regex . font-lock-variable-name-face)
-    (,(concat "%{" tuareg-opam-variables-regex "\\(?:}%\\|?\\)")
+    (,(concat "%{" tuareg-opam-variables-regex "\\(?:}%\\|\\?\\)")
      (1 font-lock-variable-name-face t))
     (,(concat "%{\\([a-zA-Z_][a-zA-Z0-9_+-]*\\):"
-              tuareg-opam-pkg-variables-regex "\\(?:}%\\|?\\)")
+              tuareg-opam-pkg-variables-regex "\\(?:}%\\|\\?\\)")
      (1 font-lock-type-face t)
      (2 font-lock-variable-name-face t t))
     (,(concat "%{\\([a-zA-Z_][a-zA-Z0-9_+-]*\\):"
-              "\\([a-zA-Z][a-zA-Z0-9_+-]*\\)\\(?:}%\\|?\\)")
+              "\\([a-zA-Z][a-zA-Z0-9_+-]*\\)\\(?:}%\\|\\?\\)")
      (1 font-lock-type-face t)
      (2 tuareg-opam-pkg-variable-name-face t t))
     ;; "package-name:var-name" anywhere (do not force)
diff --git a/tuareg.el b/tuareg.el
index 779b39e..3bfc9dc 100644
--- a/tuareg.el
+++ b/tuareg.el
@@ -1972,7 +1972,7 @@ For use on `electric-indent-functions'."
         "d-let"))))
 
 (defun tuareg-smie--label-colon-p ()
-  (and (not (zerop (skip-chars-backward "[[:alnum:]]_")))
+  (and (not (zerop (skip-chars-backward "[:alnum:]_")))
        (or (not (zerop (skip-chars-backward "?~")))
            (save-excursion
              (member (tuareg-smie--backward-token)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]