Mercurial > emacs
changeset 94876:ee90761f44b6
* org/org.el (org-modules): Repair problems with loading
org-jsinfo.org.
| author | Carsten Dominik <dominik@science.uva.nl> |
|---|---|
| date | Sun, 11 May 2008 22:54:56 +0000 |
| parents | fbd05404e7f3 |
| children | 0b1b2b6fee44 |
| files | lisp/org/org.el |
| diffstat | 1 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/org/org.el Sun May 11 22:54:08 2008 +0000 +++ b/lisp/org/org.el Sun May 11 22:54:56 2008 +0000 @@ -138,7 +138,11 @@ (when (featurep 'org) (org-load-modules-maybe 'force))) -(defcustom org-modules '(org-bbdb org-bibtex org-gnus org-info org-infojs org-irc org-mew org-mhe org-rmail org-vm org-wl) +(when (org-bound-and-true-p org-modules) + (let ((a (member 'org-infojs org-modules))) + (and a (setcar a 'org-jsinfo)))) + +(defcustom org-modules '(org-bbdb org-bibtex org-gnus org-info org-jsinfo org-irc org-mew org-mhe org-rmail org-vm org-wl) "Modules that should always be loaded together with org.el. If a description starts with <C>, the file is not part of Emacs and loading it will require that you have downloaded and properly installed @@ -158,7 +162,7 @@ (const :tag " bibtex: Links to BibTeX entries" org-bibtex) (const :tag " gnus: Links to GNUS folders/messages" org-gnus) (const :tag " info: Links to Info nodes" org-info) - (const :tag " infojs: Set up Sebastian Rose's JavaScript org-info.js" org-infojs) + (const :tag " jsinfo: Set up Sebastian Rose's JavaScript org-info.js" org-jsinfo) (const :tag " irc: Links to IRC/ERC chat sessions" org-irc) (const :tag " mac-message: Links to messages in Apple Mail" org-mac-message) (const :tag " mew Links to Mew folders/messages" org-mew)