diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2012-03-01 18:29:30 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-03-01 18:29:30 -0800 |
commit | 9d6b4d53469a9ffd67bd770fabc6fe254e35c21d (patch) | |
tree | de238c6f707915be9ed1f10235589b4e975a08fb /lisp/emacs-lisp/ert.el | |
parent | a89654f8f34114db543cb91363e8fded6d73e986 (diff) | |
parent | eec1549a6b89359b6d970f14dead275e59b7bc6f (diff) | |
download | emacs-9d6b4d53469a9ffd67bd770fabc6fe254e35c21d.tar.gz emacs-9d6b4d53469a9ffd67bd770fabc6fe254e35c21d.tar.bz2 emacs-9d6b4d53469a9ffd67bd770fabc6fe254e35c21d.zip |
Merge from trunk.
Diffstat (limited to 'lisp/emacs-lisp/ert.el')
-rw-r--r-- | lisp/emacs-lisp/ert.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el index be8eb77f170..9cbe29bf322 100644 --- a/lisp/emacs-lisp/ert.el +++ b/lisp/emacs-lisp/ert.el @@ -862,7 +862,7 @@ run. DEBUGGER-ARGS are the arguments to `debugger'." (make-ert-test-failed :condition condition :backtrace backtrace :infos infos)))) - ;; Work around Emacs' heuristic (in eval.c) for detecting + ;; Work around Emacs's heuristic (in eval.c) for detecting ;; errors in the debugger. (incf num-nonmacro-input-events) ;; FIXME: We should probably implement more fine-grained |