From 75e9c08dd856a3bb4aeabdc7b88c6d1809639315 Mon Sep 17 00:00:00 2001
From: Grant Rettke <gcr@wisdomandwonder.com>
Date: Tue, 8 Aug 2017 19:03:46 -0500
Subject: [PATCH] Add Easy Template for COMMENT (C)

* lisp/org.el: (org-structure-template-alist): Added `COMMENT' block template
  bound to `C'

* doc/org.texi: Add documentation for `COMMENT' Easy Template.

* contrib/orgmanual.org: Add documentation for `COMMENT' Easy
  Template.

* etc/ORG-NEWS: Added note for 9.1 release under Miscellaneous
---
 contrib/orgmanual.org | 1 +
 doc/org.texi          | 1 +
 etc/ORG-NEWS          | 2 ++
 lisp/org.el           | 1 +
 4 files changed, 5 insertions(+)

diff --git a/contrib/orgmanual.org b/contrib/orgmanual.org
index 21011cd96..6cc88a86e 100644
--- a/contrib/orgmanual.org
+++ b/contrib/orgmanual.org
@@ -15922,6 +15922,7 @@ The following template selectors are currently supported:
 | {{{kbd(a)}}} | ~#+BEGIN_ASCII~ ...~ #+END_ASCII~     |
 | {{{kbd(A)}}} | ~#+ASCII:~                            |
 | {{{kbd(c)}}} | ~#+BEGIN_CENTER~ ... ~#+END_CENTER~   |
+| {{{kbd(C)}}} | ~#+BEGIN_COMMENT~ ... ~#+END_COMMENT~ |
 | {{{kbd(e)}}} | ~#+BEGIN_EXAMPLE~ ... ~#+END_EXAMPLE~ |
 | {{{kbd(h)}}} | ~#+BEGIN_HTML~ ... ~#+END_HTML~       |
 | {{{kbd(H)}}} | ~#+HTML:~                             |
diff --git a/doc/org.texi b/doc/org.texi
index 3493ebb59..944c9c56e 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -17347,6 +17347,7 @@ Org comes with these pre-defined easy templates:
 @item @kbd{q} @tab @code{#+BEGIN_QUOTE ... #+END_QUOTE}
 @item @kbd{v} @tab @code{#+BEGIN_VERSE ... #+END_VERSE}
 @item @kbd{c} @tab @code{#+BEGIN_CENTER ... #+END_CENTER}
+@item @kbd{C} @tab @code{#+BEGIN_COMMENT ... #+END_COMMENT}
 @item @kbd{l} @tab @code{#+BEGIN_EXPORT latex ... #+END_EXPORT}
 @item @kbd{L} @tab @code{#+LATEX:}
 @item @kbd{h} @tab @code{#+BEGIN_EXPORT html ... #+END_EXPORT}
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 451c9c603..963141162 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -466,6 +466,8 @@ suitable as a default value.
     URLs like =https://cool-blog.com/2017/05/20/cool-post/= are
     covered by rewrite rules.
 
+*** Add (C) =COMMENT= support to ~org-structure-template-alist~
+
 * Version 9.0
 
 ** Incompatible changes
diff --git a/lisp/org.el b/lisp/org.el
index 2d98ba814..4117ea3c4 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -12186,6 +12186,7 @@ keywords relative to each registered export back-end."
     ("v" "#+BEGIN_VERSE\n?\n#+END_VERSE")
     ("V" "#+BEGIN_VERBATIM\n?\n#+END_VERBATIM")
     ("c" "#+BEGIN_CENTER\n?\n#+END_CENTER")
+    ("C" "#+BEGIN_COMMENT\n?\n#+END_COMMENT")
     ("l" "#+BEGIN_EXPORT latex\n?\n#+END_EXPORT")
     ("L" "#+LaTeX: ")
     ("h" "#+BEGIN_EXPORT html\n?\n#+END_EXPORT")
-- 
2.14.0

