From 9429d7e54d4674a43975577927b0e3af0d7f88b5 Mon Sep 17 00:00:00 2001 From: David Aspinall Date: Tue, 26 Apr 2011 14:34:45 +0000 Subject: Patch: font-lock-beginning-of-syntax-function -> syntax-begin-function to work with Emacs 23.3. May break work with earlier versions. --- contrib/mmm/mmm-mode.el | 9 ++++++--- contrib/mmm/mmm-region.el | 6 ++++-- 2 files changed, 10 insertions(+), 5 deletions(-) (limited to 'contrib/mmm') diff --git a/contrib/mmm/mmm-mode.el b/contrib/mmm/mmm-mode.el index cce9b7e2..45bf062a 100644 --- a/contrib/mmm/mmm-mode.el +++ b/contrib/mmm/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) + ;(make-local-variable 'font-lock-beginning-of-syntax-function) + (make-local-variable 'syntax-beginning-function) (setq font-lock-fontify-region-function 'mmm-fontify-region - font-lock-beginning-of-syntax-function 'mmm-beginning-of-syntax) + ; font-lock-beginning-of-syntax-function 'mmm-beginning-of-syntax + syntax-begin-function 'mmm-beginning-of-syntax) (setq mmm-mode t) (condition-case err (mmm-apply-all) @@ -190,7 +192,8 @@ available through M-x customize under Programming | Tools | Mmm." (mmm-update-submode-region) (setq font-lock-fontify-region-function (get mmm-primary-mode 'mmm-fontify-region-function) - font-lock-beginning-of-syntax-function + ; font-lock-beginning-of-syntax-function + syntax-begin-function (get mmm-primary-mode 'mmm-beginning-of-syntax-function)) (mmm-update-font-lock-buffer) (mmm-refontify-maybe) diff --git a/contrib/mmm/mmm-region.el b/contrib/mmm/mmm-region.el index c6c7a5af..1b4975df 100644 --- a/contrib/mmm/mmm-region.el +++ b/contrib/mmm/mmm-region.el @@ -548,7 +548,8 @@ is non-nil, don't quit if the info is already there." (put mode 'mmm-fontify-region-function font-lock-fontify-region-function)) (put mode 'mmm-beginning-of-syntax-function - font-lock-beginning-of-syntax-function)) + ;font-lock-beginning-of-syntax-function)) + syntax-begin-function)) ;; Get variables (setq global-vars (mmm-get-locals 'global) buffer-vars (mmm-get-locals 'buffer) @@ -768,7 +769,8 @@ of the REGIONS covers START to STOP." ;; For some reason `font-lock-fontify-block' binds this to nil, thus ;; preventing `mmm-beginning-of-syntax' from doing The Right Thing. ;; I don't know why it does this, but let's undo it here. - (let ((font-lock-beginning-of-syntax-function 'mmm-beginning-of-syntax)) + (let ((;font-lock-beginning-of-syntax-function + syntax-begin-function 'mmm-beginning-of-syntax)) (mapc #'(lambda (elt) (when (get (car elt) 'mmm-font-lock-mode) (mmm-fontify-region-list (car elt) (cdr elt)))) -- cgit v1.2.3