aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Aspinall2009-09-06 21:56:35 +0000
committerDavid Aspinall2009-09-06 21:56:35 +0000
commit23ae60ef199718717402ffe4916e4fd7cba879b2 (patch)
treef3f17a55d0620498ec8ce60b5a74a8bed99d817a
parent1d993545f6f1364f2ec83e53ffcd5fa5acaa10af (diff)
Prevent compiler warnings
-rw-r--r--mmm/mmm-class.el19
-rw-r--r--mmm/mmm-vars.el6
2 files changed, 15 insertions, 10 deletions
diff --git a/mmm/mmm-class.el b/mmm/mmm-class.el
index f1078883..cc192f13 100644
--- a/mmm/mmm-class.el
+++ b/mmm/mmm-class.el
@@ -220,9 +220,10 @@ point at which the search should continue if the region is invalid,
and OK-RESUME if the region is valid."
(when (mmm-match-and-verify front start stop front-verify)
(let ((beg (mmm-match->point include-front front-offset front-match))
- (front-pos (if front-delim
+ (front-pos (with-no-warnings ; da: front-delim dyn scope?
+ (if front-delim
(mmm-match->point t front-delim front-match)
- nil))
+ nil)))
(invalid-resume (match-end front-match))
(front-form (mmm-get-form front-form)))
(let ((submode (if match-submode
@@ -253,9 +254,10 @@ and OK-RESUME if the region is valid."
beg stop back-verify)
(let* ((end (mmm-match->point (not include-back)
back-offset back-match))
- (back-pos (if back-delim
- (mmm-match->point nil back-delim back-match)
- nil))
+ (back-pos (with-no-warnings ; da: as above
+ (if back-delim
+ (mmm-match->point nil back-delim back-match)
+ nil)))
(back-form (mmm-get-form back-form))
(ok-resume (if end-not-begin
(match-end back-match)
@@ -269,9 +271,10 @@ and OK-RESUME if the region is valid."
BEGINP, start at \(match-beginning MATCH), else \(match-end MATCH),
and move OFFSET. Handles all values of OFFSET--see `mmm-classes-alist'."
(save-excursion
- (goto-char (if beginp
- (match-beginning front-match)
- (match-end back-match)))
+ (goto-char (with-no-warnings ; da: front/back-match dyn binding?
+ (if beginp
+ (match-beginning front-match)
+ (match-end back-match))))
(dolist (spec (if (listp offset) offset (list offset)))
(if (numberp spec)
(forward-char (or spec 0))
diff --git a/mmm/mmm-vars.el b/mmm/mmm-vars.el
index fda8e61d..cb653dc4 100644
--- a/mmm/mmm-vars.el
+++ b/mmm/mmm-vars.el
@@ -50,8 +50,10 @@
(defvar mmm-mode-prefix-key)
(defvar mmm-global-mode)
(defvar mmm-primary-mode)
- (defvar mmm-classes-alist))
- (defvar mmm-current-submode)
+ (defvar mmm-classes-alist)
+ (defvar mmm-current-submode))
+ (declare-function mmm-set-class-parameter "mmm-class")
+ (declare-function mmm-get-class-parameter "mmm-class")
;;}}}
;;{{{ Error Conditions