summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2017-12-14 00:18:20 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2017-12-14 00:18:20 +0100
commit5d2517ba5a53c3eb9e9d0f868df007bd84087902 (patch)
treed8dde2b0958fa0741f9cbe5e54bc6fb3453b2dfa
parenta36d18caa47f5cc9c315ad948c8b1b1de2065087 (diff)
parentd9a6408bafb156385c418bdceb3d1117a60dbb8f (diff)
downloadorg-mode-5d2517ba5a53c3eb9e9d0f868df007bd84087902.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-pcomplete.el5
-rw-r--r--lisp/org.el2
-rw-r--r--lisp/ox-publish.el4
3 files changed, 3 insertions, 8 deletions
diff --git a/lisp/org-pcomplete.el b/lisp/org-pcomplete.el
index 7ea166b..575f716 100644
--- a/lisp/org-pcomplete.el
+++ b/lisp/org-pcomplete.el
@@ -40,11 +40,6 @@
;;;; Customization variables
-(defgroup org-complete nil
- "Outline-based notes management and organizer."
- :tag "Org"
- :group 'org)
-
(defvar org-drawer-regexp)
(defvar org-property-re)
(defvar org-current-tag-alist)
diff --git a/lisp/org.el b/lisp/org.el
index 73d9941..0053994 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -11887,7 +11887,7 @@ This is an alist of characters and values. When
read. The key is first looked up in this alist, and the
corresponding structure is inserted, with \"#+BEGIN_\" and
\"#+END_\" added automatically."
- :group 'org-completion
+ :group 'org-edit-structure
:type '(repeat
(cons (character :tag "Key")
(string :tag "Template")))
diff --git a/lisp/ox-publish.el b/lisp/ox-publish.el
index a54b71b..28d8200 100644
--- a/lisp/ox-publish.el
+++ b/lisp/ox-publish.el
@@ -57,10 +57,10 @@ Every function in this hook will be called with two arguments:
the name of the original file and the name of the file
produced.")
-(defgroup org-publish nil
+(defgroup org-export-publish nil
"Options for publishing a set of files."
:tag "Org Publishing"
- :group 'org)
+ :group 'org-export)
(defcustom org-publish-project-alist nil
"Association list to control publishing behavior.