diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2018-02-16 23:38:32 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2018-02-16 23:38:32 +0200 |
| commit | aaad1e62f3e87873135a465530d6686bed5dc4c3 (patch) | |
| tree | f6b3a3d8dc19672309e530f983be26d4ebd77ddc /lisp/emacs-lisp | |
| parent | 5906418b5b627245dc79137bbf2b41c59b6ba211 (diff) | |
| parent | 9ab3df197f1ee7f23df30f554209b863369f06ee (diff) | |
| download | emacs-aaad1e62f3e87873135a465530d6686bed5dc4c3.tar.gz emacs-aaad1e62f3e87873135a465530d6686bed5dc4c3.tar.bz2 emacs-aaad1e62f3e87873135a465530d6686bed5dc4c3.zip | |
Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emacs into emacs-26
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/edebug.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/ewoc.el | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el index 08e2b978ec7..7e4d244f5e2 100644 --- a/lisp/emacs-lisp/edebug.el +++ b/lisp/emacs-lisp/edebug.el @@ -641,7 +641,7 @@ list of a symbol.") (defun edebug-form-data-symbol () "Return the edebug data symbol of the form where point is in. -If point is not inside a edebuggable form, cause error." +If point is not inside an edebuggable form, signal an error." (or (edebug--form-data-name (edebug-get-form-data-entry (point))) (error "Not inside instrumented form"))) diff --git a/lisp/emacs-lisp/ewoc.el b/lisp/emacs-lisp/ewoc.el index b88a1a5097c..262d4d85941 100644 --- a/lisp/emacs-lisp/ewoc.el +++ b/lisp/emacs-lisp/ewoc.el @@ -411,7 +411,7 @@ If the EWOC is empty, nil is returned." ((>= pos (ewoc--node-start-marker (ewoc--node-nth dll -2))) (ewoc--node-nth dll -2)) - ;; We now know that pos is within a elem. + ;; We now know that pos is within an elem. (t ;; Make an educated guess about which of the three known ;; node'es (the first, the last, or GUESS) is nearest. |