Merge branch 'master' of orgmode.org:org-mode

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 ()

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))

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

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