[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/auto-overlays 5d5e09e 45/93: trivial whitespace changes
From: |
Stefan Monnier |
Subject: |
[elpa] externals/auto-overlays 5d5e09e 45/93: trivial whitespace changes |
Date: |
Mon, 14 Dec 2020 13:00:35 -0500 (EST) |
branch: externals/auto-overlays
commit 5d5e09e153223fbfb7affb9447a2a06e60a2108f
Author: Toby Cubitt <toby-predictive@dr-qubit.org>
Commit: tsc25 <toby-predictive@dr-qubit.org>
trivial whitespace changes
---
auto-overlay-common.el | 20 ++++++++++----------
auto-overlay-line.el | 8 ++++----
auto-overlay-nested.el | 26 +++++++++++++-------------
auto-overlay-self.el | 30 +++++++++++++++---------------
auto-overlay-word.el | 4 ++--
5 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/auto-overlay-common.el b/auto-overlay-common.el
index 089261e..f50cfb6 100644
--- a/auto-overlay-common.el
+++ b/auto-overlay-common.el
@@ -74,7 +74,7 @@ Note that this function returns any overlay. If you want to
restrict it to auto overlays, include '(identity auto-overlay) in
PROP-TEST."
(when (null point) (setq point (point)))
-
+
(let (overlay-list)
;; get overlays overlapping POINT and zero-length overlays at POINT
(setq overlay-list
@@ -89,7 +89,7 @@ PROP-TEST."
(when (and (> (overlay-end o) point)
(= (overlay-start o) point))
(push o overlay-list)))
-
+
overlay-list)
)
@@ -139,15 +139,15 @@ PROP-TEST."
(setq prop-test (list '(null inactive) prop-test))))
(t
(unless inactive (setq prop-test (push '(null inactive) prop-test)))))
-
- (let (overlay-list function prop-list value-list result)
+
+ (let (overlay-list function prop-list value-list result)
;; check properties of each overlay in region
(dolist (o (overlays-in start end))
;; check overlay is entirely within region
(if (and within
(or (< (overlay-start o) start) (> (overlay-end o) end)))
(setq result nil)
-
+
;; if it is, or we don't care
(setq result t)
(catch 'failed
@@ -164,7 +164,7 @@ PROP-TEST."
(and (setq value-list (nth 2 test)) ; nil isn't list
(listp value-list)))
(setq value-list (list value-list)))
-
+
;; apply the test
(setq result
(and result
@@ -173,7 +173,7 @@ PROP-TEST."
prop-list)
value-list))))
(when (null result) (throw 'failed nil)))))
-
+
;; add overlay to result list if its properties matched
(when result (push o overlay-list)))
;; return result list
@@ -190,9 +190,9 @@ precedence (i.e. the one that begins later, or if they
begin at
the same point the one that ends earlier).
See `auto-overlays-at' for ane explanation of the PROPTEST argument."
-
+
(unless point (setq point (point)))
-
+
;; get all overlays at point with a non-nil SYMBOL property
(let* ((overlay-list (auto-overlays-at-point point proptest))
(overlay (pop overlay-list))
@@ -228,7 +228,7 @@ the highest priority overlay is returned.
See `auto-overlay-highest-priority-at-point' for a definition of
\"highest priority\"."
-
+
(let ((overlay (auto-overlay-highest-priority-at-point
point `(identity ,symbol))))
(if overlay
diff --git a/auto-overlay-line.el b/auto-overlay-line.el
index a597603..00484e8 100644
--- a/auto-overlay-line.el
+++ b/auto-overlay-line.el
@@ -81,7 +81,7 @@
(save-excursion
(goto-char (overlay-get o-match 'delim-end))
(1+ (line-end-position))))))
-
+
;; give new overlay some basic properties
(overlay-put o-new 'auto-overlay t)
(overlay-put o-new 'set-id (overlay-get o-match 'set-id))
@@ -131,7 +131,7 @@
(auto-o-update-exclusive (overlay-get o-self 'set-id)
end (overlay-end o-self)
nil (overlay-get o-self 'priority)))
-
+
;; if we extend beyond end of line...
((/= (overlay-end o-self) (+ start (match-end 0)))
;; shrink ourselves so we extend till end of line
@@ -142,6 +142,6 @@
(overlay-get o-self 'priority) nil))
))))
)
-
-
+
+
;; auto-overlay-line.el ends here
diff --git a/auto-overlay-nested.el b/auto-overlay-nested.el
index 5d62b3d..aa2e246 100644
--- a/auto-overlay-nested.el
+++ b/auto-overlay-nested.el
@@ -36,7 +36,7 @@
;;
;; Version 0.1.6
;; * renamed from "nest" to "nested"
-;;
+;;
;; Version 0.1.5
;; * set overlay properties straight after creation in `auto-o-make-nest',
;; rather than leaving it to `auto-overlay-update', in case matching causes
@@ -85,7 +85,7 @@
;; if the stack is empty, just create and return a new unmatched overlay
((null overlay-stack)
(auto-o-make-nested o-match 'unmatched))
-
+
;; if appropriate edge of innermost overlay is unmatched, just match it
((or (and (eq (auto-o-edge o-match) 'start)
(not (auto-o-start-matched-p o)))
@@ -94,7 +94,7 @@
(auto-o-match-overlay o o-match)
;; return nil since haven't created any new overlays
nil)
-
+
;; otherwise...
(t
;; create new innermost overlay and add it to the overlay stack
@@ -112,10 +112,10 @@
(defun auto-o-nested-suicide (o-self)
;; Called when match no longer matches. Unmatch the match overlay O-SELF, if
;; necessary deleting its parent overlay or cascading the stack.
-
+
(let* ((overlay-stack (auto-o-nested-stack o-self))
(o-parent (car overlay-stack)))
-
+
(cond
;; if other end of parent is unmatched, just delete parent
((not (auto-o-edge-matched-p
@@ -130,7 +130,7 @@
(auto-o-match-overlay o-parent 'unmatched nil)
;; if we're an end match, make parent end-unmatched
(auto-o-match-overlay o-parent nil 'unmatched)))
-
+
;; otherwise, unmatch ourselves from parent and cascade the stack
(t
(overlay-put o-parent (auto-o-edge o-self) nil)
@@ -139,7 +139,7 @@
))
)
-
+
(defun auto-o-make-nested (o-match &optional unmatched)
@@ -159,7 +159,7 @@
(overlay-put o-new 'set-id (overlay-get o-match 'set-id))
(overlay-put o-new 'definition-id (overlay-get o-match 'definition-id))
(auto-o-match-overlay o-new o-match 'unmatched))
-
+
((eq (auto-o-edge o-match) 'end)
(setq pos (overlay-get o-match 'delim-start))
(setq o-new (make-overlay pos pos nil nil 'rear-advance))
@@ -178,10 +178,10 @@
;; Cascade the ends of the overlays in OVERLAY-STACK up or down the stack,
;; so as to re-establish a valid stack. It assumes that only the innermost
;; is incorrect.
-
+
(let ((o (car overlay-stack)) o1)
(cond
-
+
;; if innermost overlay is start-matched (and presumably
;; end-unmatched)...
((auto-o-start-matched-p o)
@@ -200,8 +200,8 @@
;; FIXME: could postpone re-parsing here in case it can be avoided
(auto-o-match-overlay o1 nil 'unmatch nil nil 'protect-match)
(auto-o-delete-overlay o1 nil 'protect-match)))
-
-
+
+
;; if innermost overlay is end-matched (and presumably
;; start-unmatched)...
((auto-o-end-matched-p o)
@@ -233,7 +233,7 @@
;; implies they cover identical regions if overlays are correctly
;; stacked). For other overlays with identical lengths, the order is
;; undefined.
-
+
;; find overlays corresponding to same entry overlapping O-MATCH
(let ((overlay-stack (auto-overlays-at-point
(if (eq (auto-o-edge o-match) 'start)
diff --git a/auto-overlay-self.el b/auto-overlay-self.el
index fffd027..2313601 100644
--- a/auto-overlay-self.el
+++ b/auto-overlay-self.el
@@ -108,17 +108,17 @@
(defun auto-o-parse-self-match (o-match)
;; perform any necessary updates of auto overlays due to a match for a self
;; regexp
-
+
(let* ((overlay-list (auto-o-self-list o-match))
(o (car overlay-list)))
-
+
(cond
;; if stack is empty, create a new end-unmatched overlay, adding it to
;; the list of unascaded overlays (avoids treating it as a special
;; case), and return it
((null overlay-list)
(auto-o-make-self o-match nil))
-
+
;; if new delimiter is inside the first existing overlay and existing one
;; is end-unmatched, just match it
((and (not (overlay-get o 'end))
@@ -128,8 +128,8 @@
(setq auto-o-pending-self-cascade (delq o auto-o-pending-self-cascade))
;; return nil since haven't created any new overlays
nil)
-
-
+
+
;; otherwise...
(t
(let (o-new)
@@ -140,7 +140,7 @@
(setq o-new (auto-o-make-self
o-match
(overlay-get (overlay-get o 'start) 'delim-start)))
-
+
;; if the new match is inside an existing overlay...
(setq o (pop overlay-list))
;; create overlay from end of existing one till start of the one
@@ -154,7 +154,7 @@
;; match end of existing one with the new match, protecting its old
;; end match which is now matched with start of new one
(auto-o-match-overlay o nil o-match 'no-props nil 'protect-match))
-
+
;; return newly created overlay
o-new))
))
@@ -211,7 +211,7 @@
;; If END is nil, the new overlay is end-unmatched and ends at the end of
;; the buffer.
(let (o-new)
-
+
;; create new overlay (location ensures right things happen when matched)
(let (pos)
(cond
@@ -219,15 +219,15 @@
((number-or-marker-p end) (setq pos end))
(t (setq pos (point-max))))
(setq o-new (make-overlay pos pos nil nil 'rear-advance)))
-
+
;; give overlay some basic properties
(overlay-put o-new 'auto-overlay t)
(overlay-put o-new 'set-id (overlay-get o-start 'set-id))
(overlay-put o-new 'definition-id (overlay-get o-start 'definition-id))
-
+
;; if overlay is end-unmatched, add it to the list of uncascaded overlays
(unless (overlayp end) (push o-new auto-o-pending-self-cascade))
-
+
;; match the new overlay and return it
(auto-o-match-overlay o-new o-start (if (overlayp end) end nil))
o-new)
@@ -258,7 +258,7 @@
(when (> (length overlay-list) 1)
(let ((o (car overlay-list))
(o1 (nth 1 overlay-list)))
-
+
;; match first (presumably end-matched) overlay and remove it from list
(pop overlay-list)
(auto-o-match-overlay o nil (overlay-get o1 'start) 'no-props)
@@ -291,7 +291,7 @@
(delq o1 auto-o-pending-self-cascade))
;; return t to indicate cascading ended early
t)))))
-
+
;; if there's an overlay left, "flip" it so it's end-unmatched and
;; extends to next overlay in buffer, and add it to the list of
;; unmatched overlays
@@ -315,7 +315,7 @@
;; ;; is null, all overlays after O-START are included.
;; (when (null end) (setq end (point-max)))
-
+
;; (let (overlay-list)
;; ;; create list of all overlays corresponding to same entry between
O-START
;; ;; and END
@@ -342,7 +342,7 @@
;; is null, all overlays after O-START are included.
(when (null end) (setq end (point-max)))
-
+
(let (overlay-list)
;; create list of all overlays corresponding to same entry between O-START
;; and END
diff --git a/auto-overlay-word.el b/auto-overlay-word.el
index 7914ba9..0ed56f3 100644
--- a/auto-overlay-word.el
+++ b/auto-overlay-word.el
@@ -80,14 +80,14 @@
(when (symbolp (car props)) (setq props (list props)))
(dolist (p (auto-o-props o-match))
(overlay-put o-new (car p) (cdr p))))
-
+
;; if new overlay is exclusive, delete lower priority overlays within it
(when (and (overlay-get o-new 'exclusive)
(/= (overlay-start o-new) (overlay-end o-new)))
(auto-o-update-exclusive (overlay-get o-new 'set)
(overlay-start o-new) (overlay-end o-new)
nil (overlay-get o-new 'priority)))
-
+
;; return new overlay
o-new)
)
- [elpa] externals/auto-overlays d107a02 84/93: Reparse auto-overlays on loading/unloading regexp definitions., (continued)
- [elpa] externals/auto-overlays d107a02 84/93: Reparse auto-overlays on loading/unloading regexp definitions., Stefan Monnier, 2020/12/14
- [elpa] externals/auto-overlays 033900e 90/93: Fix some quoting problems in doc strings, Stefan Monnier, 2020/12/14
- [elpa] externals/auto-overlays db9036a 92/93: * packages/auto-overlays/: Activate lexical-binding., Stefan Monnier, 2020/12/14
- [elpa] externals/auto-overlays d66bab4 11/93: Fixed "self" regexp bugs in auto-overlay package., Stefan Monnier, 2020/12/14
- [elpa] externals/auto-overlays 86c25df 14/93: Removed auto-overlay-functions variable, and implemented new regexp class interface, Stefan Monnier, 2020/12/14
- [elpa] externals/auto-overlays 622afa4 13/93: Another very similar bug fix to do with updating exclusive overlays., Stefan Monnier, 2020/12/14
- [elpa] externals/auto-overlays 1db0b95 22/93: Various minor bug fixes, and changes to bring packages up to date, Stefan Monnier, 2020/12/14
- [elpa] externals/auto-overlays ea600c4 27/93: Bug fixes to new update scheduling, and to loading overlays from file., Stefan Monnier, 2020/12/14
- [elpa] externals/auto-overlays 734371d 43/93: Changed @ignore Texinfo command to flat overlay class., Stefan Monnier, 2020/12/14
- [elpa] externals/auto-overlays 55e868d 30/93: auto-o-suicide also needs to remove old properties., Stefan Monnier, 2020/12/14
- [elpa] externals/auto-overlays 5d5e09e 45/93: trivial whitespace changes,
Stefan Monnier <=
- [elpa] externals/auto-overlays 0936d26 39/93: Work around goto-line bug., Stefan Monnier, 2020/12/14
- [elpa] externals/auto-overlays ff75a63 49/93: Bug-fix in auto-overlay-load-definition, Stefan Monnier, 2020/12/14
- [elpa] externals/auto-overlays 9e8ef72 36/93: Modified interface functions for defining auto-overlay regexps., Stefan Monnier, 2020/12/14
- [elpa] externals/auto-overlays 5539596 56/93: Added missing (eval-when-compile (require 'cl))., Stefan Monnier, 2020/12/14
- [elpa] externals/auto-overlays 0f02ef9 57/93: Fixed minor spelling errors in docstrings., Stefan Monnier, 2020/12/14
- [elpa] externals/auto-overlays f66e655 66/93: Update package headers for ELPA., Stefan Monnier, 2020/12/14
- [elpa] externals/auto-overlays cdf4e6a 70/93: Fix copyright assignment in auto-overlays manual., Stefan Monnier, 2020/12/14
- [elpa] externals/auto-overlays 464d9ea 77/93: Refactor auto-overlay-regexps format and implement match hooks., Stefan Monnier, 2020/12/14
- [elpa] externals/auto-overlays 9fe619d 85/93: Fix bugs in auto-overlay saving/loading., Stefan Monnier, 2020/12/14
- [elpa] externals/auto-overlays e6e8a76 87/93: Fix auto-overlay package loading so requiring auto-overlayys pulls in all standard classes., Stefan Monnier, 2020/12/14