diff options
| -rw-r--r-- | lisp/org/ob-R.el | 3 | ||||
| -rw-r--r-- | lisp/org/ob-clojure.el | 3 | ||||
| -rw-r--r-- | lisp/org/ob-exp.el | 3 | ||||
| -rw-r--r-- | lisp/org/ob-js.el | 20 | ||||
| -rw-r--r-- | lisp/org/ob-lisp.el | 6 | ||||
| -rw-r--r-- | lisp/org/ob-lob.el | 3 | ||||
| -rw-r--r-- | lisp/org/ob-perl.el | 3 | ||||
| -rw-r--r-- | lisp/org/ob-python.el | 3 | ||||
| -rw-r--r-- | lisp/org/ob-ref.el | 3 | ||||
| -rw-r--r-- | lisp/org/ob-scheme.el | 20 | ||||
| -rw-r--r-- | lisp/org/ob.el | 3 | ||||
| -rw-r--r-- | lisp/org/org-freemind.el | 20 |
12 files changed, 38 insertions, 52 deletions
diff --git a/lisp/org/ob-R.el b/lisp/org/ob-R.el index c2896e57cbd..2b0e6d5e16a 100644 --- a/lisp/org/ob-R.el +++ b/lisp/org/ob-R.el | |||
| @@ -2,7 +2,8 @@ | |||
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2009-2011 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2009-2011 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric Schulte, Dan Davison | 5 | ;; Author: Eric Schulte |
| 6 | ;; Dan Davison | ||
| 6 | ;; Keywords: literate programming, reproducible research, R, statistics | 7 | ;; Keywords: literate programming, reproducible research, R, statistics |
| 7 | ;; Homepage: http://orgmode.org | 8 | ;; Homepage: http://orgmode.org |
| 8 | ;; Version: 7.7 | 9 | ;; Version: 7.7 |
diff --git a/lisp/org/ob-clojure.el b/lisp/org/ob-clojure.el index c7bae6c0ef0..090b60662f8 100644 --- a/lisp/org/ob-clojure.el +++ b/lisp/org/ob-clojure.el | |||
| @@ -2,7 +2,8 @@ | |||
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2009-2011 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2009-2011 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Joel Boehland, Eric Schulte | 5 | ;; Author: Joel Boehland |
| 6 | ;; Eric Schulte | ||
| 6 | ;; Keywords: literate programming, reproducible research | 7 | ;; Keywords: literate programming, reproducible research |
| 7 | ;; Homepage: http://orgmode.org | 8 | ;; Homepage: http://orgmode.org |
| 8 | ;; Version: 7.7 | 9 | ;; Version: 7.7 |
diff --git a/lisp/org/ob-exp.el b/lisp/org/ob-exp.el index b3d0e6ed08a..0fceb184c5e 100644 --- a/lisp/org/ob-exp.el +++ b/lisp/org/ob-exp.el | |||
| @@ -2,7 +2,8 @@ | |||
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2009-2011 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2009-2011 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric Schulte, Dan Davison | 5 | ;; Author: Eric Schulte |
| 6 | ;; Dan Davison | ||
| 6 | ;; Keywords: literate programming, reproducible research | 7 | ;; Keywords: literate programming, reproducible research |
| 7 | ;; Homepage: http://orgmode.org | 8 | ;; Homepage: http://orgmode.org |
| 8 | ;; Version: 7.7 | 9 | ;; Version: 7.7 |
diff --git a/lisp/org/ob-js.el b/lisp/org/ob-js.el index 0d6cc739c8f..9e6751c9525 100644 --- a/lisp/org/ob-js.el +++ b/lisp/org/ob-js.el | |||
| @@ -7,22 +7,20 @@ | |||
| 7 | ;; Homepage: http://orgmode.org | 7 | ;; Homepage: http://orgmode.org |
| 8 | ;; Version: 7.7 | 8 | ;; Version: 7.7 |
| 9 | 9 | ||
| 10 | ;;; License: | 10 | ;; This file is part of GNU Emacs. |
| 11 | 11 | ||
| 12 | ;; This program is free software; you can redistribute it and/or modify | 12 | ;; GNU Emacs is free software: you can redistribute it and/or modify |
| 13 | ;; it under the terms of the GNU General Public License as published by | 13 | ;; it under the terms of the GNU General Public License as published by |
| 14 | ;; the Free Software Foundation; either version 3, or (at your option) | 14 | ;; the Free Software Foundation, either version 3 of the License, or |
| 15 | ;; any later version. | 15 | ;; (at your option) any later version. |
| 16 | ;; | 16 | |
| 17 | ;; This program is distributed in the hope that it will be useful, | 17 | ;; GNU Emacs is distributed in the hope that it will be useful, |
| 18 | ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | 18 | ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 19 | ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 19 | ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 20 | ;; GNU General Public License for more details. | 20 | ;; GNU General Public License for more details. |
| 21 | ;; | 21 | |
| 22 | ;; You should have received a copy of the GNU General Public License | 22 | ;; You should have received a copy of the GNU General Public License |
| 23 | ;; along with GNU Emacs; see the file COPYING. If not, write to the | 23 | ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
| 24 | ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | ||
| 25 | ;; Boston, MA 02110-1301, USA. | ||
| 26 | 24 | ||
| 27 | ;;; Commentary: | 25 | ;;; Commentary: |
| 28 | 26 | ||
| @@ -35,7 +33,7 @@ | |||
| 35 | 33 | ||
| 36 | ;; - a non-browser javascript engine such as node.js http://nodejs.org/ | 34 | ;; - a non-browser javascript engine such as node.js http://nodejs.org/ |
| 37 | ;; or mozrepl http://wiki.github.com/bard/mozrepl/ | 35 | ;; or mozrepl http://wiki.github.com/bard/mozrepl/ |
| 38 | ;; | 36 | ;; |
| 39 | ;; - for session based evaluation mozrepl and moz.el are required see | 37 | ;; - for session based evaluation mozrepl and moz.el are required see |
| 40 | ;; http://wiki.github.com/bard/mozrepl/emacs-integration for | 38 | ;; http://wiki.github.com/bard/mozrepl/emacs-integration for |
| 41 | ;; configuration instructions | 39 | ;; configuration instructions |
diff --git a/lisp/org/ob-lisp.el b/lisp/org/ob-lisp.el index 271099e2ee2..4ff9c4076ec 100644 --- a/lisp/org/ob-lisp.el +++ b/lisp/org/ob-lisp.el | |||
| @@ -1,8 +1,10 @@ | |||
| 1 | ;;; ob-lisp.el --- org-babel functions for common lisp evaluation | 1 | ;;; ob-lisp.el --- org-babel functions for common lisp evaluation |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2009-2011 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Joel Boehland, Eric Schulte, David T. O'Toole <dto@gnu.org> | 5 | ;; Author: Joel Boehland |
| 6 | ;; Eric Schulte | ||
| 7 | ;; David T. O'Toole <dto@gnu.org> | ||
| 6 | ;; Keywords: literate programming, reproducible research | 8 | ;; Keywords: literate programming, reproducible research |
| 7 | ;; Homepage: http://orgmode.org | 9 | ;; Homepage: http://orgmode.org |
| 8 | ;; Version: 7.7 | 10 | ;; Version: 7.7 |
diff --git a/lisp/org/ob-lob.el b/lisp/org/ob-lob.el index 51653fc2111..5cb40a057f3 100644 --- a/lisp/org/ob-lob.el +++ b/lisp/org/ob-lob.el | |||
| @@ -2,7 +2,8 @@ | |||
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2009-2011 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2009-2011 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric Schulte, Dan Davison | 5 | ;; Author: Eric Schulte |
| 6 | ;; Dan Davison | ||
| 6 | ;; Keywords: literate programming, reproducible research | 7 | ;; Keywords: literate programming, reproducible research |
| 7 | ;; Homepage: http://orgmode.org | 8 | ;; Homepage: http://orgmode.org |
| 8 | ;; Version: 7.7 | 9 | ;; Version: 7.7 |
diff --git a/lisp/org/ob-perl.el b/lisp/org/ob-perl.el index a4853890b96..13d71413731 100644 --- a/lisp/org/ob-perl.el +++ b/lisp/org/ob-perl.el | |||
| @@ -2,7 +2,8 @@ | |||
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2009-2011 Free Software Foundation | 3 | ;; Copyright (C) 2009-2011 Free Software Foundation |
| 4 | 4 | ||
| 5 | ;; Author: Dan Davison, Eric Schulte | 5 | ;; Author: Dan Davison |
| 6 | ;; Eric Schulte | ||
| 6 | ;; Keywords: literate programming, reproducible research | 7 | ;; Keywords: literate programming, reproducible research |
| 7 | ;; Homepage: http://orgmode.org | 8 | ;; Homepage: http://orgmode.org |
| 8 | ;; Version: 7.7 | 9 | ;; Version: 7.7 |
diff --git a/lisp/org/ob-python.el b/lisp/org/ob-python.el index a871cbe4126..5234d83ecee 100644 --- a/lisp/org/ob-python.el +++ b/lisp/org/ob-python.el | |||
| @@ -2,7 +2,8 @@ | |||
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2009-2011 Free Software Foundation | 3 | ;; Copyright (C) 2009-2011 Free Software Foundation |
| 4 | 4 | ||
| 5 | ;; Author: Eric Schulte, Dan Davison | 5 | ;; Author: Eric Schulte |
| 6 | ;; Dan Davison | ||
| 6 | ;; Keywords: literate programming, reproducible research | 7 | ;; Keywords: literate programming, reproducible research |
| 7 | ;; Homepage: http://orgmode.org | 8 | ;; Homepage: http://orgmode.org |
| 8 | ;; Version: 7.7 | 9 | ;; Version: 7.7 |
diff --git a/lisp/org/ob-ref.el b/lisp/org/ob-ref.el index cde2d3579df..b27bd20db40 100644 --- a/lisp/org/ob-ref.el +++ b/lisp/org/ob-ref.el | |||
| @@ -2,7 +2,8 @@ | |||
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2009-2011 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2009-2011 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric Schulte, Dan Davison | 5 | ;; Author: Eric Schulte |
| 6 | ;; Dan Davison | ||
| 6 | ;; Keywords: literate programming, reproducible research | 7 | ;; Keywords: literate programming, reproducible research |
| 7 | ;; Homepage: http://orgmode.org | 8 | ;; Homepage: http://orgmode.org |
| 8 | ;; Version: 7.7 | 9 | ;; Version: 7.7 |
diff --git a/lisp/org/ob-scheme.el b/lisp/org/ob-scheme.el index 474207b5106..3e93a3a74f7 100644 --- a/lisp/org/ob-scheme.el +++ b/lisp/org/ob-scheme.el | |||
| @@ -7,22 +7,20 @@ | |||
| 7 | ;; Homepage: http://orgmode.org | 7 | ;; Homepage: http://orgmode.org |
| 8 | ;; Version: 7.7 | 8 | ;; Version: 7.7 |
| 9 | 9 | ||
| 10 | ;;; License: | 10 | ;; This file is part of GNU Emacs. |
| 11 | 11 | ||
| 12 | ;; This program is free software; you can redistribute it and/or modify | 12 | ;; GNU Emacs is free software: you can redistribute it and/or modify |
| 13 | ;; it under the terms of the GNU General Public License as published by | 13 | ;; it under the terms of the GNU General Public License as published by |
| 14 | ;; the Free Software Foundation; either version 3, or (at your option) | 14 | ;; the Free Software Foundation, either version 3 of the License, or |
| 15 | ;; any later version. | 15 | ;; (at your option) any later version. |
| 16 | ;; | 16 | |
| 17 | ;; This program is distributed in the hope that it will be useful, | 17 | ;; GNU Emacs is distributed in the hope that it will be useful, |
| 18 | ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | 18 | ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 19 | ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 19 | ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 20 | ;; GNU General Public License for more details. | 20 | ;; GNU General Public License for more details. |
| 21 | ;; | 21 | |
| 22 | ;; You should have received a copy of the GNU General Public License | 22 | ;; You should have received a copy of the GNU General Public License |
| 23 | ;; along with GNU Emacs; see the file COPYING. If not, write to the | 23 | ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
| 24 | ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | ||
| 25 | ;; Boston, MA 02110-1301, USA. | ||
| 26 | 24 | ||
| 27 | ;;; Commentary: | 25 | ;;; Commentary: |
| 28 | 26 | ||
| @@ -35,7 +33,7 @@ | |||
| 35 | 33 | ||
| 36 | ;; - a working scheme implementation | 34 | ;; - a working scheme implementation |
| 37 | ;; (e.g. guile http://www.gnu.org/software/guile/guile.html) | 35 | ;; (e.g. guile http://www.gnu.org/software/guile/guile.html) |
| 38 | ;; | 36 | ;; |
| 39 | ;; - for session based evaluation cmuscheme.el is required which is | 37 | ;; - for session based evaluation cmuscheme.el is required which is |
| 40 | ;; included in Emacs | 38 | ;; included in Emacs |
| 41 | 39 | ||
diff --git a/lisp/org/ob.el b/lisp/org/ob.el index 7a76c4e3784..728c6c5cb5e 100644 --- a/lisp/org/ob.el +++ b/lisp/org/ob.el | |||
| @@ -2,7 +2,8 @@ | |||
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2009-2011 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2009-2011 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric Schulte, Dan Davison | 5 | ;; Author: Eric Schulte |
| 6 | ;; Dan Davison | ||
| 6 | ;; Keywords: literate programming, reproducible research | 7 | ;; Keywords: literate programming, reproducible research |
| 7 | ;; Homepage: http://orgmode.org | 8 | ;; Homepage: http://orgmode.org |
| 8 | ;; Version: 7.7 | 9 | ;; Version: 7.7 |
diff --git a/lisp/org/org-freemind.el b/lisp/org/org-freemind.el index 4f72f7ddeee..91a1e5e59cb 100644 --- a/lisp/org/org-freemind.el +++ b/lisp/org/org-freemind.el | |||
| @@ -57,26 +57,6 @@ | |||
| 57 | ;; Added y/n question before showing in FreeMind. | 57 | ;; Added y/n question before showing in FreeMind. |
| 58 | ;; 2009-11-04: Added support for #+BEGIN_HTML. | 58 | ;; 2009-11-04: Added support for #+BEGIN_HTML. |
| 59 | ;; | 59 | ;; |
| 60 | ;; | ||
| 61 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | ||
| 62 | ;; | ||
| 63 | ;; This program is free software; you can redistribute it and/or | ||
| 64 | ;; modify it under the terms of the GNU General Public License as | ||
| 65 | ;; published by the Free Software Foundation; either version 2, or | ||
| 66 | ;; (at your option) any later version. | ||
| 67 | ;; | ||
| 68 | ;; This program is distributed in the hope that it will be useful, | ||
| 69 | ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 70 | ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| 71 | ;; General Public License for more details. | ||
| 72 | ;; | ||
| 73 | ;; You should have received a copy of the GNU General Public License | ||
| 74 | ;; along with this program; see the file COPYING. If not, write to | ||
| 75 | ;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth | ||
| 76 | ;; Floor, Boston, MA 02110-1301, USA. | ||
| 77 | ;; | ||
| 78 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | ||
| 79 | ;; | ||
| 80 | ;;; Code: | 60 | ;;; Code: |
| 81 | 61 | ||
| 82 | (require 'xml) | 62 | (require 'xml) |