[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/sweeprolog 6d1509a06a 090/166: FIXED: sweep-beginning-of-t
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/sweeprolog 6d1509a06a 090/166: FIXED: sweep-beginning-of-top-term stopping at comment start |
Date: |
Fri, 30 Sep 2022 04:59:29 -0400 (EDT) |
branch: elpa/sweeprolog
commit 6d1509a06ac75e189c7d82efc2cedbd44794edce
Author: Eshel Yaron <me@eshelyaron.com>
Commit: Eshel Yaron <me@eshelyaron.com>
FIXED: sweep-beginning-of-top-term stopping at comment start
---
sweep.el | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/sweep.el b/sweep.el
index bad11099ce..ffa427bdf3 100644
--- a/sweep.el
+++ b/sweep.el
@@ -909,7 +909,7 @@ Interactively, a prefix arg means to prompt for BUFFER."
(define-derived-mode sweep-top-level-mode comint-mode "sweep Top-level"
"Major mode for interacting with an inferior Prolog interpreter."
:group 'sweep-top-level
- (setq-local comint-prompt-regexp (rx (seq line-start "?- "))
+ (setq-local comint-prompt-regexp (rx line-start "?- ")
comint-input-ignoredups t
comint-prompt-read-only t
comint-delimiter-argument-list '(?,)
@@ -965,7 +965,7 @@ Interactively, a prefix arg means to prompt for BUFFER."
(apply operation args)))))
(add-to-list 'file-name-handler-alist
- (cons (rx (seq bol (one-or-more lower) "("))
+ (cons (rx bol (one-or-more lower) "(")
#'sweep-file-name-handler))
(defun sweep-beginning-of-top-term (&optional arg)
@@ -976,12 +976,14 @@ Interactively, a prefix arg means to prompt for BUFFER."
(setq times (1- times))
(when-let ((safe-start (nth 8 (syntax-ppss))))
(goto-char safe-start))
- (re-search-backward (rx (seq bol graph)) nil t)
- (let ((safe-start (nth 8 (syntax-ppss))))
+ (re-search-backward (rx bol graph) nil t)
+ (let ((safe-start (or (nth 8 (syntax-ppss))
+ (nth 8 (syntax-ppss (1+ (point)))))))
(while (and safe-start (not (bobp)))
(goto-char safe-start)
- (re-search-backward (rx (seq bol graph)) nil t)
- (setq safe-start (nth 8 (syntax-ppss))))))
+ (re-search-backward (rx bol graph) nil t)
+ (setq safe-start (or (nth 8 (syntax-ppss))
+ (nth 8 (syntax-ppss (1+ (point)))))))))
(not (= p (point))))
(sweep-beginning-of-next-top-term (- times)))))
@@ -991,22 +993,22 @@ Interactively, a prefix arg means to prompt for BUFFER."
(setq times (1- times))
(unless (eobp)
(forward-char)
- (re-search-forward (rx (seq bol graph)) nil t))
+ (re-search-forward (rx bol graph) nil t))
(while (and (nth 8 (syntax-ppss)) (not (eobp)))
(forward-char)
- (re-search-forward (rx (seq bol graph)) nil t)))
+ (re-search-forward (rx bol graph) nil t)))
(not (= p (point)))))
(defun sweep-end-of-top-term ()
(unless (eobp)
(while (and (nth 8 (syntax-ppss)) (not (eobp)))
(forward-char))
- (or (re-search-forward (rx (seq "." (or white "\n"))) nil t)
+ (or (re-search-forward (rx "." (or white "\n")) nil t)
(goto-char (point-max)))
(while (and (nth 8 (syntax-ppss)) (not (eobp)))
(while (and (nth 8 (syntax-ppss)) (not (eobp)))
(forward-char))
- (or (re-search-forward (rx (seq "." (or white "\n"))) nil t)
+ (or (re-search-forward (rx "." (or white "\n")) nil t)
(goto-char (point-max))))))
(defvar sweep-mode-syntax-table
@@ -1147,13 +1149,13 @@ Interactively, a prefix arg means to prompt for BUFFER."
(let ((case-fold-search nil))
(funcall
(syntax-propertize-rules
- ((rx bow (group-n 1 (seq "0'" anychar)))
+ ((rx bow (group-n 1 "0'" anychar))
(1 (unless (save-excursion (nth 8 (syntax-ppss (match-beginning 0))))
(string-to-syntax "w")))))
start end)))
(defun sweep-at-beginning-of-top-term-p ()
- (and (looking-at-p (rx (seq bol graph)))
+ (and (looking-at-p (rx bol graph))
(not (nth 8 (syntax-ppss)))))
(defun sweep-identifier-at-point (&optional point)
- [nongnu] elpa/sweeprolog f772a136e4 081/166: DOC: fix typos, (continued)
- [nongnu] elpa/sweeprolog f772a136e4 081/166: DOC: fix typos, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 75ec7290be 096/166: ADDED: sweep-load-buffer, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 3717572348 091/166: FIXED: handle more missing color terms, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 1744b29cc2 092/166: FIXED: off by one in sweep-colourise-some-terms, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 16d1a380ab 122/166: FIXED: (sweep-beginning-of-top-term): possible infinite loop, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog f887a4b3f0 085/166: ENHANCED: provide caller predicate in xref-find-references, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 49214a669b 109/166: PORT: don't depend on pos-bol added in Emacs 29, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 1aefaea2ab 106/166: ADDED: (sweep-find-file-at-point): new function, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog ce88557fdc 104/166: DOC: NEWS.org: new file, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 28170f629f 124/166: FIXED: (sweep--colourise): handle the dict_content color term, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 6d1509a06a 090/166: FIXED: sweep-beginning-of-top-term stopping at comment start,
ELPA Syncer <=
- [nongnu] elpa/sweeprolog 9dfbbf9e9b 128/166: ADDED: new user option for choosing indentation increments, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 19d725b869 129/166: New make target: make info, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog a563bc36dc 121/166: FIXED: package-lint complaint about autoloaded private function, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog c94b509fcb 119/166: DOC: Add Top-level history section, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog fc6c2964d9 105/166: ADDED: (sweep-file-at-point): new function, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 1f83ce9f04 088/166: FIXED: use operators from xref in sweep_colourise_some_terms, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 92f599fbbc 094/166: FIXED: premature cut in sweep_predicate_location/2, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 9d87b4d445 131/166: BUILD: rely on preexisting emacs-module.h, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 504d4ff714 136/166: Find Emacs as `emacs`, ELPA Syncer, 2022/09/30
- [nongnu] elpa/sweeprolog 07fc84b716 140/166: DOC: document new user option sweep-faces-style, ELPA Syncer, 2022/09/30