summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Schulte <eric.schulte@gmx.com>2011-11-29 09:05:31 -0700
committerEric Schulte <eric.schulte@gmx.com>2011-11-29 09:05:31 -0700
commit6cad241b0ee3e4cebc570aa2e60eed7058705474 (patch)
tree27aff9d32a6102a3f5a9123d4f4cf92368256395
parente902a75a2327084ff067f826871e9f8f6e2fdf92 (diff)
downloadorg-mode-6cad241b0ee3e4cebc570aa2e60eed7058705474.tar.gz
moving ob-picolisp into the core
Thanks to Thorsten Jolitz for contributing support for this new language. * Makefile (LISPF): Add ob-picolisp to the Makefile. * contrib/babel/langs/ob-picolisp.el: Remove from contrib. * lisp/ob-picolisp.el: Add to core lisp directory. * lisp/org.el (org-babel-load-languages): Add Pico Lisp to the list of supported code block languages.
-rw-r--r--Makefile3
-rw-r--r--lisp/ob-picolisp.el (renamed from contrib/babel/langs/ob-picolisp.el)38
-rw-r--r--lisp/org.el1
3 files changed, 17 insertions, 25 deletions
diff --git a/Makefile b/Makefile
index c349480..e29ccb8 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,8 @@ LISPF = org.el \
ob-lilypond.el \
ob-java.el \
ob-shen.el \
- ob-fortran.el
+ ob-fortran.el \
+ ob-picolisp.el
LISPFILES0 = $(LISPF:%=lisp/%)
LISPFILES = $(LISPFILES0) lisp/org-install.el
diff --git a/contrib/babel/langs/ob-picolisp.el b/lisp/ob-picolisp.el
index b4d6123..c828f96 100644
--- a/contrib/babel/langs/ob-picolisp.el
+++ b/lisp/ob-picolisp.el
@@ -1,40 +1,27 @@
;;; ob-picolisp.el --- org-babel functions for picolisp evaluation
-;; Copyright (C) 2011 Thorsten Jolitz
+;; Copyright (C) 2010-2011 Free Software Foundation, Inc.
;; Authors: Thorsten Jolitz and Eric Schulte
-;; Keywords: literate programming, reproducible research,
+;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
-;; Version: 1.0
-;;;; Contact:
+;; This file is part of GNU Emacs.
-;; For comments, bug reports, questions, etc, you can contact the
-;; first author via email to
-;; (concat "t" "jolitz") at gmail dot com
-;; or post a question in the org-newsgroup (see homepage) with prefix
-;; [babel] in the header.
-
-;; This file is NOT (yet) part of GNU Emacs
-
-;;; License:
-
-;; This program is free software; you can redistribute it and/or modify
+;; 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, or (at your option)
-;; any later version.
-;;
-;; This program is distributed in the hope that it will be useful,
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; 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 GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
-;;; Commentary:
+;;; Commentary:
;; This library enables the use of PicoLisp in the multi-language
;; programming framework Org-Babel. PicoLisp is a minimal yet
@@ -193,4 +180,7 @@ then create. Return the initialized session."
(current-buffer))))))
(provide 'ob-picolisp)
+
+
+
;;; ob-picolisp.el ends here
diff --git a/lisp/org.el b/lisp/org.el
index 915a8ac..2c7fc06 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -179,6 +179,7 @@ requirements) is loaded."
(const :tag "Octave" octave)
(const :tag "Org" org)
(const :tag "Perl" perl)
+ (const :tag "Pico Lisp" picolisp)
(const :tag "PlantUML" plantuml)
(const :tag "Python" python)
(const :tag "Ruby" ruby)