[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/doc-show-inline 11a29ebfd7 11/12: Fix use of marker-positi
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/doc-show-inline 11a29ebfd7 11/12: Fix use of marker-position on an integer |
Date: |
Thu, 7 Jul 2022 11:58:57 -0400 (EDT) |
branch: elpa/doc-show-inline
commit 11a29ebfd7939691b34b511082173e4b5d1b9c81
Author: Campbell Barton <ideasman42@gmail.com>
Commit: Campbell Barton <ideasman42@gmail.com>
Fix use of marker-position on an integer
---
changelog.rst | 3 +++
doc-show-inline.el | 9 ++++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/changelog.rst b/changelog.rst
index 7da0963dc1..8f98699421 100644
--- a/changelog.rst
+++ b/changelog.rst
@@ -3,6 +3,9 @@
Change Log
##########
+- 2022-04-19
+ - Fix use of marker-position on an integer.
+
- 2022-03-14
- Add option ``doc-show-inline-exclude-blank-lines`` to exclude doc-strings
with blank lines
between the declarations and the doc-strings.
diff --git a/doc-show-inline.el b/doc-show-inline.el
index 139e2c8187..2f53a85aee 100644
--- a/doc-show-inline.el
+++ b/doc-show-inline.el
@@ -454,7 +454,14 @@ the point should not be moved by this function."
(setq alist (cdr pair)))
((number-or-marker-p (setq mark (cdr pair)))
- (let ((pos (marker-position mark)))
+ (let
+ (
+ (pos
+ (cond
+ ((markerp mark)
+ (marker-position mark))
+ (t ;; Integer.
+ mark))))
(unless (or (and pos-beg (<= pos pos-beg)) (and pos-end (>=
pos pos-end)))
(push pos result))))))
(t
- [nongnu] elpa/doc-show-inline 8b457d565d 06/12: Fix an error with C/C++ raising an error during syntax highlighting, (continued)
- [nongnu] elpa/doc-show-inline 8b457d565d 06/12: Fix an error with C/C++ raising an error during syntax highlighting, ELPA Syncer, 2022/07/07
- [nongnu] elpa/doc-show-inline 5705f8d6f5 09/12: Cleanup: use brief SPDX license, ELPA Syncer, 2022/07/07
- [nongnu] elpa/doc-show-inline 0cceb39df3 12/12: Change URL to codeberg, ELPA Syncer, 2022/07/07
- [nongnu] elpa/doc-show-inline 2757164831 04/12: Fix for displaying indented doc-strings, ELPA Syncer, 2022/07/07
- [nongnu] elpa/doc-show-inline 6bfea44e0b 08/12: Cleanup: minor improvement to error message, ELPA Syncer, 2022/07/07
- [nongnu] elpa/doc-show-inline 11fc50a13c 03/12: Demote errors, ELPA Syncer, 2022/07/07
- [nongnu] elpa/doc-show-inline daa99f0773 07/12: Fix repeat not being set for the initial timer, ELPA Syncer, 2022/07/07
- [nongnu] elpa/doc-show-inline 1c5837d2a6 01/12: Initial working version., ELPA Syncer, 2022/07/07
- [nongnu] elpa/doc-show-inline 3a4eee3ef3 05/12: Add doc-show-inline-exclude-regexp, ELPA Syncer, 2022/07/07
- [nongnu] elpa/doc-show-inline 4295439062 10/12: Add doc-show-inline-exclude-blank-lines option, ELPA Syncer, 2022/07/07
- [nongnu] elpa/doc-show-inline 11a29ebfd7 11/12: Fix use of marker-position on an integer,
ELPA Syncer <=