[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] Re: the comment environment does not work for checkboxes

From: Ihor Radchenko
Subject: [PATCH] Re: the comment environment does not work for checkboxes
Date: Sat, 30 Jul 2022 13:27:47 +0800

Uwe Brauer <oub@mat.ucm.es> writes:

> Thanks, a couple of remarks
>     1. It does not work! I Presume you mean «C-c '» no «C-c C-'»? Well
>        this is bound to  is edit special
> ...
> Comments block are not listed and as I said it seems not to work, if
> what you say is the correct syntax, then there  is a bug, since
>     1. when I mark the region,
>     2. Run org-insert-structure-template,
>     3. Select comment, it should then lead to 

Thanks for the heads-up!
Comment blocks are not supposed to contain Org markup, and thus it indeed
makes sense to support them in org-edit-special and in structure

See the attached patch.


>From 4913df3f84b6d1d0fc5cc0f613dca42abe47821d Mon Sep 17 00:00:00 2001
From: Ihor Radchenko <yantar92@gmail.com>
Date: Sat, 30 Jul 2022 13:24:10 +0800
Subject: [PATCH] Support interactive editing of comment blocks

* lisp/org-src.el (org-edit-comment-block): New command to edit
comment block elements.  The command auto-escapes Org markup inside.
* lisp/org.el (org-insert-structure-template):
(org-edit-special): Support comment blocks.
* etc/ORG-NEWS (Interactive commands now support escaping text inside
comment blocks):
(New command ~org-edit-comment-block~ to edit comment block at point):
Document the new features.

See 87y1wc3ruw.fsf@mat.ucm.es">https://orgmode.org/list/87y1wc3ruw.fsf@mat.ucm.es
 etc/ORG-NEWS    | 19 ++++++++++++++++++-
 lisp/org-src.el | 25 ++++++++++++++++++++++++-
 lisp/org.el     |  5 ++++-
 3 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 478fcf95c..0bc3fa638 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -141,6 +141,14 @@ discouraged when working with Org files.
 ** New features
+*** Interactive commands now support escaping text inside comment blocks
+~org-edit-special~ and ~org-insert-structure-template~ now handle
+comment blocks.
+See [[*New command ~org-edit-comment-block~ to edit comment block at
 *** New customization option =org-property-separators=
 A new alist variable to control how properties are combined.
@@ -253,6 +261,16 @@ instance,
 includes all available items in the printed bibliography.
 ** New functions and changes in function arguments
+*** New command ~org-edit-comment-block~ to edit comment block at point
+As the contents of comments blocks is not parsed as Org markup, the
+headlines and keywords inside should be escaped, similar to src
+blocks, example blocks, and export blocks.  This in inconvenient to do
+manually and ~org-edit-special~ is usually advised to edit text in
+such kind of blocks.
+Now, comment block editing is also supported via this new function.
 *** New function ~org-element-cache-map~ for quick mapping across Org elements
 When element cache is enabled, the new function provides the best
@@ -266,7 +284,6 @@ to ~org-element--cache-map-statistics~ and
 ~org-scan-tags~ and tag views in agenda utilise the new function.
 *** New function ~org-element-at-point-no-context~
 This function is like ~org-element-at-point~, but it does not try to
diff --git a/lisp/org-src.el b/lisp/org-src.el
index b7e0af50e..0249af60b 100644
--- a/lisp/org-src.el
+++ b/lisp/org-src.el
@@ -384,7 +384,7 @@ (defun org-src--contents-area (datum)
        (let ((beg (org-element-property :contents-begin datum))
             (end (org-element-property :contents-end datum)))
         (list beg end (buffer-substring-no-properties beg end))))
-      ((memq type '(example-block export-block src-block))
+      ((memq type '(example-block export-block src-block comment-block))
        (list (progn (goto-char (org-element-property :post-affiliated datum))
                    (line-beginning-position 2))
             (progn (goto-char (org-element-property :end datum))
@@ -1161,6 +1161,29 @@ (defun org-edit-export-block ()
        (lambda () (org-escape-code-in-region (point-min) (point-max)))))
+(defun org-edit-comment-block ()
+  "Edit comment block at point.
+A new buffer is created and the block is copied into it, and the
+buffer is switched into Org mode.
+When done, exit with `\\[org-edit-src-exit]'.  The edited text \
+will then replace the area in the Org mode buffer.
+Throw an error when not at a comment block."
+  (interactive)
+  (let ((element (org-element-at-point)))
+    (unless (and (eq (org-element-type element) 'comment-block)
+                (org-src--on-datum-p element))
+      (user-error "Not in a comment block"))
+    (org-src--edit-element
+     element
+     (org-src--construct-edit-buffer-name (buffer-name) "org")
+     'org-mode
+     (lambda () (org-escape-code-in-region (point-min) (point-max)))
+     (org-unescape-code-in-string (org-element-property :value element)))
+    t))
 (defun org-edit-src-code (&optional code edit-buffer-name)
   "Edit the source or example block at point.
diff --git a/lisp/org.el b/lisp/org.el
index 937892ef3..d75894590 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -8869,7 +8869,8 @@ (defun org-insert-structure-template (type)
         (region-end (and region? (copy-marker (region-end))))
         (extended? (string-match-p "\\`\\(src\\|export\\)\\'" type))
         (verbatim? (string-match-p
-                    (concat "\\`" (regexp-opt '("example" "export" "src")))
+                    (concat "\\`" (regexp-opt '("example" "export"
+                                                "src" "comment")))
          (upcase? (string= (car (split-string type))
                            (upcase (car (split-string type))))))
@@ -16979,6 +16980,7 @@ (defun org-edit-special (&optional arg)
 When in a source code block, call `org-edit-src-code'.
 When in a fixed-width region, call `org-edit-fixed-width-region'.
 When in an export block, call `org-edit-export-block'.
+When in a comment block, call `org-edit-comment-block'.
 When in a LaTeX environment, call `org-edit-latex-environment'.
 When at an INCLUDE, SETUPFILE or BIBLIOGRAPHY keyword, visit the included file.
 When at a footnote reference, call `org-edit-footnote-reference'.
@@ -17025,6 +17027,7 @@ (defun org-edit-special (&optional arg)
       (`table-row (call-interactively 'org-table-edit-formulas))
       (`example-block (org-edit-src-code))
       (`export-block (org-edit-export-block))
+      (`comment-block (org-edit-comment-block))
       (`fixed-width (org-edit-fixed-width-region))
       (`latex-environment (org-edit-latex-environment))

reply via email to

[Prev in Thread] Current Thread [Next in Thread]