test failure

[Nick Dokos <nicholas.dokos@hp.com>]

``make test'' fails on just-updated org:

Org-mode version 7.9.2 (release_7.9.2-725-ge55681 @ /home/nick/elisp/org-mode/lisp/)

with the following backtrace:

,----
| Test test-org-src/blank-line-block backtrace:
|   signal(user-error ("No special environment to edit here"))
|   user-error("No special environment to edit here")
|   org-edit-special()
|   (prog1 (goto-line 3) (org-edit-special) (insert "blah") (org-edit-sr
|   (progn (org-mode) (progn (insert "\n#+begin_src emacs-lisp\n\n#+end_
|   (unwind-protect (progn (org-mode) (progn (insert "\n#+begin_src emac
|   (save-current-buffer (set-buffer temp-buffer) (unwind-protect (progn
|   (let ((temp-buffer (generate-new-buffer " *temp*"))) (save-current-b
|   (lambda nil (let ((temp-buffer (generate-new-buffer " *temp*"))) (sa
|   byte-code("\306\307!\x18q\210\310\216\311 \x19\312\216\313\314\315\316\3
|   ert--run-test-internal([cl-struct-ert--test-execution-info [cl-struc
|   byte-code("\306\307!\211\x18\211\x19r\310\311!q\210\312 d\313\223)L\210)\3
|   ert-run-test([cl-struct-ert-test test-org-src/blank-line-block "Edit
|   ert-run-or-rerun-test([cl-struct-ert--stats "\\(org\\|ob\\)" [[cl-st
|   ert-run-tests("\\(org\\|ob\\)" #[(event-type &rest event-args) "\306
|   ert-run-tests-batch("\\(org\\|ob\\)")
|   ert-run-tests-batch-and-exit("\\(org\\|ob\\)")
|   (let ((org-id-track-globally t) (org-id-locations-file (convert-stan
|   org-test-run-batch-tests()
|   call-interactively(org-test-run-batch-tests nil nil)
|   command-execute(org-test-run-batch-tests)
|   command-line-1(("--eval" "(add-to-list 'load-path \"./lisp\")" "--ev
|   command-line()
|   normal-top-level()
| Test test-org-src/blank-line-block condition:
|     (user-error "No special environment to edit here")
|    FAILED  299/333  test-org-src/blank-line-block
`----

I thought Michael Brand's problem described in

   http://thread.gmane.org/gmane.emacs.orgmode/63523

might have something to do with it, but wrapping a progn around the
forms of the test did not make any difference.

When I simulate the test by hand, I don't get the error, so this seems
to be another of those errors that only surface when the test suite is
run in batch mode.

BTW, why in the above is the following a prog1, rather than a progn?

   (prog1 (goto-line 3) (org-edit-special) (insert "blah") (org-edit-sr

Nick