diff options
author | Carsten Dominik <carsten.dominik@gmail.com> | 2013-10-01 20:20:04 +0200 |
---|---|---|
committer | Carsten Dominik <carsten.dominik@gmail.com> | 2013-10-01 20:20:04 +0200 |
commit | f871fb6fca4a47b69c8b58913f2a1bcb1a863038 (patch) | |
tree | ff540c4d81742b86cc269ce402819c8a32d0314b | |
parent | 08d9c1b42c67cf7f74e18d5ff829ae1a3dbe2692 (diff) | |
parent | 01467ae08345e52ed28271a1578b9c34005c5203 (diff) | |
download | org-mode-f871fb6fca4a47b69c8b58913f2a1bcb1a863038.tar.gz |
Merge branch 'master' of orgmode.org:org-mode
-rw-r--r-- | lisp/ob-core.el | 2 | ||||
-rw-r--r-- | lisp/ob-tangle.el | 1 | ||||
-rw-r--r-- | mk/default.mk | 3 | ||||
-rw-r--r-- | mk/targets.mk | 9 |
4 files changed, 9 insertions, 6 deletions
diff --git a/lisp/ob-core.el b/lisp/ob-core.el index a7c227b..4f9c149 100644 --- a/lisp/ob-core.el +++ b/lisp/ob-core.el @@ -2168,7 +2168,7 @@ code ---- the results are extracted in the syntax of the source (goto-char location) (when (looking-at (concat org-babel-result-regexp ".*$")) (delete-region - (if keep-keyword (1+ (match-end 0)) (match-beginning 0)) + (if keep-keyword (1+ (match-end 0)) (1- (match-beginning 0))) (progn (forward-line 1) (org-babel-result-end)))))))) (defun org-babel-result-end () diff --git a/lisp/ob-tangle.el b/lisp/ob-tangle.el index 63d0a47..f655711 100644 --- a/lisp/ob-tangle.el +++ b/lisp/ob-tangle.el @@ -322,7 +322,6 @@ that the appropriate major-mode is set. SPEC has the form: (insert-comment (lambda (text) (when (and comments (not (string= comments "no")) (> (length text) 0)) - (when padline (insert "\n")) (comment-region (point) (progn (insert text) (point))) (end-of-line nil) (insert "\n"))))) (when comment (funcall insert-comment comment)) diff --git a/mk/default.mk b/mk/default.mk index a39ecec..5cb75c3 100644 --- a/mk/default.mk +++ b/mk/default.mk @@ -60,8 +60,7 @@ BTEST = $(BATCH) \ -l testing/org-test.el \ $(foreach ob-lang,$(BTEST_OB_LANGUAGES),$(req-ob-lang)) \ $(foreach req,$(BTEST_EXTRA),$(req-extra)) \ - --eval '(setq org-confirm-babel-evaluate nil)' \ - -f org-test-run-batch-tests + --eval '(setq org-confirm-babel-evaluate nil)' # Using emacs in batch mode. # BATCH = $(EMACS) -batch -vanilla # XEmacs diff --git a/mk/targets.mk b/mk/targets.mk index aef11eb..cc4e032 100644 --- a/mk/targets.mk +++ b/mk/targets.mk @@ -94,10 +94,15 @@ compile compile-dirty:: all clean-install:: $(foreach dir, $(SUBDIRS), $(MAKE) -C $(dir) $@;) -check test:: compile +check test single-test:: compile check test test-dirty:: -$(MKDIR) $(testdir) - TMPDIR=$(testdir) $(BTEST) + TMPDIR=$(testdir) $(BTEST) -f org-test-run-batch-tests + +single-test single-test-dirty:: + -$(MKDIR) $(testdir) + TMPDIR=$(testdir) $(BTEST) --eval "(org-test-load)" --eval "(ert '$(TEST))" + ifeq ($(TEST_NO_AUTOCLEAN),) # define this variable to leave $(testdir) around for inspection $(MAKE) cleantest endif |