[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/org c1f576a 1/6: Merge branch 'maint'
From: |
ELPA Syncer |
Subject: |
[elpa] externals/org c1f576a 1/6: Merge branch 'maint' |
Date: |
Sat, 1 May 2021 06:57:15 -0400 (EDT) |
branch: externals/org
commit c1f576a7e506b661aa5a183ab7408d5e734aeee4
Merge: 9aa9f3b 400d2d9
Author: Bastien Guerry <bzg@gnu.org>
Commit: Bastien Guerry <bzg@gnu.org>
Merge branch 'maint'
---
lisp/org-src.el | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/lisp/org-src.el b/lisp/org-src.el
index cabedec..a694e55 100644
--- a/lisp/org-src.el
+++ b/lisp/org-src.el
@@ -327,8 +327,7 @@ a cons cell (LINE . COLUMN) or symbol `end'. See also
(cons (count-lines beg (line-beginning-position))
;; Column is relative to the end of line to avoid problems of
;; comma escaping or colons appended in front of the line.
- (- (current-column)
- (progn (end-of-line) (current-column)))))))
+ (- (point) (min end (line-end-position)))))))
(defun org-src--goto-coordinates (coord beg end)
"Move to coordinates COORD relatively to BEG and END.
@@ -341,9 +340,9 @@ which see. BEG and END are buffer positions."
(org-with-wide-buffer
(goto-char beg)
(forward-line (car coord))
- (end-of-line)
- (org-move-to-column (max (+ (current-column) (cdr coord)) 0))
- (point)))))
+ (max (point)
+ (+ (min end (line-end-position))
+ (cdr coord)))))))
(defun org-src--contents-area (datum)
"Return contents boundaries of DATUM.
- [elpa] externals/org updated (9aa9f3b -> ab01161), ELPA Syncer, 2021/05/01
- [elpa] externals/org eef9027 2/6: org: Add font-lock rule for inline export snippets, ELPA Syncer, 2021/05/01
- [elpa] externals/org c1f576a 1/6: Merge branch 'maint',
ELPA Syncer <=
- [elpa] externals/org 67db2f5 3/6: etc/ORG-NEWS: Announce fontification support of inline export snippets, ELPA Syncer, 2021/05/01
- [elpa] externals/org 4394eaf 4/6: Merge branch 'maint', ELPA Syncer, 2021/05/01
- [elpa] externals/org e080eb7 5/6: lisp/org-agenda.el: Small refactoring and docstring enhancement, ELPA Syncer, 2021/05/01
- [elpa] externals/org ab01161 6/6: Fix 7da20ff21, ELPA Syncer, 2021/05/01