diff options
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/emacs-lisp/ert.el | 9 |
2 files changed, 11 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a60ce0be672..4e71d355886 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2011-03-20 Christian Ohler <ohler@gnu.org> | ||
| 2 | |||
| 3 | * emacs-lisp/ert.el (ert-run-tests-batch): Remove unused variable. | ||
| 4 | (ert-delete-all-tests): Use `called-interactively-p' rather than | ||
| 5 | `interactive-p'. | ||
| 6 | (ert--make-xrefs-region): Respect END. | ||
| 7 | |||
| 1 | 2011-03-19 Chong Yidong <cyd@stupidchicken.com> | 8 | 2011-03-19 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 9 | ||
| 3 | * dired-aux.el (dired-create-directory): Signal an error if the | 10 | * dired-aux.el (dired-create-directory): Signal an error if the |
diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el index 5bd8fd01b1e..b2e20843856 100644 --- a/lisp/emacs-lisp/ert.el +++ b/lisp/emacs-lisp/ert.el | |||
| @@ -1482,9 +1482,8 @@ Returns the stats object." | |||
| 1482 | (let ((print-escape-newlines t) | 1482 | (let ((print-escape-newlines t) |
| 1483 | (print-level 5) | 1483 | (print-level 5) |
| 1484 | (print-length 10)) | 1484 | (print-length 10)) |
| 1485 | (let ((begin (point))) | 1485 | (ert--pp-with-indentation-and-newline |
| 1486 | (ert--pp-with-indentation-and-newline | 1486 | (ert-test-result-with-condition-condition result))) |
| 1487 | (ert-test-result-with-condition-condition result)))) | ||
| 1488 | (goto-char (1- (point-max))) | 1487 | (goto-char (1- (point-max))) |
| 1489 | (assert (looking-at "\n")) | 1488 | (assert (looking-at "\n")) |
| 1490 | (delete-char 1) | 1489 | (delete-char 1) |
| @@ -1603,7 +1602,7 @@ Nothing more than an interactive interface to `ert-make-test-unbound'." | |||
| 1603 | (defun ert-delete-all-tests () | 1602 | (defun ert-delete-all-tests () |
| 1604 | "Make all symbols in `obarray' name no test." | 1603 | "Make all symbols in `obarray' name no test." |
| 1605 | (interactive) | 1604 | (interactive) |
| 1606 | (when (interactive-p) | 1605 | (when (called-interactively-p 'any) |
| 1607 | (unless (y-or-n-p "Delete all tests? ") | 1606 | (unless (y-or-n-p "Delete all tests? ") |
| 1608 | (error "Aborted"))) | 1607 | (error "Aborted"))) |
| 1609 | ;; We can't use `ert-select-tests' here since that gives us only | 1608 | ;; We can't use `ert-select-tests' here since that gives us only |
| @@ -1793,7 +1792,7 @@ EWOC and STATS are arguments for `ert--results-update-stats-display'." | |||
| 1793 | BEGIN and END specify a region in the current buffer." | 1792 | BEGIN and END specify a region in the current buffer." |
| 1794 | (save-excursion | 1793 | (save-excursion |
| 1795 | (save-restriction | 1794 | (save-restriction |
| 1796 | (narrow-to-region begin (point)) | 1795 | (narrow-to-region begin end) |
| 1797 | ;; Inhibit optimization in `debugger-make-xrefs' that would | 1796 | ;; Inhibit optimization in `debugger-make-xrefs' that would |
| 1798 | ;; sometimes insert unrelated backtrace info into our buffer. | 1797 | ;; sometimes insert unrelated backtrace info into our buffer. |
| 1799 | (let ((debugger-previous-backtrace nil)) | 1798 | (let ((debugger-previous-backtrace nil)) |