[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/org-present 614eb997c5 33/47: Merge branch 'master' into e
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/org-present 614eb997c5 33/47: Merge branch 'master' into emphasis-markers |
Date: |
Sat, 8 Jan 2022 13:58:31 -0500 (EST) |
branch: elpa/org-present
commit 614eb997c55b4b159316063041b326e7304113b8
Merge: 68aeae2132 00679dc2b0
Author: Keith Pinson <keith.pinson@banno.com>
Commit: Keith Pinson <keith.pinson@banno.com>
Merge branch 'master' into emphasis-markers
---
org-present.el | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/org-present.el b/org-present.el
index 7e9009ddf2..74d12607c4 100644
--- a/org-present.el
+++ b/org-present.el
@@ -180,14 +180,22 @@
(goto-char (point-min))
(while (re-search-forward "^\\(*+\\)" nil t)
(org-present-add-overlay (match-beginning 1) (match-end 1)))
- ;; hide emphasis markers if not already hidden by org
+ ;; hide emphasis/verbatim markers if not already hidden by org
(if org-hide-emphasis-markers nil
;; TODO https://github.com/rlister/org-present/issues/12
;; It would be better to reuse org's own facility for this, if possible.
- (goto-char (point-min))
- (while (re-search-forward org-emph-re nil t)
- (org-present-add-overlay (match-beginning 2) (1+ (match-beginning 2)))
- (org-present-add-overlay (1- (match-end 2)) (match-end 2))))))
+ ;; However it is not obvious how to do this.
+ (progn
+ ;; hide emphasis markers
+ (goto-char (point-min))
+ (while (re-search-forward org-emph-re nil t)
+ (org-present-add-overlay (match-beginning 2) (1+ (match-beginning
2)))
+ (org-present-add-overlay (1- (match-end 2)) (match-end 2)))
+ ;; hide verbatim markers
+ (goto-char (point-min))
+ (while (re-search-forward org-verbatim-re nil t)
+ (org-present-add-overlay (match-beginning 2) (1+ (match-beginning
2)))
+ (org-present-add-overlay (1- (match-end 2)) (match-end 2)))))))
(defun org-present-rm-overlays ()
"Remove overlays for this mode."
- [nongnu] elpa/org-present 9ed67fd539 30/47: while presenting, also hide verbatim markers (i.e. '~' and '=') in addition to emphasis markers, (continued)
- [nongnu] elpa/org-present 9ed67fd539 30/47: while presenting, also hide verbatim markers (i.e. '~' and '=') in addition to emphasis markers, ELPA Syncer, 2022/01/08
- [nongnu] elpa/org-present 5010b90fd0 37/47: Merge pull request #31 from alwyn/inline-images, ELPA Syncer, 2022/01/08
- [nongnu] elpa/org-present 03b23602d3 26/47: document hide/show of cursor, ELPA Syncer, 2022/01/08
- [nongnu] elpa/org-present 14f9288674 23/47: update copyright, ELPA Syncer, 2022/01/08
- [nongnu] elpa/org-present 2cc76b5b2b 25/47: add hide/show for cursor, ELPA Syncer, 2022/01/08
- [nongnu] elpa/org-present d13acd70ef 29/47: Merge pull request #13 from duncan-bayne/add-hooks, ELPA Syncer, 2022/01/08
- [nongnu] elpa/org-present 68aeae2132 31/47: fix: Needless hiding of emphasis markers already hidden by Org, ELPA Syncer, 2022/01/08
- [nongnu] elpa/org-present 9709ca2d04 34/47: Merge pull request #25 from Kazark/emphasis-markers, ELPA Syncer, 2022/01/08
- [nongnu] elpa/org-present b5f5d5f351 04/47: add overlay for author/title pragmas, ELPA Syncer, 2022/01/08
- [nongnu] elpa/org-present 1b519cfd5a 27/47: Merge pull request #5 from fred-o/master, ELPA Syncer, 2022/01/08
- [nongnu] elpa/org-present 614eb997c5 33/47: Merge branch 'master' into emphasis-markers,
ELPA Syncer <=
- [nongnu] elpa/org-present f63302a21a 40/47: Merge pull request #35 from komem3/hide-cursor, ELPA Syncer, 2022/01/08
- [nongnu] elpa/org-present 0ccf354d73 43/47: Add .gitignore, ELPA Syncer, 2022/01/08
- [nongnu] elpa/org-present 804a9abeec 45/47: Merge pull request #39 from skangas/gplv3, ELPA Syncer, 2022/01/08
- [nongnu] elpa/org-present 957c167ca9 46/47: Merge pull request #40 from skangas/byte-compiler-warnings, ELPA Syncer, 2022/01/08
- [nongnu] elpa/org-present a6027fd7ea 08/47: convert readme to markdown, ELPA Syncer, 2022/01/08
- [nongnu] elpa/org-present 64bbf11b76 11/47: Fix file header line for ELPA compatibility, ELPA Syncer, 2022/01/08
- [nongnu] elpa/org-present 5442cda46f 15/47: Kill trailing white space, ELPA Syncer, 2022/01/08
- [nongnu] elpa/org-present 9781d86b7a 14/47: Fix the user set cursor being overridden, ELPA Syncer, 2022/01/08
- [nongnu] elpa/org-present d77bfe0fd4 18/47: fix next page from within subheading, ELPA Syncer, 2022/01/08
- [nongnu] elpa/org-present b5745d2934 24/47: fix markdown bullets, ELPA Syncer, 2022/01/08