File tree Expand file tree Collapse file tree 4 files changed +462
-31
lines changed
Expand file tree Collapse file tree 4 files changed +462
-31
lines changed Original file line number Diff line number Diff line change @@ -2795,21 +2795,21 @@ GFM quoted code blocks. Calls `markdown-code-block-at-pos'."
27952795
27962796; ;; Markdown Font Lock Matching Functions =====================================
27972797
2798- (defun markdown-range-property-any (begin end prop values )
2799- " Return t if PROP from BEGIN to END is equal to one of the given VALUES.
2800- Also returns t if PROP is a list containing one of the VALUES.
2798+ (defun markdown-range-property-any (begin end prop prop- values )
2799+ " Return t if PROP from BEGIN to END is equal to one of the given PROP- VALUES.
2800+ Also returns t if PROP is a list containing one of the PROP- VALUES.
28012801Return nil otherwise."
28022802 (let (props)
28032803 (catch 'found
28042804 (dolist (loc (number-sequence begin end))
28052805 (when (setq props (get-char-property loc prop))
28062806 (cond ((listp props)
28072807 ; ; props is a list, check for membership
2808- (dolist (val values)
2808+ (dolist (val prop- values)
28092809 (when (memq val props) (throw 'found loc))))
28102810 (t
28112811 ; ; props is a scalar, check for equality
2812- (dolist (val values)
2812+ (dolist (val prop- values)
28132813 (when (eq val props) (throw 'found loc))))))))))
28142814
28152815(defun markdown-range-properties-exist (begin end props )
Original file line number Diff line number Diff line change @@ -10,16 +10,28 @@ TEST_HTML = $(TEST_SRCS:.text=.html)
1010.text.html :
1111 $(MARKDOWN ) < $< > $@
1212
13- test :
14- $(EMACS ) -Q --batch \
13+ test : compile-all
14+ $(EMACS ) -Q --batch $(CL ) \
15+ -l ert -l ../markdown-mode.elc -l markdown-test.elc \
16+ -f ert-run-tests-batch-and-exit
17+
18+ compile-all :
19+ $(EMACS ) -Q --batch $(CL ) \
1520 --eval ' (setq byte-compile-error-on-warn t)' \
1621 -l ../markdown-mode.el \
1722 -f batch-byte-compile ../markdown-mode.el markdown-test.el
18- $(EMACS ) -Q --batch \
19- -l ert -l ../markdown-mode.elc -l markdown-test.elc \
20- -f ert-run-tests-batch-and-exit
2123
2224html : $(TEST_HTML )
2325
2426clean :
2527 rm -f $(TEST_HTML ) * .elc ../* .elc
28+
29+ # add cl compatibility for emacs 24.1,2
30+ CL_ARG := -l cl-lib-0.5.el \
31+ --eval '(setq byte-compile-warnings (quote (not cl-functions)))'
32+ evm :
33+ $(MAKE ) test EMACS=" $( shell evm bin emacs-24.1) " CL=" $( CL_ARG) "
34+ $(MAKE ) test EMACS=" $( shell evm bin emacs-24.2) " CL=" $( CL_ARG) "
35+ $(MAKE ) test EMACS=" $( shell evm bin emacs-24.3) " CL=" "
36+ $(MAKE ) test EMACS=" $( shell evm bin emacs-24.4) " CL=" "
37+ $(MAKE ) test EMACS=" $( shell evm bin emacs-24.5) " CL=" "
You can’t perform that action at this time.
0 commit comments