[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master df0d56b 406/433: Fix regression from the previous commit
From: |
Dmitry Gutov |
Subject: |
[elpa] master df0d56b 406/433: Fix regression from the previous commit |
Date: |
Thu, 15 Mar 2018 19:44:44 -0400 (EDT) |
branch: master
commit df0d56b460d01f82f4af13c84617f1bd282e46d6
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>
Fix regression from the previous commit
* Fix void-function error ("another error" in
https://gist.github.com/blaenk/edcd2d4280dc5fc99a83, #56)
* Just skip narrowing for cc-mode submodes
---
mmm-region.el | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/mmm-region.el b/mmm-region.el
index f805877..547b351 100644
--- a/mmm-region.el
+++ b/mmm-region.el
@@ -512,11 +512,8 @@ is non-nil, don't quit if the info is already there."
;; These can't be in the local variables list, because we
;; replace their actual values, but we want to use their
;; original values elsewhere.
- (unless (bound-and-true-p c-buffer-is-cc-mode)
- ;; TODO: Remove this conditional after cc-mode
- ;; respects submode boundaries.
- (put mode 'mmm-fontify-region-function
- font-lock-fontify-region-function))
+ (put mode 'mmm-fontify-region-function
+ font-lock-fontify-region-function)
(put mode 'mmm-beginning-of-syntax-function
syntax-begin-function)
(put mode 'mmm-syntax-propertize-function
@@ -808,7 +805,10 @@ of the REGIONS covers START to STOP."
(save-restriction
(let ((font-lock-dont-widen t)
syntax-ppss-last syntax-ppss-cache)
- (when ovl (narrow-to-region beg end))
+ ;; TODO: Remove this conditional when cc-mode
+ ;; respects submode boundaries.
+ (when (and ovl (not (memq mode mmm-c-derived-modes)))
+ (narrow-to-region beg end))
(funcall func beg end nil)))
;; Catch changes in font-lock cache.
(mmm-save-changed-local-variables
- [elpa] master 68fe94d 274/433: (mmm-ify): Change defaults for front-delim and, (continued)
- [elpa] master 68fe94d 274/433: (mmm-ify): Change defaults for front-delim and, Dmitry Gutov, 2018/03/15
- [elpa] master 28d51d2 312/433: Note availability of Melpa packages, Dmitry Gutov, 2018/03/15
- [elpa] master 406e120 330/433: Merge pull request #19 from dgutov/font-lock, Dmitry Gutov, 2018/03/15
- [elpa] master 509660a 354/433: Merge pull request #22 from purcell/indentation, Dmitry Gutov, 2018/03/15
- [elpa] master e583767 284/433: Provide more sensible face defaults for dark and light backgrounds, Dmitry Gutov, 2018/03/15
- [elpa] master c28501c 387/433: Don't use syntax-begin-function, Dmitry Gutov, 2018/03/15
- [elpa] master 141bbee 352/433: Remove regexp-opt's legacy stuff, Dmitry Gutov, 2018/03/15
- [elpa] master ff4c564 344/433: * mmm-noweb.el: Add the FIXME note., Dmitry Gutov, 2018/03/15
- [elpa] master 5c152e0 334/433: Merge pull request #20 from dgutov/overlays, Dmitry Gutov, 2018/03/15
- [elpa] master 16907a3 368/433: Delete .cvsignore, move almost everything to .gitignore, Dmitry Gutov, 2018/03/15
- [elpa] master df0d56b 406/433: Fix regression from the previous commit,
Dmitry Gutov <=
- [elpa] master 50764ae 269/433: Fixed back recognition of output regions., Dmitry Gutov, 2018/03/15
- [elpa] master cb905bd 431/433: Add copyright blurbs to the test files, Dmitry Gutov, 2018/03/15
- [elpa] master 38f1f2a 390/433: Update TODO, Dmitry Gutov, 2018/03/15
- [elpa] master 6406e1a 357/433: Update NEWS, Dmitry Gutov, 2018/03/15
- [elpa] master a57afa3 421/433: Release 0.5.5, Dmitry Gutov, 2018/03/15
- [elpa] master fd3c992 378/433: Fix sporadic keywords mishighlighting in sql-mode, Dmitry Gutov, 2018/03/15
- [elpa] master 8ed11ab 262/433: Added delimiter regions and region name matching., Dmitry Gutov, 2018/03/15
- [elpa] master cb10b47 165/433: (mmm-set-buffer-file-name-p): Added to control file name setting., Dmitry Gutov, 2018/03/15
- [elpa] master ca87dd4 187/433: (mmm-update-mode-info): Hacked so `font-lock-keywords-alist' works., Dmitry Gutov, 2018/03/15
- [elpa] master cf82d88 423/433: Add to TODO, Dmitry Gutov, 2018/03/15