diff options
| author | Andrea Corallo <akrl@sdf.org> | 2020-08-13 12:22:07 +0200 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2020-08-13 12:22:07 +0200 |
| commit | 46e7613ad3b88807d25cfab3d78bf46c9e2fe13e (patch) | |
| tree | a7b560c36e097660536697c9d0057c9273d779b2 /lisp/emacs-lisp/lisp.el | |
| parent | f6502f959253b8f705e324e137c2933c5a668f62 (diff) | |
| parent | e9eafd22681b8e95d8d642def0512d9290564206 (diff) | |
| download | emacs-46e7613ad3b88807d25cfab3d78bf46c9e2fe13e.tar.gz emacs-46e7613ad3b88807d25cfab3d78bf46c9e2fe13e.tar.bz2 emacs-46e7613ad3b88807d25cfab3d78bf46c9e2fe13e.zip | |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/emacs-lisp/lisp.el')
| -rw-r--r-- | lisp/emacs-lisp/lisp.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el index 043cf01d2e9..8c18557c79a 100644 --- a/lisp/emacs-lisp/lisp.el +++ b/lisp/emacs-lisp/lisp.el @@ -482,7 +482,8 @@ is called as a function to find the defun's end." (if (looking-at "\\s<\\|\n") (forward-line 1)))))) (funcall end-of-defun-function) - (funcall skip) + (when (<= arg 1) + (funcall skip)) (cond ((> arg 0) ;; Moving forward. |