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

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

[nongnu] elpa/sly 540a8c5: Revert recent changes to sly-mrepl--syntax-pr


From: ELPA Syncer
Subject: [nongnu] elpa/sly 540a8c5: Revert recent changes to sly-mrepl--syntax-propertize
Date: Thu, 29 Jul 2021 12:57:23 -0400 (EDT)

branch: elpa/sly
commit 540a8c5b9a04af0a6907e07cb070f1fed8a76f48
Author: João Távora <joaotavora@gmail.com>
Commit: João Távora <joaotavora@gmail.com>

    Revert recent changes to sly-mrepl--syntax-propertize
    
    This fixes #459 and probably reopens #452.
    
    * contrib/sly-mrepl.el (sly-mrepl--syntax-propertize):
---
 contrib/sly-mrepl.el | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/contrib/sly-mrepl.el b/contrib/sly-mrepl.el
index 0c9a5ef..6586b02 100644
--- a/contrib/sly-mrepl.el
+++ b/contrib/sly-mrepl.el
@@ -334,20 +334,17 @@ In that case, moving a sexp backward does nothing."
       (let ((forward-sexp-function nil))
         (forward-sexp n))))
 
-(defvar sly-mrepl--syntax-propertize-end nil)
-
 (defun sly-mrepl--syntax-propertize (beg end)
-  "Keep everything up to current prompt comment syntax."
-  (when (<= beg (point-min))
-    (add-text-properties beg (1+ beg) `(syntax-table ,(string-to-syntax "!"))))
-  (let ((prev-end sly-mrepl--syntax-propertize-end)
-        (end (setq sly-mrepl--syntax-propertize-end
-                   (min end (sly-mrepl--safe-mark)))))
-    (when prev-end
-      (remove-text-properties (1- prev-end) prev-end
-                              '(syntax-table nil face nil)))
-    (add-text-properties (1- end) end
-                         `(syntax-table ,(string-to-syntax "!")))))
+  "Make everything up to current prompt comment syntax."
+  (remove-text-properties beg end '(syntax-table nil))
+  (let ((end (min end (sly-mrepl--safe-mark)))
+        (beg beg))
+    (when (> end beg)
+      (unless (nth 8 (syntax-ppss beg))
+        (add-text-properties beg (1+ beg)
+                             `(syntax-table ,(string-to-syntax "!"))))
+      (add-text-properties (1- end) end
+                           `(syntax-table ,(string-to-syntax "!"))))))
 
 (defun sly-mrepl--call-with-repl (repl-buffer fn)
   (with-current-buffer repl-buffer



reply via email to

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