master 5a6e727ddb: ; Fix Wrong type argument: number-or-marker-p, (4) in cycle-spacing

[Tassilo Horn]

branch: master
commit 5a6e727ddb155e6d4210bc7b7a30cf8933d556c8
Author: Tassilo Horn <tsdh@gnu.org>
Commit: Tassilo Horn <tsdh@gnu.org>

    ; Fix Wrong type argument: number-or-marker-p, (4) in cycle-spacing
---
 lisp/simple.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/simple.el b/lisp/simple.el
index ccf696901b..71c99a442d 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1295,8 +1295,8 @@ doing any other command before the next 
\\[cycle-spacing]."
                               ((eq '- arg) '-)
                               (t context-n)))
                    (numeric-n (prefix-numeric-value actual-n))
-                   (include-newlines (and actual-n
-                                          (or (eq actual-n '-)
+                   (include-newlines (or (eq actual-n '-)
+                                         (and (integerp actual-n)
                                               (< actual-n 0)))))
               (cond
                ((eq actual-action 'just-one-space)