From 21c0289f3c2a85bd8a860681448f10a60a25d28c Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Mon, 4 Mar 2013 18:28:26 +0100 Subject: [PATCH] Move org-mew.el, org-vm.el, org-w3m.el, org-wl.el to contrib/. * org.el (org-modules): Do not include org-mew.el, org-vm.el, org-w3m.el, org-wl.el as these files are now part of contrib/. * org-w3m.el: * org-vm.el: * org-w3m.el: * org-wl.el: Move to contrib/. The purpose behind this change is to prepare a future split between org-mode.git and org-contrib.git: org-mode.git will contain all files that are directly relevant to GNU Emacs, while org-contrib.git will contain files that are more peripheral and/or from authors who cannot assign their copyright to the FSF. This is *not* a way do downgrade those files, it is a way to prepare org-contrib.org so that it gets more attention and more contributors, thanks to the fact that there is no legal barrier to contribute to it. --- {lisp => contrib/lisp}/org-mew.el | 2 +- {lisp => contrib/lisp}/org-vm.el | 2 +- {lisp => contrib/lisp}/org-w3m.el | 2 +- {lisp => contrib/lisp}/org-wl.el | 2 +- lisp/org.el | 10 +++++----- 5 files changed, 9 insertions(+), 9 deletions(-) rename {lisp => contrib/lisp}/org-mew.el (99%) rename {lisp => contrib/lisp}/org-vm.el (99%) rename {lisp => contrib/lisp}/org-w3m.el (99%) rename {lisp => contrib/lisp}/org-wl.el (99%) diff --git a/lisp/org-mew.el b/contrib/lisp/org-mew.el similarity index 99% rename from lisp/org-mew.el rename to contrib/lisp/org-mew.el index ab1b279d4..b47db0385 100644 --- a/lisp/org-mew.el +++ b/contrib/lisp/org-mew.el @@ -6,7 +6,7 @@ ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; This file is part of GNU Emacs. +;; This file is not part of GNU Emacs. ;; GNU Emacs 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-vm.el b/contrib/lisp/org-vm.el similarity index 99% rename from lisp/org-vm.el rename to contrib/lisp/org-vm.el index fc2a34b8f..c2e8f9622 100644 --- a/lisp/org-vm.el +++ b/contrib/lisp/org-vm.el @@ -10,7 +10,7 @@ ;; by Konrad Hinsen ;; Requires VM 8.2.0a or later. ;; -;; This file is part of GNU Emacs. +;; This file is not part of GNU Emacs. ;; ;; GNU Emacs 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-w3m.el b/contrib/lisp/org-w3m.el similarity index 99% rename from lisp/org-w3m.el rename to contrib/lisp/org-w3m.el index bae27ce3a..ca46a9446 100644 --- a/lisp/org-w3m.el +++ b/contrib/lisp/org-w3m.el @@ -6,7 +6,7 @@ ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org ;; -;; This file is part of GNU Emacs. +;; This file is not part of GNU Emacs. ;; ;; GNU Emacs 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-wl.el b/contrib/lisp/org-wl.el similarity index 99% rename from lisp/org-wl.el rename to contrib/lisp/org-wl.el index b755c023e..1f87d93d6 100644 --- a/lisp/org-wl.el +++ b/contrib/lisp/org-wl.el @@ -7,7 +7,7 @@ ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org ;; -;; This file is part of GNU Emacs. +;; This file is not part of GNU Emacs. ;; ;; GNU Emacs 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 3c87f5e31..639b8c82a 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -330,7 +330,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-mew org-mhe org-rmail org-vm org-w3m org-wl) +(defcustom org-modules '(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 , the file is not part of Emacs @@ -361,15 +361,15 @@ For export specific modules, see also `org-export-backends'." (const :tag " inlinetask: Tasks independent of outline hierarchy" org-inlinetask) (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) (const :tag " mhe: Links to MHE folders/messages" org-mhe) (const :tag " protocol: Intercept calls from emacsclient" org-protocol) (const :tag " rmail: Links to RMAIL folders/messages" org-rmail) - (const :tag " vm: Links to VM folders/messages" org-vm) - (const :tag " wl: Links to Wanderlust folders/messages" org-wl) - (const :tag " w3m: Special cut/paste from w3m to Org-mode." org-w3m) (const :tag " mouse: Additional mouse support" org-mouse) + (const :tag "C vm: Links to VM folders/messages" org-vm) + (const :tag "C wl: Links to Wanderlust folders/messages" org-wl) + (const :tag "C w3m: Special cut/paste from w3m to Org-mode." org-w3m) + (const :tag "C mew: Links to Mew folders/messages" org-mew) (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) (const :tag "C checklist: Extra functions for checklists in repeated tasks" org-checklist)