diff options
author | Philip Kaludercic <philipk@posteo.net> | 2022-10-30 18:45:37 +0100 |
---|---|---|
committer | Philip Kaludercic <philipk@posteo.net> | 2022-10-30 18:45:37 +0100 |
commit | 2a4f37fe520b4f18295cff6671f289a47c1578df (patch) | |
tree | 6061489df433080d5a3da4a8eb33fd269d2bcb95 /lisp/emacs-lisp/backtrace.el | |
parent | d33998ed3b5e05a40b9c4c1799b6e911b582ef01 (diff) | |
parent | 3fa4cca3d244f51e471e7779c934278731fc21e9 (diff) | |
download | emacs-2a4f37fe520b4f18295cff6671f289a47c1578df.tar.gz emacs-2a4f37fe520b4f18295cff6671f289a47c1578df.tar.bz2 emacs-2a4f37fe520b4f18295cff6671f289a47c1578df.zip |
Merge remote-tracking branch 'origin/master' into feature/package+vc
Diffstat (limited to 'lisp/emacs-lisp/backtrace.el')
-rw-r--r-- | lisp/emacs-lisp/backtrace.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/backtrace.el b/lisp/emacs-lisp/backtrace.el index 4ffe6f573c6..d461698c88e 100644 --- a/lisp/emacs-lisp/backtrace.el +++ b/lisp/emacs-lisp/backtrace.el @@ -753,7 +753,7 @@ property for use by navigation." (defun backtrace--line-length-or-nil () "Return `backtrace-line-length' if valid, nil else." - ;; mirror the logic in `cl-print-to-string-with-limits' + ;; mirror the logic in `cl-print-to-string-with-limit' (and (natnump backtrace-line-length) (not (zerop backtrace-line-length)) backtrace-line-length)) |