[elpa] externals/org bc875e5ccf 1/2: Fix feature regexp used to detect Org library names

[ELPA Syncer]

branch: externals/org
commit bc875e5ccf033f784cd527f57f8a103d124dc34c
Author: Ihor Radchenko <yantar92@gmail.com>
Commit: Ihor Radchenko <yantar92@gmail.com>

    Fix feature regexp used to detect Org library names
    
    * lisp/org.el (org-reload):
    * mk/org-fixup.el (org-make-org-loaddefs): Distinguish ol-*.el and
    oc-*.el libraries as parts of Org-related libraries.
---
 lisp/org.el     | 2 +-
 mk/org-fixup.el | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/org.el b/lisp/org.el
index ca0b12550c..937892ef35 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -18006,7 +18006,7 @@ With prefix arg UNCOMPILED, load the uncompiled 
versions."
   (require 'loadhist)
   (let* ((org-dir     (org-find-library-dir "org"))
         (contrib-dir (or (org-find-library-dir "org-contribdir") org-dir))
-        (feature-re "^\\(org\\|ob\\|ox\\)\\(-.*\\)?")
+        (feature-re "^\\(org\\|ob\\|ox\\|ol\\|oc\\)\\(-.*\\)?")
         (remove-re (format "\\`%s\\'"
                            (regexp-opt '("org" "org-loaddefs" "org-version"))))
         (feats (delete-dups
diff --git a/mk/org-fixup.el b/mk/org-fixup.el
index 86a48d91e2..5989875a81 100644
--- a/mk/org-fixup.el
+++ b/mk/org-fixup.el
@@ -90,7 +90,7 @@ work correctly if this file is not up-to-date."
     (set-visited-file-name "org-loaddefs.el")
     (insert ";;; org-loaddefs.el --- autogenerated file, do not edit\n;;\n;;; 
Code:\n")
     (let ((files (directory-files default-directory
-                                 nil 
"^\\(org\\|ob\\|ox\\|ol\\)\\(-.*\\)?\\.el$")))
+                                 nil 
"^\\(org\\|ob\\|ox\\|ol\\|oc\\)\\(-.*\\)?\\.el$")))
       (mapc (lambda (f) (generate-file-autoloads f)) files))
     (insert "\f\n(provide 'org-loaddefs)\n")
     (insert "\f\n;; Local Variables:\n;; version-control: never\n")