Move org-exp-blocks.el into the core

4 files changed, 14 insertions, 16 deletions

diff --git a/contrib/README b/contrib/README
index a9fca06..98dc4dd 100644
--- a/contrib/README
+++ b/contrib/README
@@ -23,7 +23,6 @@ org-eval.el              --- The <lisp> tag, adapted from Muse
 org-eval-light.el        --- Evaluate in-buffer code on demand
 org-expiry.el 	         --- Expiry mechanism for Org entries
 org-exp-bibtex.el        --- Export citations to LaTeX and HTML
-org-exp-blocks.el        --- Pre-process blocks when exporting org files
 org-indent.el            --- Dynamic outline indentation (does not really work)
 org-interactive-query.el --- Interactive modification of tags query
 org-jira.el              --- Add a jira:ticket protocol to Org
diff --git a/contrib/lisp/org-exp-blocks.el b/lisp/org-exp-blocks.el
index fc3b2c5..3422d09 100644
--- a/contrib/lisp/org-exp-blocks.el
+++ b/lisp/org-exp-blocks.el
@@ -1,25 +1,24 @@
 ;;; org-exp-blocks.el --- pre-process blocks when exporting org files
 
-;; Copyright (C) 2008 Eric Schulte
+;; Copyright (C) 2009
+;;   Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 
-;; This file is not currently 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 the Free Software Foundation; either version 2, or (at
-;; your option) any later version.
+;; This file is 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
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
-;; This program is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;; General Public License for more details.
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program ; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/org-exp.el b/lisp/org-exp.el
index b8fb201..c935a23 100644
--- a/lisp/org-exp.el
+++ b/lisp/org-exp.el
@@ -28,6 +28,7 @@
 
 (require 'org)
 (require 'org-agenda)
+(require 'org-exp-blocks)
 (eval-and-compile
   (require 'cl))
 
diff --git a/lisp/org.el b/lisp/org.el
index 9bf0562..11bf31f 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -192,7 +192,6 @@ to add the symbol `xyz', and the package must have a call to
 	(const :tag "C  eval-light:        Evaluate inbuffer-code on demand" org-eval-light)
 	(const :tag "C  expiry:            Expiry mechanism for Org entries" org-expiry)
 	(const :tag "C  exp-bibtex:        Export citations using BibTeX" org-exp-bibtex)
-	(const :tag "C  exp-blocks:        Pre-process blocks for export" org-exp-blocks)
 	(const :tag "C  interactive-query: Interactive modification of tags query (PARTIALLY OBSOLETE, see secondary filtering)" org-interactive-query)
 	(const :tag "C  jira               Add a jira:ticket protocol to Org" org-jira)
 	(const :tag "C  mairix:            Hook mairix search into Org for different MUAs" org-mairix)