3 new commits in mmm-mode: https://bitbucket.org/xemacs/mmm-mode/changeset/d326d4ce07f4/ changeset: d326d4ce07f4 user: Norbert Koch date: 2012-01-10 14:52:59 summary: XEmacs Package Release 1.06 affected #: 2 files diff -r 26abae702baea43f20c5297cc5e25461e0634a66 -r d326d4ce07f4392111bb829920f8146e2afcbd77 ChangeLog --- a/ChangeLog +++ b/ChangeLog ＠＠ -1,3 +1,7 ＠＠ +2012-01-10 Norbert Koch <viteno(a)xemacs.org&gt; + + * Makefile (VERSION): XEmacs package 1.06 released. + 2010-02-09 Norbert Koch <viteno(a)xemacs.org&gt; * Makefile (VERSION): XEmacs package 1.05 released. diff -r 26abae702baea43f20c5297cc5e25461e0634a66 -r d326d4ce07f4392111bb829920f8146e2afcbd77 Makefile --- a/Makefile +++ b/Makefile ＠＠ -17,7 +17,7 ＠＠ # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. -VERSION = 1.05 +VERSION = 1.06 AUTHOR_VERSION = 0.4.8 MAINTAINER = Marcus Harnisch <marcus.harnisch(a)gmx.net&gt; PACKAGE = mmm-mode https://bitbucket.org/xemacs/mmm-mode/changeset/d57fcb4ad259/ changeset: d57fcb4ad259 user: Norbert Koch date: 2012-01-10 14:52:59 summary: Added tag mmm-mode-1_06 for changeset d326d4ce07f4 affected #: 1 file diff -r d326d4ce07f4392111bb829920f8146e2afcbd77 -r d57fcb4ad259e351cc7ec208bdb6fe90f94758e7 .hgtags --- a/.hgtags +++ b/.hgtags ＠＠ -33,3 +33,4 ＠＠ 3818594a22eae321add52db167f52d577831c493 mmm-mode-1_03 4bc9c4bf426fc081b1597369b56c910f6844db06 sumo-2003-02-05 717a69f81ea14b450d818d8802e4001788543a04 sumo-2006-05-10 +d326d4ce07f4392111bb829920f8146e2afcbd77 mmm-mode-1_06 https://bitbucket.org/xemacs/mmm-mode/changeset/306282595cd6/ changeset: 306282595cd6 user: Norbert Koch date: 2012-01-13 12:36:57 summary: merge affected #: 2 files diff -r d57fcb4ad259e351cc7ec208bdb6fe90f94758e7 -r 306282595cd6c40b1ac35d774319165413dbf8b4 ChangeLog --- a/ChangeLog +++ b/ChangeLog ＠＠ -2,6 +2,18 ＠＠ * Makefile (VERSION): XEmacs package 1.06 released. +2011-12-01 Didier Verna <didier(a)xemacs.org&gt; + + * mmm-class.el: Add compiler magic so code using + multiple-value-list compiled on 21.4 works on 21.5. + +2011-12-01 Didier Verna <didier(a)xemacs.org&gt; + + * mmm-class.el (mmm-ify): Fix infinite loop in mmm-ify introduced + by revision f9f3c7b63268 (2010-02-07 Aidan Kehoe + <kehoea(a)parhasard.net&gt; below). Re-incorporate the call to + mmm-match-region in the loop). + 2010-02-09 Norbert Koch <viteno(a)xemacs.org&gt; * Makefile (VERSION): XEmacs package 1.05 released. diff -r d57fcb4ad259e351cc7ec208bdb6fe90f94758e7 -r 306282595cd6c40b1ac35d774319165413dbf8b4 mmm-class.el --- a/mmm-class.el +++ b/mmm-class.el ＠＠ -39,7 +39,8 ＠＠ (eval-when-compile (when (eq 'list (symbol-function 'values)) (define-compiler-macro values (&rest args) `(list ,＠args)) - (define-compiler-macro values-list (arg) arg))) + (define-compiler-macro values-list (arg) arg) + (define-compiler-macro multiple-value-list (arg) arg))) ;;; CLASS SPECIFICATIONS ;;{{{ Get Class Specifications ＠＠ -127,84 +128,81 ＠＠ ;;{{{ Scan for Regions (defun* mmm-ify - (&rest all &key classes handler - submode match-submode - (start (point-min)) (stop (point-max)) - front back save-matches (case-fold-search t) - (beg-sticky (not (number-or-marker-p front))) - (end-sticky (not (number-or-marker-p back))) - include-front include-back - (front-offset 0) (back-offset 0) - (front-delim nil) (back-delim nil) - (delimiter-mode mmm-delimiter-mode) - front-face back-face - front-verify back-verify - front-form back-form - creation-hook - face match-face - save-name match-name - (front-match 0) (back-match 0) - end-not-begin - ;insert private - &allow-other-keys - ) + (&rest all + &key classes handler + submode match-submode + (start (point-min)) (stop (point-max)) + front back save-matches (case-fold-search t) + (beg-sticky (not (number-or-marker-p front))) + (end-sticky (not (number-or-marker-p back))) + include-front include-back + (front-offset 0) (back-offset 0) + (front-delim nil) (back-delim nil) + (delimiter-mode mmm-delimiter-mode) + front-face back-face + front-verify back-verify + front-form back-form + creation-hook + face match-face + save-name match-name + (front-match 0) (back-match 0) + end-not-begin + ;insert private + &allow-other-keys) "Create submode regions from START to STOP according to arguments. If CLASSES is supplied, it must be a list of valid CLASSes. Otherwise, the rest of the arguments are for an actual class being applied. See `mmm-classes-alist' for information on what they all mean." ;; Make sure we get the default values in the `all' list. (setq all (append - all - (list :start start :stop stop + all + (list :start start :stop stop :beg-sticky beg-sticky :end-sticky end-sticky :front-offset front-offset :back-offset back-offset :front-delim front-delim :back-delim back-delim - :front-match 0 :back-match 0 - ))) + :front-match 0 :back-match 0))) (cond - ;; If we have a class list, apply them all. - (classes - (mmm-apply-classes classes :start start :stop stop :face face)) - ;; Otherwise, apply this class. - ;; If we have a handler, call it. - (handler - (apply handler all)) - ;; Otherwise, we search from START to STOP for submode regions, - ;; continuining over errors, until we don't find any more. If FRONT - ;; and BACK are number-or-markers, this should only execute once. - (t - (mmm-save-all - (goto-char start) - (multiple-value-bind - (beg end front-pos back-pos matched-front matched-back - matched-submode matched-face matched-name invalid-resume - ok-resume) - (apply #'mmm-match-region :start (point) all) - (loop - while beg - if end ; match-submode, if present, succeeded. - do - (condition-case nil - (progn - (mmm-make-region - (or matched-submode submode) beg end -:face (or matched-face face) -:front front-pos :back back-pos -:evaporation 'front -:match-front matched-front :match-back matched-back -:beg-sticky beg-sticky :end-sticky end-sticky -:name matched-name -:delimiter-mode delimiter-mode -:front-face front-face :back-face back-face -:creation-hook creation-hook - ) - (goto-char ok-resume)) - ;; If our region is invalid, go back to the end of the - ;; front match and continue on. - (mmm-error (goto-char invalid-resume))) - ;; If match-submode was unable to find a match, go back to - ;; the end of the front match and continue on. - else do (goto-char invalid-resume))))))) + ;; If we have a class list, apply them all. + (classes + (mmm-apply-classes classes :start start :stop stop :face face)) + ;; Otherwise, apply this class. + ;; If we have a handler, call it. + (handler + (apply handler all)) + ;; Otherwise, we search from START to STOP for submode regions, + ;; continuining over errors, until we don't find any more. If FRONT + ;; and BACK are number-or-markers, this should only execute once. + (t + (mmm-save-all + (goto-char start) + (loop for (beg end front-pos back-pos matched-front matched-back + matched-submode matched-face matched-name + invalid-resume ok-resume) + = (multiple-value-list + (apply #'mmm-match-region :start (point) all)) + while beg + if end ; match-submode, if present, succeeded. + do + (condition-case nil + (progn + (mmm-make-region + (or matched-submode submode) beg end + :face (or matched-face face) + :front front-pos :back back-pos + :evaporation 'front + :match-front matched-front :match-back matched-back + :beg-sticky beg-sticky :end-sticky end-sticky + :name matched-name + :delimiter-mode delimiter-mode + :front-face front-face :back-face back-face + :creation-hook creation-hook) + (goto-char ok-resume)) + ;; If our region is invalid, go back to the end of the + ;; front match and continue on. + (mmm-error (goto-char invalid-resume))) + ;; If match-submode was unable to find a match, go back to + ;; the end of the front match and continue on. + else do (goto-char invalid-resume)))))) ;;}}} ;;{{{ Match Regions ＠＠ -328,4 +326,4 ＠＠ (provide 'mmm-class) -;;; mmm-class.el ends here \ No newline at end of file +;;; mmm-class.el ends here Repository URL: https://bitbucket.org/xemacs/mmm-mode/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches