Skip to content

Commit bc875e5

Browse files
committed
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.
1 parent 5be0c70 commit bc875e5

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

lisp/org.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18006,7 +18006,7 @@ With prefix arg UNCOMPILED, load the uncompiled versions."
1800618006
(require 'loadhist)
1800718007
(let* ((org-dir (org-find-library-dir "org"))
1800818008
(contrib-dir (or (org-find-library-dir "org-contribdir") org-dir))
18009-
(feature-re "^\\(org\\|ob\\|ox\\)\\(-.*\\)?")
18009+
(feature-re "^\\(org\\|ob\\|ox\\|ol\\|oc\\)\\(-.*\\)?")
1801018010
(remove-re (format "\\`%s\\'"
1801118011
(regexp-opt '("org" "org-loaddefs" "org-version"))))
1801218012
(feats (delete-dups

mk/org-fixup.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ work correctly if this file is not up-to-date."
9090
(set-visited-file-name "org-loaddefs.el")
9191
(insert ";;; org-loaddefs.el --- autogenerated file, do not edit\n;;\n;;; Code:\n")
9292
(let ((files (directory-files default-directory
93-
nil "^\\(org\\|ob\\|ox\\|ol\\)\\(-.*\\)?\\.el$")))
93+
nil "^\\(org\\|ob\\|ox\\|ol\\|oc\\)\\(-.*\\)?\\.el$")))
9494
(mapc (lambda (f) (generate-file-autoloads f)) files))
9595
(insert "\f\n(provide 'org-loaddefs)\n")
9696
(insert "\f\n;; Local Variables:\n;; version-control: never\n")

0 commit comments

Comments
 (0)