[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 05a787e 291/433: Fix further compilation warnings in recen
From: |
Dmitry Gutov |
Subject: |
[elpa] master 05a787e 291/433: Fix further compilation warnings in recent Emacsen |
Date: |
Thu, 15 Mar 2018 19:44:22 -0400 (EDT) |
branch: master
commit 05a787e163e09a3104afe0e68f32687cfc77e21f
Author: Steve Purcell <address@hidden>
Commit: Steve Purcell <address@hidden>
Fix further compilation warnings in recent Emacsen
---
mmm-mode.el | 18 +++++++++++-------
mmm-vars.el | 1 +
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/mmm-mode.el b/mmm-mode.el
index 4564294..b78a7ea 100644
--- a/mmm-mode.el
+++ b/mmm-mode.el
@@ -160,9 +160,11 @@ available through M-x customize under Programming | Tools
| Mmm."
(mmm-add-hooks)
(mmm-fixup-skeleton)
(make-local-variable 'font-lock-fontify-region-function)
- (make-local-variable 'font-lock-beginning-of-syntax-function)
- (setq font-lock-fontify-region-function 'mmm-fontify-region
- font-lock-beginning-of-syntax-function 'mmm-beginning-of-syntax)
+ (setq font-lock-fontify-region-function 'mmm-fontify-region)
+ (set (make-local-variable (if (boundp 'syntax-begin-function) ; Emacs >=
23
+ 'syntax-begin-function
+ 'font-lock-beginning-of-syntax-function))
+ 'mmm-beginning-of-syntax)
(setq mmm-mode t)
(condition-case err
(mmm-apply-all)
@@ -189,9 +191,11 @@ available through M-x customize under Programming | Tools
| Mmm."
(mmm-clear-local-variables)
(mmm-update-submode-region)
(setq font-lock-fontify-region-function
- (get mmm-primary-mode 'mmm-fontify-region-function)
- font-lock-beginning-of-syntax-function
- (get mmm-primary-mode 'mmm-beginning-of-syntax-function))
+ (get mmm-primary-mode 'mmm-fontify-region-function))
+ (set (if (boundp 'syntax-begin-function) ; Emacs >= 23
+ 'syntax-begin-function
+ 'font-lock-beginning-of-syntax-function)
+ (get mmm-primary-mode 'mmm-beginning-of-syntax-function))
(mmm-update-font-lock-buffer)
(mmm-refontify-maybe)
(setq mmm-mode nil)
@@ -293,4 +297,4 @@ available through M-x customize under Programming | Tools |
Mmm."
(provide 'mmm-mode)
-;;; mmm-mode.el ends here
\ No newline at end of file
+;;; mmm-mode.el ends here
diff --git a/mmm-vars.el b/mmm-vars.el
index ca70b92..e8ad284 100644
--- a/mmm-vars.el
+++ b/mmm-vars.el
@@ -33,6 +33,7 @@
;;; Code:
(require 'mmm-compat)
+(require 'cl)
;; MISCELLANEOUS
;;{{{ Shut up the Byte Compiler
- [elpa] master 1e46c43 306/433: Fix #8, (continued)
- [elpa] master 1e46c43 306/433: Fix #8, Dmitry Gutov, 2018/03/15
- [elpa] master ed0b781 310/433: Merge pull request #9 from dgutov/master, Dmitry Gutov, 2018/03/15
- [elpa] master e5fe9e7 261/433: Implemented a 'local to submode class' keymap binding, using a dummy overlay., Dmitry Gutov, 2018/03/15
- [elpa] master 955038c 302/433: Merge remote-tracking branch 'refs/remotes/dgutov/erb', Dmitry Gutov, 2018/03/15
- [elpa] master 7f9dbdb 292/433: Fix `mmm-insert-region' to not abort loop too soon, Dmitry Gutov, 2018/03/15
- [elpa] master 5289a0b 318/433: Save values of more cc-mode variables, Dmitry Gutov, 2018/03/15
- [elpa] master 034df4b 339/433: Revert c548593, for easier optimization, Dmitry Gutov, 2018/03/15
- [elpa] master e10b20f 347/433: Remove the angle brackets, Dmitry Gutov, 2018/03/15
- [elpa] master 0cb75f0 299/433: Correctly restore pre-indent position, Dmitry Gutov, 2018/03/15
- [elpa] master 9674355 328/433: Merge pull request #18 from prakashk/master, Dmitry Gutov, 2018/03/15
- [elpa] master 05a787e 291/433: Fix further compilation warnings in recent Emacsen,
Dmitry Gutov <=
- [elpa] master e269a47 305/433: Require 'mmm-region from 'mmm-erb, avoiding compilation warnings about free variable references, Dmitry Gutov, 2018/03/15
- [elpa] master 961a127 263/433: Prevent bounds from going outside buffer (XEmacs complains), Dmitry Gutov, 2018/03/15
- [elpa] master 66b47cd 218/433: Released 0.4.7, Dmitry Gutov, 2018/03/15
- [elpa] master 07b35d4 250/433: Added mmm-noweb to autoload (Joe Kelsey), Dmitry Gutov, 2018/03/15
- [elpa] master b554efb 287/433: After fontifying the region, restore local vars, Dmitry Gutov, 2018/03/15
- [elpa] master 0922481 254/433: Added narrow to submode region (Joe Kelsey), Dmitry Gutov, 2018/03/15
- [elpa] master b72e44c 369/433: Released 0.5.1, Dmitry Gutov, 2018/03/15
- [elpa] master bcc5adf 351/433: Define mmm-indent-line-function and its default value, Dmitry Gutov, 2018/03/15
- [elpa] master 8ab7041 297/433: Adjust indentation in primary mode for ERB blocks, Dmitry Gutov, 2018/03/15
- [elpa] master 68b2135 282/433: Fix obsolete backquotes, Dmitry Gutov, 2018/03/15