Browse Source

Prefix link-related libraries filenames with "ol"

* lisp/org.el (org-modules): Update provided symbols.
Nicolas Goaziou 1 month ago
parent
commit
499c0a50cc

+ 4 - 3
contrib/lisp/org-bookmark.el

@@ -1,4 +1,4 @@
-;;; org-bookmark.el - Support for links to bookmark
+;;; ol-bookmark.el - Links to bookmarks
 ;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
 ;;
 ;; Author: Tokuya Kameshima <kames AT fa2.so-net.ne.jp>
@@ -25,6 +25,7 @@
 
 (require 'org)
 (require 'bookmark)
+(require 'ol)
 
 (defgroup org-bookmark nil
   "Options concerning the bookmark link."
@@ -84,6 +85,6 @@ Otherwise prompt the user for the right bookmark to use."
 	(org-store-link-props :link (concat "bookmark:" bookmark)
 			      :description bookmark))))
 
-(provide 'org-bookmark)
+(provide 'ol-bookmark)
 
-;;; org-bookmark.el ends here
+;;; ol-bookmark.el ends here

+ 4 - 4
contrib/lisp/org-elisp-symbol.el

@@ -1,4 +1,4 @@
-;;; org-elisp-symbol.el --- Org links to emacs-lisp symbols
+;;; ol-elisp-symbol.el --- Links to Emacs-lisp symbols
 ;;
 ;; Copyright 2007-2018 Free Software Foundation, Inc.
 ;;
@@ -74,8 +74,8 @@
 
 ;;; Code:
 
-(provide 'org-elisp-symbol)
-
+(provide 'ol-elisp-symbol)
+(require 'ol)
 (require 'org)
 
 (org-link-set-parameters "elisp-symbol"
@@ -158,4 +158,4 @@
 ;;;;  User Options, Variables
 ;;;;##########################################################################
 
-;;; org-elisp-symbol.el ends here
+;;; ol-elisp-symbol.el ends here

+ 5 - 3
contrib/lisp/org-git-link.el

@@ -1,4 +1,4 @@
-;;; org-git-link.el --- Provide org links to specific file version
+;;; ol-git-link.el --- Links to specific file version
 
 ;; Copyright (C) 2009-2014  Reimar Finken
 
@@ -62,6 +62,8 @@
 ;;; Code:
 
 (require 'org)
+(require 'ol)
+
 (defcustom org-git-program "git"
   "Name of the git executable used to follow git links."
   :type '(string)
@@ -224,6 +226,6 @@ than two double colons, str2 and/or str3 may be set the empty string."
       (if (looking-at "^refs/heads/")   ; 11 characters
           (buffer-substring 12 (1- (point-max))))))) ; to strip off final newline
 
-(provide 'org-git-link)
+(provide 'ol-git-link)
 
-;;; org-git-link.el ends here
+;;; ol-git-link.el ends here

+ 4 - 3
contrib/lisp/org-man.el

@@ -1,4 +1,4 @@
-;;; org-man.el - Support for links to manpages in Org-mode
+;;; ol-man.el - Links to man pages
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -23,6 +23,7 @@
 ;;
 ;;; Commentary:
 
+(require 'ol)
 (require 'org)
 
 (org-link-set-parameters "man"
@@ -70,6 +71,6 @@ PATH should be a topic that can be thrown at the man command."
      ((eq format 'ascii) (format "%s (%s)" desc path))
      (t path))))
 
-(provide 'org-man)
+(provide 'ol-man)
 
-;;; org-man.el ends here
+;;; ol-man.el ends here

+ 4 - 3
contrib/lisp/org-mew.el

@@ -1,4 +1,4 @@
-;;; org-mew.el --- Support for links to Mew messages from within Org-mode
+;;; ol-mew.el --- Links to Mew messages
 
 ;; Copyright (C) 2008-2018 Free Software Foundation, Inc.
 
@@ -55,6 +55,7 @@
 ;;; Code:
 
 (require 'org)
+(require 'ol)
 
 (defgroup org-mew nil
   "Options concerning the Mew link."
@@ -349,6 +350,6 @@ asks you to select the capture template."
 	      (throw 'found (cdr elem))))
 	(setq alist (cdr alist))))))
 
-(provide 'org-mew)
+(provide 'ol-mew)
 
-;;; org-mew.el ends here
+;;; ol-mew.el ends here

+ 4 - 3
contrib/lisp/org-notmuch.el

@@ -1,4 +1,4 @@
-;;; org-notmuch.el --- Support for links to notmuch messages from within Org-mode
+;;; org-notmuch.el --- Links to notmuch messages
 
 ;; Copyright (C) 2010-2014  Matthieu Lemerre
 
@@ -39,6 +39,7 @@
 
 ;;; Code:
 
+(require 'ol)
 (require 'org)
 
 ;; customisable notmuch open functions
@@ -129,6 +130,6 @@ Can link to more than one message, if so all matching messages are shown."
   (require 'notmuch)
   (notmuch-tree search))
 
-(provide 'org-notmuch)
+(provide 'ol-notmuch)
 
-;;; org-notmuch.el ends here
+;;; ol-notmuch.el ends here

+ 4 - 5
contrib/lisp/org-vm.el

@@ -1,4 +1,4 @@
-;;; org-vm.el --- Support for links to VM messages from within Org-mode
+;;; ol-vm.el --- Links to VM messages
 
 ;; Copyright (C) 2004-2018 Free Software Foundation, Inc.
 
@@ -33,6 +33,7 @@
 
 ;;; Code:
 
+(require 'ol)
 (require 'org)
 
 ;; Declare external functions and variables
@@ -161,8 +162,6 @@
     (vm-preview-current-message)
     (vm-summarize)))
 
-(provide 'org-vm)
+(provide 'ol-vm)
 
-
-
-;;; org-vm.el ends here
+;;; ol-vm.el ends here

+ 4 - 3
contrib/lisp/org-wl.el

@@ -1,4 +1,4 @@
-;;; org-wl.el --- Support for links to Wanderlust messages from within Org-mode
+;;; ol-wl.el --- Links to Wanderlust messages
 
 ;; Copyright (C) 2004-2018 Free Software Foundation, Inc.
 
@@ -31,6 +31,7 @@
 
 ;;; Code:
 
+(require 'ol)
 (require 'org)
 
 (defgroup org-wl nil
@@ -297,6 +298,6 @@ for namazu index."
 		(error "No such message: %s" article)))
 	  (wl-summary-redisplay))))))
 
-(provide 'org-wl)
+(provide 'ol-wl)
 
-;;; org-wl.el ends here
+;;; ol-wl.el ends here

+ 14 - 12
lisp/org-bbdb.el

@@ -1,4 +1,4 @@
-;;; org-bbdb.el --- Support for links to BBDB entries -*- lexical-binding: t; -*-
+;;; ol-bbdb.el --- Links to BBDB entries             -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 
@@ -93,23 +93,22 @@
 ;;
 ;;; Code:
 
-(require 'ol)
 (require 'cl-lib)
+(require 'org-compat)
+(require 'org-macs)
+(require 'ol)
 
-;; Declare external functions and variables
+;; Declare functions and variables
 
 (declare-function bbdb "ext:bbdb-com" (string elidep))
 (declare-function bbdb-company "ext:bbdb-com" (string elidep))
-(declare-function bbdb-current-record "ext:bbdb-com"
-		  (&optional planning-on-modifying))
+(declare-function bbdb-current-record "ext:bbdb-com" (&optional planning-on-modifying))
 (declare-function bbdb-name "ext:bbdb-com" (string elidep))
-(declare-function bbdb-completing-read-record "ext:bbdb-com"
-		  (prompt &optional omit-records))
+(declare-function bbdb-completing-read-record "ext:bbdb-com" (prompt &optional omit-records))
 (declare-function bbdb-record-field "ext:bbdb" (record field))
 (declare-function bbdb-record-getprop "ext:bbdb" (record property))
 (declare-function bbdb-record-name "ext:bbdb" (record))
-(declare-function bbdb-records "ext:bbdb"
-		  (&optional dont-check-disk already-in-db-buffer))
+(declare-function bbdb-records "ext:bbdb" (&optional dont-check-disk already-in-db-buffer))
 (declare-function bbdb-split "ext:bbdb" (string separators))
 (declare-function bbdb-string-trim "ext:bbdb" (string))
 (declare-function bbdb-record-get-field "ext:bbdb" (record field))
@@ -121,10 +120,13 @@
 ;; `bbdb-record-xfield' replaces it in recent BBDB v3.x+
 (declare-function bbdb-record-xfield "ext:bbdb" (record label))
 
+(declare-function calendar-absolute-from-gregorian "calendar" (date))
+(declare-function calendar-gregorian-from-absolute "calendar" (date))
 (declare-function calendar-leap-year-p "calendar" (year))
+
 (declare-function diary-ordinal-suffix "diary-lib" (n))
 
-(with-no-warnings (defvar date)) ;; unprefixed, from calendar.el
+(with-no-warnings (defvar date))	;unprefixed, from calendar.el
 
 ;; Customization
 
@@ -532,10 +534,10 @@ END:VEVENT\n"
 		     (concat (capitalize categ) " " (nth 1 rec))
 		     categ)))))
 
-(provide 'org-bbdb)
+(provide 'ol-bbdb)
 
 ;; Local variables:
 ;; generated-autoload-file: "org-loaddefs.el"
 ;; End:
 
-;;; org-bbdb.el ends here
+;;; ol-bbdb.el ends here

+ 20 - 4
lisp/org-bibtex.el

@@ -1,4 +1,4 @@
-;;; org-bibtex.el --- Org links to BibTeX entries    -*- lexical-binding: t; -*-
+;;; ol-bibtex.el --- Links to BibTeX entries        -*- lexical-binding: t; -*-
 ;;
 ;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 ;;
@@ -107,21 +107,37 @@
 
 ;;; Code:
 
-(require 'ol)
 (require 'bibtex)
 (require 'cl-lib)
 (require 'org-compat)
+(require 'org-macs)
+(require 'ol)
 
 (defvar org-agenda-overriding-header)
 (defvar org-agenda-search-view-always-boolean)
 (defvar org-bibtex-description nil) ; dynamically scoped from org.el
 (defvar org-id-locations)
+(defvar org-property-end-re)
+(defvar org-special-properties)
+(defvar org-window-config-before-follow-link)
 
 (declare-function bibtex-beginning-of-entry "bibtex" ())
 (declare-function bibtex-generate-autokey "bibtex" ())
 (declare-function bibtex-parse-entry "bibtex" (&optional content))
 (declare-function bibtex-url "bibtex" (&optional pos no-browse))
 
+(declare-function org-back-to-heading "org" (&optional invisible-ok))
+(declare-function org-entry-get "org" (pom property &optional inherit literal-nil))
+(declare-function org-entry-properties "org" (&optional pom which))
+(declare-function org-get-tags "org" (&optional pos local))
+(declare-function org-heading-components "org" ())
+(declare-function org-insert-heading "org" (&optional arg invisible-ok top))
+(declare-function org-map-entries "org" (func &optional match scope &rest skip))
+(declare-function org-narrow-to-subtree "org" ())
+(declare-function org-open-file "org" (path &optional in-emacs line search))
+(declare-function org-set-property "org" (property value))
+(declare-function org-toggle-tag "org" (tag &optional onoff))
+
 
 ;;; Bibtex data
 (defvar org-bibtex-types
@@ -742,6 +758,6 @@ This function relies `org-search-view' to locate results."
 			     string (or org-bibtex-prefix "")
 			     org-bibtex-type-property-name))))
 
-(provide 'org-bibtex)
+(provide 'ol-bibtex)
 
-;;; org-bibtex.el ends here
+;;; ol-bibtex.el ends here

+ 5 - 4
lisp/org-docview.el

@@ -1,4 +1,4 @@
-;;; org-docview.el --- Support for links to doc-view-mode buffers -*- lexical-binding: t; -*-
+;;; ol-docview.el --- Links to Docview mode buffers  -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
@@ -43,11 +43,12 @@
 ;;; Code:
 
 
-(require 'ol)
 (require 'doc-view)
+(require 'ol)
 
 (declare-function doc-view-goto-page "doc-view" (page))
 (declare-function image-mode-window-get "image-mode" (prop &optional winprops))
+(declare-function org-open-file "org" (path &optional in-emacs line search))
 
 (org-link-set-parameters "docview"
 			 :follow #'org-docview-open
@@ -98,6 +99,6 @@ and append it."
 	  (read-from-minibuffer "Page:" "1")))
 
 
-(provide 'org-docview)
+(provide 'ol-docview)
 
-;;; org-docview.el ends here
+;;; ol-docview.el ends here

+ 3 - 3
lisp/org-eshell.el

@@ -1,4 +1,4 @@
-;;; org-eshell.el - Support for Links to Working Directories in Eshell -*- lexical-binding: t; -*-
+;;; ol-eshell.el - Links to Working Directories in Eshell -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
@@ -61,6 +61,6 @@
        :link (concat "eshell:" link)
        :description command))))
 
-(provide 'org-eshell)
+(provide 'ol-eshell)
 
-;;; org-eshell.el ends here
+;;; ol-eshell.el ends here

+ 5 - 5
lisp/org-eww.el

@@ -1,4 +1,4 @@
-;;; org-eww.el --- Store url and kill from Eww mode for Org  -*- lexical-binding: t -*-
+;;; ol-eww.el --- Store URL and kill from Eww mode    -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2014-2019 Free Software Foundation, Inc.
 
@@ -55,7 +55,7 @@
 (declare-function eww-current-url "eww")
 
 
-;; Store Org-link in eww-mode buffer
+;; Store Org link in Eww mode buffer
 (org-link-set-parameters "eww" :follow #'eww :store #'org-eww-store-link)
 (defun org-eww-store-link ()
   "Store a link to the url of an EWW buffer."
@@ -72,7 +72,7 @@
 			(eww-current-url))))))
 
 
-;; Some auxiliary functions concerning links in eww buffers
+;; Some auxiliary functions concerning links in Eww buffers
 (defun org-eww-goto-next-url-property-change ()
   "Move to the start of next link if exists.
 Otherwise point is not moved.  Return point."
@@ -171,6 +171,6 @@ keep the structure of the Org file."
 (add-hook 'eww-mode-hook #'org-eww-extend-eww-keymap)
 
 
-(provide 'org-eww)
+(provide 'ol-eww)
 
-;;; org-eww.el ends here
+;;; ol-eww.el ends here

+ 3 - 4
lisp/org-gnus.el

@@ -1,4 +1,4 @@
-;;; org-gnus.el --- Support for Links to Gnus Groups and Messages -*- lexical-binding: t; -*-
+;;; ol-gnus.el --- Links to Gnus Groups and Messages -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 
@@ -263,7 +263,6 @@ If `org-store-link' was called with a prefix arg the meaning of
 	(org-gnus-no-server (gnus-no-server))
 	(t (gnus))))
 
-(provide 'org-gnus)
+(provide 'ol-gnus)
 
-
-;;; org-gnus.el ends here
+;;; ol-gnus.el ends here

+ 3 - 3
lisp/org-info.el

@@ -1,4 +1,4 @@
-;;; org-info.el --- Support for Links to Info Nodes -*- lexical-binding: t; -*-
+;;; ol-info.el --- Links to Info Nodes               -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 
@@ -143,6 +143,6 @@ See `org-link-parameters' for details about PATH, DESC and FORMAT."
 	 (format "@ref{%s,%s,,%s,}" node title manual)))
       (_ nil))))
 
-(provide 'org-info)
+(provide 'ol-info)
 
-;;; org-info.el ends here
+;;; ol-info.el ends here

+ 3 - 3
lisp/org-irc.el

@@ -1,4 +1,4 @@
-;;; org-irc.el --- Store Links to IRC Sessions -*- lexical-binding: t; -*-
+;;; ol-irc.el --- Links to IRC Sessions              -*- lexical-binding: t; -*-
 ;;
 ;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 ;;
@@ -260,10 +260,10 @@ FORMAT."
       (`md (format "[%s](irc:%s)" desc link))
       (_ nil))))
 
-(provide 'org-irc)
+(provide 'ol-irc)
 
 ;; Local variables:
 ;; generated-autoload-file: "org-loaddefs.el"
 ;; End:
 
-;;; org-irc.el ends here
+;;; ol-irc.el ends here

+ 3 - 3
lisp/org-mhe.el

@@ -1,4 +1,4 @@
-;;; org-mhe.el --- Support for Links to MH-E Messages -*- lexical-binding: t; -*-
+;;; ol-mhe.el --- Links to MH-E Messages             -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 
@@ -214,6 +214,6 @@ folders."
       (kill-buffer)
       (error "Message not found"))))
 
-(provide 'org-mhe)
+(provide 'ol-mhe)
 
-;;; org-mhe.el ends here
+;;; ol-mhe.el ends here

+ 3 - 3
lisp/org-rmail.el

@@ -1,4 +1,4 @@
-;;; org-rmail.el --- Support for Links to Rmail Messages -*- lexical-binding: t; -*-
+;;; ol-rmail.el --- Links to Rmail Messages          -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2004-2019 Free Software Foundation, Inc.
 
@@ -110,6 +110,6 @@
 	  message-number)
       (error "Message not found"))))
 
-(provide 'org-rmail)
+(provide 'ol-rmail)
 
-;;; org-rmail.el ends here
+;;; ol-rmail.el ends here

+ 3 - 3
lisp/org-w3m.el

@@ -1,4 +1,4 @@
-;;; org-w3m.el --- Support from Copy and Paste From w3m -*- lexical-binding: t; -*-
+;;; ol-w3m.el --- Copy and Paste From W3M            -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
@@ -179,6 +179,6 @@ Return t if there is no previous link; otherwise, return nil."
    (define-key w3m-minor-mode-map "\C-c\C-x\M-w" 'org-w3m-copy-for-org-mode)
    (define-key w3m-minor-mode-map "\C-c\C-x\C-w" 'org-w3m-copy-for-org-mode)))
 
-(provide 'org-w3m)
+(provide 'ol-w3m)
 
-;;; org-w3m.el ends here
+;;; ol-w3m.el ends here

+ 24 - 24
lisp/org.el

@@ -730,7 +730,7 @@ After a match, group 1 contains the repeat expression.")
     (org-load-modules-maybe 'force)
     (org-element-cache-reset 'all)))
 
-(defcustom org-modules '(org-w3m org-bbdb org-bibtex org-docview org-gnus org-info org-irc org-mhe org-rmail org-eww)
+(defcustom org-modules '(ol-w3m ol-bbdb ol-bibtex ol-docview ol-gnus ol-info ol-irc ol-mhe ol-rmail ol-eww)
   "Modules that should always be loaded together with org.el.
 
 If a description starts with <C>, the file is not part of Emacs
@@ -751,60 +751,60 @@ For export specific modules, see also `org-export-backends'."
   :package-version '(Org . "9.2")
   :type
   '(set :greedy t
-	(const :tag "   bbdb:              Links to BBDB entries" org-bbdb)
-	(const :tag "   bibtex:            Links to BibTeX entries" org-bibtex)
+	(const :tag "   bbdb:              Links to BBDB entries" ol-bbdb)
+	(const :tag "   bibtex:            Links to BibTeX entries" ol-bibtex)
 	(const :tag "   crypt:             Encryption of subtrees" org-crypt)
 	(const :tag "   ctags:             Access to Emacs tags with links" org-ctags)
-	(const :tag "   docview:           Links to doc-view buffers" org-docview)
-	(const :tag "   eww:               Store link to url of eww" org-eww)
-	(const :tag "   gnus:              Links to GNUS folders/messages" org-gnus)
+	(const :tag "   docview:           Links to Docview buffers" ol-docview)
+	(const :tag "   eww:               Store link to URL of Eww" ol-eww)
+	(const :tag "   gnus:              Links to GNUS folders/messages" ol-gnus)
 	(const :tag "   habit:             Track your consistency with habits" org-habit)
 	(const :tag "   id:                Global IDs for identifying entries" org-id)
-	(const :tag "   info:              Links to Info nodes" org-info)
+	(const :tag "   info:              Links to Info nodes" ol-info)
 	(const :tag "   inlinetask:        Tasks independent of outline hierarchy" org-inlinetask)
-	(const :tag "   irc:               Links to IRC/ERC chat sessions" org-irc)
-	(const :tag "   mhe:               Links to MHE folders/messages" org-mhe)
+	(const :tag "   irc:               Links to IRC/ERC chat sessions" ol-irc)
+	(const :tag "   mhe:               Links to MHE folders/messages" ol-mhe)
 	(const :tag "   mouse:             Additional mouse support" org-mouse)
 	(const :tag "   protocol:          Intercept calls from emacsclient" org-protocol)
-	(const :tag "   rmail:             Links to RMAIL folders/messages" org-rmail)
+	(const :tag "   rmail:             Links to RMAIL folders/messages" ol-rmail)
 	(const :tag "   tempo:             Fast completion for structures" org-tempo)
-	(const :tag "   w3m:               Special cut/paste from w3m to Org mode." org-w3m)
-	(const :tag "   eshell:            Support for links to working directories in eshell" org-eshell)
+	(const :tag "   w3m:               Special cut/paste from w3m to Org mode." ol-w3m)
+	(const :tag "   eshell:            Links to working directories in Eshell" ol-eshell)
 
-	(const :tag "C  annotate-file:     Annotate a file with org syntax" org-annotate-file)
-	(const :tag "C  bookmark:          Org links to bookmarks" org-bookmark)
+	(const :tag "C  annotate-file:     Annotate a file with Org syntax" org-annotate-file)
+	(const :tag "C  bookmark:          Links to bookmarks" ol-bookmark)
 	(const :tag "C  checklist:         Extra functions for checklists in repeated tasks" org-checklist)
 	(const :tag "C  choose:            Use TODO keywords to mark decisions states" org-choose)
 	(const :tag "C  collector:         Collect properties into tables" org-collector)
 	(const :tag "C  depend:            TODO dependencies for Org mode\n\t\t\t(PARTIALLY OBSOLETE, see built-in dependency support))" org-depend)
 	(const :tag "C  drill:             Flashcards and spaced repetition for Org mode" org-drill)
-	(const :tag "C  elisp-symbol:      Org links to emacs-lisp symbols" org-elisp-symbol)
+	(const :tag "C  elisp-symbol:      Links to emacs-lisp symbols" ol-elisp-symbol)
 	(const :tag "C  eval-light:        Evaluate inbuffer-code on demand" org-eval-light)
 	(const :tag "C  eval:              Include command output as text" org-eval)
 	(const :tag "C  expiry:            Expiry mechanism for Org entries" org-expiry)
-	(const :tag "C  git-link:          Provide org links to specific file version" org-git-link)
+	(const :tag "C  git-link:          Links to specific file version" ol-git-link)
 	(const :tag "C  interactive-query: Interactive modification of tags query\n\t\t\t(PARTIALLY OBSOLETE, see secondary filtering)" org-interactive-query)
         (const :tag "C  invoice:           Help manage client invoices in Org mode" org-invoice)
 	(const :tag "C  learn:             SuperMemo's incremental learning algorithm" org-learn)
 	(const :tag "C  mac-iCal:          Imports events from iCal.app to the Emacs diary" org-mac-iCal)
 	(const :tag "C  mac-link:          Grab links and url from various mac Applications" org-mac-link)
 	(const :tag "C  mairix:            Hook mairix search into Org for different MUAs" org-mairix)
-	(const :tag "C  man:               Support for links to manpages in Org mode" org-man)
-	(const :tag "C  mew:               Links to Mew folders/messages" org-mew)
-	(const :tag "C  notify:            Notifications for Org-mode" org-notify)
-	(const :tag "C  notmuch:           Provide org links to notmuch searches or messages" org-notmuch)
+	(const :tag "C  man:               Links to man pages in Org mode" ol-man)
+	(const :tag "C  mew:               Links to Mew folders/messages" ol-mew)
+	(const :tag "C  notify:            Notifications for Org mode" org-notify)
+	(const :tag "C  notmuch:           Provide Org links to notmuch searches or messages" ol-notmuch)
 	(const :tag "C  panel:             Simple routines for us with bad memory" org-panel)
 	(const :tag "C  registry:          A registry for Org links" org-registry)
-	(const :tag "C  screen:            Visit screen sessions through Org links" org-screen)
-	(const :tag "C  screenshot:        Take and manage screenshots in Org-mode files" org-screenshot)
+	(const :tag "C  screen:            Visit screen sessions through links" org-screen)
+	(const :tag "C  screenshot:        Take and manage screenshots in Org files" org-screenshot)
 	(const :tag "C  secretary:         Team management with Org" org-secretary)
 	(const :tag "C  sqlinsert:         Convert Org tables to SQL insertions" orgtbl-sqlinsert)
 	(const :tag "C  toc:               Table of contents for Org buffer" org-toc)
 	(const :tag "C  track:             Keep up with Org mode development" org-track)
 	(const :tag "C  velocity           Something like Notational Velocity for Org" org-velocity)
-	(const :tag "C  vm:                Links to VM folders/messages" org-vm)
+	(const :tag "C  vm:                Links to VM folders/messages" ol-vm)
 	(const :tag "C  wikinodes:         CamelCase wiki-like links" org-wikinodes)
-	(const :tag "C  wl:                Links to Wanderlust folders/messages" org-wl)
+	(const :tag "C  wl:                Links to Wanderlust folders/messages" ol-wl)
 	(repeat :tag "External packages" :inline t (symbol :tag "Package"))))
 
 (defvar org-export-registered-backends) ; From ox.el.

+ 2 - 2
testing/lisp/test-org-bbdb.el

@@ -24,13 +24,13 @@
 
 ;;; Code:
 
-(require 'org-bbdb)
+(require 'ol-bbdb)
 
 (ert-deftest test-org-bbdb-anniv-extract-date ()
   (should (equal nil (org-bbdb-anniv-extract-date "foo")))
   (should (equal '(9 22 2018) (org-bbdb-anniv-extract-date "2018-09-22")))
   (should (equal '(9 22 nil) (org-bbdb-anniv-extract-date "09-22"))))
 
-(provide 'test-org-bbdb)
+(provide 'test-ol-bbdb)
 
 ;;; test-org-bbdb.el ends here