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.
This commit is contained in:
Ihor Radchenko 2022-07-28 20:26:14 +08:00
parent 5be0c709b3
commit bc875e5ccf
No known key found for this signature in database
GPG Key ID: 6470762A7DA11D8B
2 changed files with 2 additions and 2 deletions

View File

@ -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

View File

@ -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")