[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master d5a1a43 223/433: Empty regions no longer prevent parsing o
From: |
Dmitry Gutov |
Subject: |
[elpa] master d5a1a43 223/433: Empty regions no longer prevent parsing of later regions. |
Date: |
Thu, 15 Mar 2018 19:44:07 -0400 (EDT) |
branch: master
commit d5a1a4375adc55a87e5f2c6adc3ee72fe0d19bd4
Author: viritrilbia <viritrilbia>
Commit: viritrilbia <viritrilbia>
Empty regions no longer prevent parsing of later regions.
---
mmm-class.el | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/mmm-class.el b/mmm-class.el
index 8ed79c6..024b30d 100644
--- a/mmm-class.el
+++ b/mmm-class.el
@@ -3,7 +3,7 @@
;; Copyright (C) 2000 by Michael Abraham Shulman
;; Author: Michael Abraham Shulman <address@hidden>
-;; Version: $Id: mmm-class.el,v 1.15 2001/02/19 03:18:16 alanshutko Exp $
+;; Version: $Id: mmm-class.el,v 1.16 2001/04/26 22:27:36 viritrilbia Exp $
;;{{{ GPL
@@ -129,7 +129,7 @@ and interactive history."
(front-match 0)
(back-match 0)
end-not-begin
- ;insert
+ ;insert private
&allow-other-keys
)
"Create submode regions from START to STOP according to arguments.
@@ -162,8 +162,9 @@ the rest of the arguments are for an actual class being
applied. See
matched-submode matched-face back-to resume-at) =
(apply #'mmm-match-region :start (point) all)
while beg
- while (or (not end) (/= beg end)) ; Sanity check
- if end do ; match-submode, if present, succeeded.
+ if (and end ; match-submode, if present, succeeded.
+ (< beg end)) ; empty overlays evaporate immediately
+ do
(condition-case nil
(progn
(apply #'mmm-make-region (or matched-submode submode)
@@ -194,7 +195,7 @@ and BACK \(markers, regexps, or functions). A nil value
for END means
that MATCH-SUBMODE failed to find a valid submode. BACK-TO is the
point at which the search should continue if the region is invalid."
(when (mmm-match-and-verify front start stop front-verify)
- (let ((beg (mmm-match->point include-front front-offset
+ (let ((beg (mmm-match->point include-front front-offset
front-match back-match))
(back-to (match-end front-match))
(front-form (mmm-get-form front-form)))
- [elpa] master 33baef7 179/433: Added file, (continued)
- [elpa] master 33baef7 179/433: Added file, Dmitry Gutov, 2018/03/15
- [elpa] master ad6a934 199/433: # Updated docstring, Dmitry Gutov, 2018/03/15
- [elpa] master 1c8d387 201/433: Allowed language names for preference lookup as "mode names"., Dmitry Gutov, 2018/03/15
- [elpa] master f0e34d0 185/433: (mmm-apply-class): Rearranged parameters so faces actually work., Dmitry Gutov, 2018/03/15
- [elpa] master 86803d6 200/433: (mmm-set-major-mode-preferences): Added function., Dmitry Gutov, 2018/03/15
- [elpa] master 4bdcb2f 224/433: Fixed inline JavaScript regexp ( \w ==> \\w )., Dmitry Gutov, 2018/03/15
- [elpa] master 62b7c8c 233/433: # Updated for recent changes in configuration., Dmitry Gutov, 2018/03/15
- [elpa] master 068f332 226/433: # Fixed a couple comments, Dmitry Gutov, 2018/03/15
- [elpa] master d94c8be 240/433: * FAQ: Added question about end delimiter., Dmitry Gutov, 2018/03/15
- [elpa] master 0faf52e 256/433: Updated., Dmitry Gutov, 2018/03/15
- [elpa] master d5a1a43 223/433: Empty regions no longer prevent parsing of later regions.,
Dmitry Gutov <=
- [elpa] master b2dac24 253/433: Used match-string-no-properties (Joe Kelsey), Dmitry Gutov, 2018/03/15
- [elpa] master 2524d7a 208/433: Added `require's and `defvar's to eliminate compliation warnings., Dmitry Gutov, 2018/03/15
- [elpa] master c712ad4 190/433: Added flags telling which faces to use for which regions., Dmitry Gutov, 2018/03/15
- [elpa] master 23cd237 197/433: Modified CSS to use preferred mode., Dmitry Gutov, 2018/03/15
- [elpa] master c5b8993 234/433: # Updated, Dmitry Gutov, 2018/03/15
- [elpa] master 15ee310 228/433: Passed arguments to `signal'., Dmitry Gutov, 2018/03/15
- [elpa] master f156169 225/433: * mmm-cweb.el: New file., Dmitry Gutov, 2018/03/15
- [elpa] master ce6b28a 241/433: (mmm-ify-by-class): Removed duplicates from completion list., Dmitry Gutov, 2018/03/15
- [elpa] master 3c8a463 210/433: Added config.log and mmm.info-*., Dmitry Gutov, 2018/03/15
- [elpa] master a55863a 220/433: Improved instructions for turning off PSGML. (Thanks to Michael Alan, Dmitry Gutov, 2018/03/15