diff options
| author | Bastien Guerry <bzg@altern.org> | 2013-04-04 12:18:35 +0200 |
|---|---|---|
| committer | Bastien Guerry <bzg@altern.org> | 2013-04-05 08:37:51 +0200 |
| commit | 92af40344e1c5383121b8c465c050a87f6b2df7d (patch) | |
| tree | fe4c713f214f7b89647929f13ce07fa0113603f4 | |
| parent | d5fd2008e320449cc0229b73a09e50b3d5081bd2 (diff) | |
| download | org-mode-92af40344e1c5383121b8c465c050a87f6b2df7d.tar.gz | |
Include org-w3m.el back into core.
w3m is the de facto way of browsing the web in GNU Emacs
so org-w3m.el should be kept in core. The same argument
prevails for org-bbdb.el.
| -rw-r--r-- | lisp/org-w3m.el (renamed from contrib/lisp/org-w3m.el) | 2 | ||||
| -rw-r--r-- | lisp/org.el | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/contrib/lisp/org-w3m.el b/lisp/org-w3m.el index 3127fcd..a2f2916 100644 --- a/contrib/lisp/org-w3m.el +++ b/lisp/org-w3m.el @@ -6,7 +6,7 @@ ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org ;; -;; This file is not part of GNU Emacs. +;; This file is part of GNU Emacs. ;; ;; This program is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by diff --git a/lisp/org.el b/lisp/org.el index cd6a780..72e6a48 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -358,7 +358,7 @@ When MESSAGE is non-nil, display a message with the version." (when (featurep 'org) (org-load-modules-maybe 'force))) -(defcustom org-modules '(org-bbdb org-bibtex org-docview org-gnus org-info org-irc org-mhe org-rmail) +(defcustom org-modules '(org-w3m org-bbdb org-bibtex org-docview org-gnus org-info org-irc org-mhe org-rmail) "Modules that should always be loaded together with org.el. If a description starts with <C>, the file is not part of Emacs @@ -385,15 +385,16 @@ For export specific modules, see also `org-export-backends'." (const :tag " ctags: Access to Emacs tags with links" org-ctags) (const :tag " docview: Links to doc-view buffers" org-docview) (const :tag " gnus: Links to GNUS folders/messages" org-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 " habit: Track your consistency with habits" org-habit) (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 " 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 " mouse: Additional mouse support" org-mouse) + (const :tag " w3m: Special cut/paste from w3m to Org-mode." org-w3m) (const :tag "C annotate-file: Annotate a file with org syntax" org-annotate-file) (const :tag "C bookmark: Org-mode links to bookmarks" org-bookmark) @@ -431,7 +432,6 @@ For export specific modules, see also `org-export-backends'." (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 w3m: Special cut/paste from w3m to Org-mode." org-w3m) (const :tag "C wikinodes: CamelCase wiki-like links" org-wikinodes) (const :tag "C wl: Links to Wanderlust folders/messages" org-wl) (repeat :tag "External packages" :inline t (symbol :tag "Package")))) |