Home Explore Help
Sign In
swflint
/
org-mode-mirror
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Manually revert back to commit e85080.

This fixes a wrong merge that should not have happened:
commit 7e903a merges the master branch into the maint branch,
while we really want to keep the maint branch a bugfix-only
branch.

This commit reverts back the maint branch to its state before
merging the master branch.  From there, we will fix remaining
problems with the maint branch (e.g. copyright issues) then
release this maint branch as Org-mode 7.8.05.
Bastien Guerry 13 years ago
parent
d254b05500
commit
6e534f9c61
100 changed files with 1327 additions and 2057 deletions
Unified View Show Diff Stats
  1. 209 367
      EXPERIMENTAL/org-e-latex.el
  2. 1 3
      Makefile
  3. 1 1
      contrib/babel/langs/ob-fomus.el
  4. 1 1
      contrib/babel/langs/ob-oz.el
  5. 4 4
      contrib/lisp/htmlize.el
  6. 1 1
      contrib/lisp/org-annotate-file.el
  7. 3 3
      contrib/lisp/org-bookmark.el
  8. 4 1
      contrib/lisp/org-checklist.el
  9. 39 39
      contrib/lisp/org-choose.el
  10. 3 3
      contrib/lisp/org-collector.el
  11. 1 1
      contrib/lisp/org-contribdir.el
  12. 1 1
      contrib/lisp/org-depend.el
  13. 1 0
      contrib/lisp/org-drill.el
  14. 264 383
      contrib/lisp/org-element.el
  15. 3 3
      contrib/lisp/org-eval-light.el
  16. 5 4
      contrib/lisp/org-eval.el
  17. 1 1
      contrib/lisp/org-exp-bibtex.el
  18. 13 13
      contrib/lisp/org-expiry.el
  19. 31 31
      contrib/lisp/org-export-generic.el
  20. 332 466
      contrib/lisp/org-export.el
  21. 1 1
      contrib/lisp/org-git-link.el
  22. 4 4
      contrib/lisp/org-interactive-query.el
  23. 10 10
      contrib/lisp/org-invoice.el
  24. 1 1
      contrib/lisp/org-jira.el
  25. 1 1
      contrib/lisp/org-learn.el
  26. 4 4
      contrib/lisp/org-mac-iCal.el
  27. 5 5
      contrib/lisp/org-mac-link-grabber.el
  28. 4 4
      contrib/lisp/org-mairix.el
  29. 2 2
      contrib/lisp/org-mime.el
  30. 2 2
      contrib/lisp/org-mtags.el
  31. 5 5
      contrib/lisp/org-notmuch.el
  32. 2 0
      contrib/lisp/org-panel.el
  33. 4 4
      contrib/lisp/org-registry.el
  34. 4 4
      contrib/lisp/org-screen.el
  35. 6 6
      contrib/lisp/org-static-mathjax.el
  36. 3 4
      contrib/lisp/org-sudoku.el
  37. 4 4
      contrib/lisp/org-toc.el
  38. 1 1
      contrib/lisp/org-track.el
  39. 3 3
      contrib/lisp/org-wikinodes.el
  40. 1 1
      contrib/lisp/org-xhtml.el
  41. 4 4
      contrib/lisp/org2rem.el
  42. 1 1
      contrib/lisp/orgtbl-sqlinsert.el
  43. 1 0
      contrib/lisp/test-org-export-preproc.el
  44. 1 1
      contrib/scripts/StartOzServer.oz
  45. 1 1
      contrib/scripts/org2hpda
  46. 117 176
      doc/org.texi
  47. 1 1
      doc/orgcard.tex
  48. 14 21
      doc/orgguide.texi
  49. 1 1
      doc/pdflayout.sty
  50. 2 2
      doc/texinfo.tex
  51. 1 1
      lisp/ob-R.el
  52. 1 1
      lisp/ob-asymptote.el
  53. 2 2
      lisp/ob-awk.el
  54. 1 1
      lisp/ob-clojure.el
  55. 1 1
      lisp/ob-comint.el
  56. 1 1
      lisp/ob-css.el
  57. 4 17
      lisp/ob-ditaa.el
  58. 1 1
      lisp/ob-dot.el
  59. 1 1
      lisp/ob-eval.el
  60. 40 92
      lisp/ob-exp.el
  61. 1 1
      lisp/ob-fortran.el
  62. 2 2
      lisp/ob-gnuplot.el
  63. 2 2
      lisp/ob-haskell.el
  64. 0 1
      lisp/ob-js.el
  65. 1 1
      lisp/ob-keys.el
  66. 1 1
      lisp/ob-latex.el
  67. 34 62
      lisp/ob-lilypond.el
  68. 1 2
      lisp/ob-lisp.el
  69. 3 4
      lisp/ob-lob.el
  70. 1 1
      lisp/ob-maxima.el
  71. 2 2
      lisp/ob-ocaml.el
  72. 4 5
      lisp/ob-picolisp.el
  73. 0 1
      lisp/ob-plantuml.el
  74. 2 2
      lisp/ob-ref.el
  75. 2 2
      lisp/ob-ruby.el
  76. 1 1
      lisp/ob-sass.el
  77. 0 1
      lisp/ob-scheme.el
  78. 15 33
      lisp/ob-sh.el
  79. 2 6
      lisp/ob-sql.el
  80. 1 1
      lisp/ob-table.el
  81. 7 10
      lisp/ob-tangle.el
  82. 27 85
      lisp/ob.el
  83. 13 38
      lisp/org-agenda.el
  84. 1 3
      lisp/org-archive.el
  85. 2 2
      lisp/org-ascii.el
  86. 1 2
      lisp/org-attach.el
  87. 1 2
      lisp/org-bbdb.el
  88. 1 11
      lisp/org-beamer.el
  89. 1 10
      lisp/org-bibtex.el
  90. 1 13
      lisp/org-capture.el
  91. 6 14
      lisp/org-clock.el
  92. 1 1
      lisp/org-colview-xemacs.el
  93. 1 1
      lisp/org-colview.el
  94. 1 1
      lisp/org-compat.el
  95. 3 4
      lisp/org-crypt.el
  96. 1 4
      lisp/org-ctags.el
  97. 1 1
      lisp/org-datetree.el
  98. 1 3
      lisp/org-docbook.el
  99. 1 1
      lisp/org-docview.el
  100. 0 2
      lisp/org-entities.el

File diff suppressed because it is too large
+ 209 - 367
EXPERIMENTAL/org-e-latex.el


+ 1 - 3
Makefile
View File 

@@ -170,9 +170,7 @@ LISPF      = 	org.el			\
 
 		ob-shen.el		\
 
 		ob-shen.el		\
 
 		ob-fortran.el		\
 
 		ob-fortran.el		\
 
 		ob-picolisp.el		\
 
 		ob-picolisp.el		\
 
-		ob-maxima.el		\
 
-		ob-io.el		\
 
-		ob-scala.el
 
+		ob-maxima.el
 
 
 
 LISPFILES0  = $(LISPF:%=lisp/%)
 
 LISPFILES0  = $(LISPF:%=lisp/%)
 
 LISPFILES   = $(LISPFILES0) lisp/org-install.el
 
 LISPFILES   = $(LISPFILES0) lisp/org-install.el

+ 1 - 1
contrib/babel/langs/ob-fomus.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; ob-fomus.el --- org-babel functions for fomus evaluation
 
 ;;; ob-fomus.el --- org-babel functions for fomus evaluation
 
 
 
-;; Copyright (C) 2011-2012 Torsten Anders
 
+;; Copyright (C) 2011 Torsten Anders
 
 
 
 ;; Author: Torsten Anders
 
 ;; Author: Torsten Anders
 
 ;; Keywords: literate programming, reproducible research
 
 ;; Keywords: literate programming, reproducible research

+ 1 - 1
contrib/babel/langs/ob-oz.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; ob-oz.el --- org-babel functions for Oz evaluation
 
 ;;; ob-oz.el --- org-babel functions for Oz evaluation
 
 
 
-;; Copyright (C) 2009-2012 Torsten Anders and Eric Schulte 
+;; Copyright (C) 2009 Torsten Anders and Eric Schulte 
 
 
 ;; Author: Torsten Anders and Eric Schulte 
 ;; Author: Torsten Anders and Eric Schulte 
 ;; Keywords: literate programming, reproducible research
 
 ;; Keywords: literate programming, reproducible research

+ 4 - 4
contrib/lisp/htmlize.el
View File 

@@ -633,7 +633,7 @@ without modifying their meaning."
 
   (goto-char (point-min))
 
   (goto-char (point-min))
 
   (while (search-forward "Local Variables:" nil t)
 
   (while (search-forward "Local Variables:" nil t)
 
     (replace-match "Local Variables:" nil t)))
 
     (replace-match "Local Variables:" nil t)))
 
-
 
+  
 
 
 ;;; Color handling.
 
 ;;; Color handling.
 
 
 
@@ -796,7 +796,7 @@ If no rgb.txt file is found, return nil."
 
 	  (t
 
 	  (t
 
 	   ;; We're getting the RGB components from Emacs.
 
 	   ;; We're getting the RGB components from Emacs.
 
 	   (let ((rgb
 
 	   (let ((rgb
 
-		  ;; Here I cannot conditionalize on (fboundp ...)
 
+		  ;; Here I cannot conditionalize on (fboundp ...) 
 		  ;; because ps-print under some versions of GNU Emacs
 
 		  ;; because ps-print under some versions of GNU Emacs
 
 		  ;; defines its own dummy version of
 
 		  ;; defines its own dummy version of
 
 		  ;; `color-instance-rgb-components'.
 
 		  ;; `color-instance-rgb-components'.
 
@@ -1211,7 +1211,7 @@ property and by buffer overlays that specify `face'."
 
 ;; used methods are `doctype', `insert-head', `body-tag', and
 
 ;; used methods are `doctype', `insert-head', `body-tag', and
 
 ;; `insert-text'.  Not all output types define all methods.
 
 ;; `insert-text'.  Not all output types define all methods.
 
 ;;
 
 ;;
 
-;; Methods are called either with (htmlize-method METHOD ARGS...)
 
+;; Methods are called either with (htmlize-method METHOD ARGS...) 
 ;; special form, or by accessing the function with
 
 ;; special form, or by accessing the function with
 
 ;; (htmlize-method-function 'METHOD) and calling (funcall FUNCTION).
 
 ;; (htmlize-method-function 'METHOD) and calling (funcall FUNCTION).
 
 ;; The latter form is useful in tight loops because `htmlize-method'
 
 ;; The latter form is useful in tight loops because `htmlize-method'
 
@@ -1389,7 +1389,7 @@ it's called with the same value of KEY.  All other times, the cached
 
     (format "<body text=\"%s\" bgcolor=\"%s\">"
 
     (format "<body text=\"%s\" bgcolor=\"%s\">"
 
 	    (htmlize-fstruct-foreground fstruct)
 
 	    (htmlize-fstruct-foreground fstruct)
 
 	    (htmlize-fstruct-background fstruct))))
 
 	    (htmlize-fstruct-background fstruct))))
 
-
 
+       
 (defun htmlize-font-insert-text (text fstruct-list buffer)
 
 (defun htmlize-font-insert-text (text fstruct-list buffer)
 
   ;; In `font' mode, we use the traditional HTML means of altering
 
   ;; In `font' mode, we use the traditional HTML means of altering
 
   ;; presentation: <font> tag for colors, <b> for bold, <u> for
 
   ;; presentation: <font> tag for colors, <b> for bold, <u> for

+ 1 - 1
contrib/lisp/org-annotate-file.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; org-annotate-file.el --- Annotate a file with org syntax
 
 ;;; org-annotate-file.el --- Annotate a file with org syntax
 
 
 
-;; Copyright (C) 2008-2012 Philip Jackson
 
+;; Copyright (C) 2008-2011 Philip Jackson
 
 
 
 ;; Author: Philip Jackson <phil@shellarchive.co.uk>
 
 ;; Author: Philip Jackson <phil@shellarchive.co.uk>
 
 ;; Version: 0.2
 
 ;; Version: 0.2

+ 3 - 3
contrib/lisp/org-bookmark.el
View File 

@@ -1,5 +1,5 @@
 
 ;;; org-bookmark.el - Support for links to bookmark
 
 ;;; org-bookmark.el - Support for links to bookmark
 
-;; Copyright (C) 2008-2012 Free Software Foundation, Inc.
 
+;; Copyright (C) 2008-2011 Free Software Foundation, Inc.
 
 ;;
 
 ;;
 
 ;; Author: Tokuya Kameshima <kames AT fa2.so-net.ne.jp>
 
 ;; Author: Tokuya Kameshima <kames AT fa2.so-net.ne.jp>
 
 ;; Version: 1.0
 
 ;; Version: 1.0
 
@@ -67,7 +67,7 @@ Otherwise prompt the user for the right bookmark to use."
 
     (if (not file)
 
     (if (not file)
 
 	(when (eq major-mode 'bookmark-bmenu-mode)
 
 	(when (eq major-mode 'bookmark-bmenu-mode)
 
 	  (setq bookmark (bookmark-bmenu-bookmark)))
 
 	  (setq bookmark (bookmark-bmenu-bookmark)))
 
-      (when (and (setq bmks
 
+      (when (and (setq bmks 
 		       (mapcar (lambda (name)
 
 		       (mapcar (lambda (name)
 
 				 (if (equal file
 
 				 (if (equal file
 
 					    (abbreviate-file-name
 
 					    (abbreviate-file-name
 
@@ -75,7 +75,7 @@ Otherwise prompt the user for the right bookmark to use."
 
 				     name))
 
 				     name))
 
 			       (bookmark-all-names)))
 
 			       (bookmark-all-names)))
 
 		 (setq bmks (delete nil bmks)))
 
 		 (setq bmks (delete nil bmks)))
 
-	(setq bookmark
 
+	(setq bookmark 
 	      (if (or (eq 1 (length bmks)) org-bookmark-use-first-bookmark)
 
 	      (if (or (eq 1 (length bmks)) org-bookmark-use-first-bookmark)
 
 		  (car bmks)
 
 		  (car bmks)
 
 		(completing-read "Bookmark: " bmks nil t nil nil (car bmks))))))
 
 		(completing-read "Bookmark: " bmks nil t nil nil (car bmks))))))

+ 4 - 1
contrib/lisp/org-checklist.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; org-checklist.el --- org functions for checklist handling
 
 ;;; org-checklist.el --- org functions for checklist handling
 
 
 
-;; Copyright (C) 2008-2012 James TD Smith
 
+;; Copyright (C) 2008-2011 James TD Smith
 
 
 
 ;; Author: James TD Smith (@ ahktenzero (. mohorovi cc))
 
 ;; Author: James TD Smith (@ ahktenzero (. mohorovi cc))
 
 ;; Version: 1.0
 
 ;; Version: 1.0
 
@@ -138,3 +138,6 @@ of checkbox items"
 
 (provide 'org-checklist)
 
 (provide 'org-checklist)
 
 
 
 ;;; org-checklist.el ends here
 
 ;;; org-checklist.el ends here
 
+
 
+
 
+

+ 39 - 39
contrib/lisp/org-choose.el
View File 

@@ -2,7 +2,7 @@
 
 
 
 ;;;_. Headers
 
 ;;;_. Headers
 
 ;;;_ , License
 
 ;;;_ , License
 
-;; Copyright (C) 2009-2012 Tom Breton (Tehom)
 
+;; Copyright (C) 2009-2011 Tom Breton (Tehom)
 
 
 
 ;; This file is not part of GNU Emacs.
 
 ;; This file is not part of GNU Emacs.
 
 
 
@@ -46,13 +46,13 @@
 
 ;;     * Use C-S-right to change the keyword set.  Use this to change to
 
 ;;     * Use C-S-right to change the keyword set.  Use this to change to
 
 ;;       the "choose" keyword set that you just defined.
 
 ;;       the "choose" keyword set that you just defined.
 
 
 
-;;     * Use S-right to advance the TODO mark to the next setting.
 
+;;     * Use S-right to advance the TODO mark to the next setting.  
 
 
 ;;       For "choose", that means you like this alternative more than
 
 ;;       For "choose", that means you like this alternative more than
 
 ;;       before.  Other alternatives will be automatically demoted to
 
 ;;       before.  Other alternatives will be automatically demoted to
 
 ;;       keep your settings consistent.
 
 ;;       keep your settings consistent.
 
 
 
-;;     * Use S-left to demote TODO to the previous setting.
 
+;;     * Use S-left to demote TODO to the previous setting.  
 
 
 ;;       For "choose", that means you don't like this alternative as much
 
 ;;       For "choose", that means you don't like this alternative as much
 
 ;;       as before.  Other alternatives will be automatically promoted,
 
 ;;       as before.  Other alternatives will be automatically promoted,
 
@@ -83,7 +83,7 @@ Indexes are 0-based or `nil'.
 
    static-default
 
    static-default
 
    all-keywords)
 
    all-keywords)
 
 
 
-(defvar org-choose-mark-data
 
+(defvar org-choose-mark-data 
    ()
 
    ()
 
    "Alist of information for choose marks.
 
    "Alist of information for choose marks.
 
 
 
@@ -101,7 +101,7 @@ Each entry is an `org-choose-mark-data.'" )
 
       (not
 
       (not
 
 	 (string-match "(.*)" i))
 
 	 (string-match "(.*)" i))
 
       (list i i)
 
       (list i i)
 
-      (let*
 
+      (let* 
 	 (
 
 	 (
 
 	    (end-text (match-beginning 0))
 
 	    (end-text (match-beginning 0))
 
 	    (vanilla-text (substring i 0 end-text))
 
 	    (vanilla-text (substring i 0 end-text))
 
@@ -116,7 +116,7 @@ Each entry is an `org-choose-mark-data.'" )
 
 		  ;;When string starts with "," `split-string' doesn't
 
 		  ;;When string starts with "," `split-string' doesn't
 
 		  ;;make a first arg, so in that case make one
 
 		  ;;make a first arg, so in that case make one
 
 		  ;;manually.
 
 		  ;;manually.
 
-		  (if
 
+		  (if 
 		     (string-match "^," args)
 
 		     (string-match "^," args)
 
 		     (cons nil arglist-x)
 
 		     (cons nil arglist-x)
 
 		     arglist-x)))
 
 		     arglist-x)))
 
@@ -157,11 +157,11 @@ Each entry is an `org-choose-mark-data.'" )
 
 			;;item.
 
 			;;item.
 
 			(top-upper-range
 
 			(top-upper-range
 
 			   (or top-upper-range (1- num-items)))
 
 			   (or top-upper-range (1- num-items)))
 
-			(lower-range-length
 
+			(lower-range-length 
 			   (1+ (- static-default bot-lower-range)))
 
 			   (1+ (- static-default bot-lower-range)))
 
-			(upper-range-length
 
+			(upper-range-length 
 			   (- top-upper-range static-default))
 
 			   (- top-upper-range static-default))
 
-			(range-length
 
+			(range-length 
 			   (min upper-range-length lower-range-length)))
 
 			   (min upper-range-length lower-range-length)))
 
 
 
 
 
@@ -194,7 +194,7 @@ Each entry is an `org-choose-mark-data.'" )
 
 ;;;_  . org-choose-filter-tail
 
 ;;;_  . org-choose-filter-tail
 
 (defun org-choose-filter-tail (raw)
 
 (defun org-choose-filter-tail (raw)
 
    "Return a translation of RAW to vanilla and set appropriate
 
    "Return a translation of RAW to vanilla and set appropriate
 
-buffer-local variables.
 
+buffer-local variables. 
 
 
 RAW is a list of strings representing the input text of a choose
 
 RAW is a list of strings representing the input text of a choose
 
 interpretation."
 
 interpretation."
 
@@ -219,7 +219,7 @@ interpretation."
 
 	    (push vanilla-mark vanilla-list)))
 
 	    (push vanilla-mark vanilla-list)))
 
 
 
       (org-choose-setup-vars bot-lower-range top-upper-range
 
       (org-choose-setup-vars bot-lower-range top-upper-range
 
-	 static-default index (reverse all-mark-texts))
 
+	 static-default index (reverse all-mark-texts)) 
       (nreverse vanilla-list)))
 
       (nreverse vanilla-list)))
 
 
 
 ;;;_  . org-choose-setup-filter
 
 ;;;_  . org-choose-setup-filter
 
@@ -234,35 +234,35 @@ interpretation."
 
 ;;;_  . org-choose-conform-after-promotion
 
 ;;;_  . org-choose-conform-after-promotion
 
 (defun org-choose-conform-after-promotion (entry-pos keywords highest-ok-ix)
 
 (defun org-choose-conform-after-promotion (entry-pos keywords highest-ok-ix)
 
   "Conform the current item after another item was promoted"
 
   "Conform the current item after another item was promoted"
 
-
 
+   
    (unless
 
    (unless
 
       ;;Skip the entry that triggered this by skipping any entry with
 
       ;;Skip the entry that triggered this by skipping any entry with
 
       ;;the same starting position.  plist uses the start of the
 
       ;;the same starting position.  plist uses the start of the
 
       ;;header line as the position, but map no longer does, so we
 
       ;;header line as the position, but map no longer does, so we
 
       ;;have to go back to the heading.
 
       ;;have to go back to the heading.
 
-      (=
 
+      (= 
 	 (save-excursion
 
 	 (save-excursion
 
 	    (org-back-to-heading)
 
 	    (org-back-to-heading)
 
-	    (point))
 
+	    (point)) 
 	 entry-pos)
 
 	 entry-pos)
 
       (let
 
       (let
 
 	 ((ix
 
 	 ((ix
 
 	     (org-choose-get-entry-index keywords)))
 
 	     (org-choose-get-entry-index keywords)))
 
 	 ;;If the index of the entry exceeds the highest allowable
 
 	 ;;If the index of the entry exceeds the highest allowable
 
 	 ;;index, change it to that.
 
 	 ;;index, change it to that.
 
-	 (when (and ix
 
+	 (when (and ix 
 		  (> ix highest-ok-ix))
 
 		  (> ix highest-ok-ix))
 
-	    (org-todo
 
+	    (org-todo 
 	       (nth highest-ok-ix keywords))))))
 
 	       (nth highest-ok-ix keywords))))))
 
 ;;;_  . org-choose-conform-after-demotion
 
 ;;;_  . org-choose-conform-after-demotion
 
 (defun org-choose-conform-after-demotion (entry-pos keywords
 
 (defun org-choose-conform-after-demotion (entry-pos keywords
 
 					       raise-to-ix
 
 					       raise-to-ix
 
-					       old-highest-ok-ix)
 
+					       old-highest-ok-ix) 
   "Conform the current item after another item was demoted."
 
   "Conform the current item after another item was demoted."
 
 
 
    (unless
 
    (unless
 
       ;;Skip the entry that triggered this.
 
       ;;Skip the entry that triggered this.
 
-      (=
 
+      (= 
 	 (save-excursion
 
 	 (save-excursion
 
 	    (org-back-to-heading)
 
 	    (org-back-to-heading)
 
 	    (point))
 
 	    (point))
 
@@ -273,11 +273,11 @@ interpretation."
 
 	 ;;If the index of the entry was at or above the old allowable
 
 	 ;;If the index of the entry was at or above the old allowable
 
 	 ;;position, change it to the new mirror position if there is
 
 	 ;;position, change it to the new mirror position if there is
 
 	 ;;one.
 
 	 ;;one.
 
-	 (when (and
 
-		  ix
 
+	 (when (and 
+		  ix 
 		  raise-to-ix
 
 		  raise-to-ix
 
 		  (>= ix old-highest-ok-ix))
 
 		  (>= ix old-highest-ok-ix))
 
-	    (org-todo
 
+	    (org-todo 
 	       (nth raise-to-ix keywords))))))
 
 	       (nth raise-to-ix keywords))))))
 
 
 
 ;;;_ , org-choose-keep-sensible (the org-trigger-hook function)
 
 ;;;_ , org-choose-keep-sensible (the org-trigger-hook function)
 
@@ -287,7 +287,7 @@ setting was changed."
 
    (let*
 
    (let*
 
       (  (from (plist-get change-plist :from))
 
       (  (from (plist-get change-plist :from))
 
 	 (to (plist-get change-plist :to))
 
 	 (to (plist-get change-plist :to))
 
-	 (entry-pos
 
+	 (entry-pos 
 	    (set-marker
 
 	    (set-marker
 
 	       (make-marker)
 
 	       (make-marker)
 
 	       (plist-get change-plist :position)))
 
 	       (plist-get change-plist :position)))
 
@@ -303,11 +303,11 @@ setting was changed."
 
 		  (org-choose-mark-data.-all-keywords data))
 
 		  (org-choose-mark-data.-all-keywords data))
 
 	       (old-index
 
 	       (old-index
 
 		  (org-choose-get-index-in-keywords
 
 		  (org-choose-get-index-in-keywords
 
-		     from
 
+		     from 
 		     keywords))
 
 		     keywords))
 
 	       (new-index
 
 	       (new-index
 
 		  (org-choose-get-index-in-keywords
 
 		  (org-choose-get-index-in-keywords
 
-		     to
 
+		     to 
 		     keywords))
 
 		     keywords))
 
 	       (highest-ok-ix
 
 	       (highest-ok-ix
 
 		  (org-choose-highest-other-ok
 
 		  (org-choose-highest-other-ok
 
@@ -324,7 +324,7 @@ setting was changed."
 
 			 (> new-index old-index))
 
 			 (> new-index old-index))
 
 			(list
 
 			(list
 
 			   #'org-choose-conform-after-promotion
 
 			   #'org-choose-conform-after-promotion
 
-			   entry-pos keywords
 
+			   entry-pos keywords 
 			   highest-ok-ix))
 
 			   highest-ok-ix))
 
 		     (t	;;Otherwise the entry was demoted.
 
 		     (t	;;Otherwise the entry was demoted.
 
 			(let
 
 			(let
 
@@ -338,14 +338,14 @@ setting was changed."
 
 				 (org-choose-highest-other-ok
 
 				 (org-choose-highest-other-ok
 
 				    old-index
 
 				    old-index
 
 				    data)))
 
 				    data)))
 
-
 
+			   
 			   (list
 
 			   (list
 
-			      #'org-choose-conform-after-demotion
 
-			      entry-pos
 
+			      #'org-choose-conform-after-demotion 
+			      entry-pos 
 			      keywords
 
 			      keywords
 
 			      raise-to-ix
 
 			      raise-to-ix
 
 			      old-highest-ok-ix))))))
 
 			      old-highest-ok-ix))))))
 
-
 
+	    
 	    (if funcdata
 
 	    (if funcdata
 
 	       ;;The funny-looking names are to make variable capture
 
 	       ;;The funny-looking names are to make variable capture
 
 	       ;;unlikely.  (Poor-man's lexical bindings).
 
 	       ;;unlikely.  (Poor-man's lexical bindings).
 
@@ -356,8 +356,8 @@ setting was changed."
 
 			;;We may call `org-todo', so let various hooks
 
 			;;We may call `org-todo', so let various hooks
 
 			;;`nil' so we don't cause loops.
 
 			;;`nil' so we don't cause loops.
 
 			org-after-todo-state-change-hook
 
 			org-after-todo-state-change-hook
 
-			org-trigger-hook
 
-			org-blocker-hook
 
+			org-trigger-hook 
+			org-blocker-hook 
 			org-todo-get-default-hook
 
 			org-todo-get-default-hook
 
 			;;Also let this alist `nil' so we don't log
 
 			;;Also let this alist `nil' so we don't log
 
 			;;secondary transitions.
 
 			;;secondary transitions.
 
@@ -366,7 +366,7 @@ setting was changed."
 
 		     (funcall map-over-entries
 
 		     (funcall map-over-entries
 
 			#'(lambda ()
 
 			#'(lambda ()
 
 			     (apply func-d473 args-46k))))))))
 
 			     (apply func-d473 args-46k))))))))
 
-
 
+      
       ;;Remove the marker
 
       ;;Remove the marker
 
       (set-marker entry-pos nil)))
 
       (set-marker entry-pos nil)))
 
 
 
@@ -393,7 +393,7 @@ setting was changed."
 
 
 
 (defun org-choose-get-fn-map-group ()
 
 (defun org-choose-get-fn-map-group ()
 
    "Return a function to map over the group"
 
    "Return a function to map over the group"
 
-
 
+   
    #'(lambda (fn)
 
    #'(lambda (fn)
 
        (require 'org-agenda) ;; `org-map-entries' seems to need it.
 
        (require 'org-agenda) ;; `org-map-entries' seems to need it.
 
 	(save-excursion
 
 	(save-excursion
 
@@ -402,7 +402,7 @@ setting was changed."
 
 	  (let
 
 	  (let
 
  	      ((level (org-reduced-level (org-outline-level))))
 
  	      ((level (org-reduced-level (org-outline-level))))
 
 	    (save-restriction
 
 	    (save-restriction
 
-	      (org-map-entries
 
+	      (org-map-entries 
 	       fn
 
 	       fn
 
 	       (format "LEVEL=%d" level)
 
 	       (format "LEVEL=%d" level)
 
 	       'tree))))))
 
 	       'tree))))))
 
@@ -418,10 +418,10 @@ If there is none, return 0"
 
 	 ;;Func maps over applicable entries.
 
 	 ;;Func maps over applicable entries.
 
 	 (map-over-entries
 
 	 (map-over-entries
 
 	    (org-choose-get-fn-map-group))
 
 	    (org-choose-get-fn-map-group))
 
-
 
+	 
 	 (indexes-list
 
 	 (indexes-list
 
 	    (remove nil
 
 	    (remove nil
 
-	       (funcall map-over-entries
 
+	       (funcall map-over-entries 
 		  #'(lambda ()
 
 		  #'(lambda ()
 
 		       (org-choose-get-entry-index keywords))))))
 
 		       (org-choose-get-entry-index keywords))))))
 
       (if
 
       (if
 
@@ -438,7 +438,7 @@ given that another mark has index IX.
 
 DATA must be a `org-choose-mark-data.'."
 
 DATA must be a `org-choose-mark-data.'."
 
 
 
    (let
 
    (let
 
-      (
 
+      (		
 	 (bot-lower-range
 
 	 (bot-lower-range
 
 	    (org-choose-mark-data.-bot-lower-range data))
 
 	    (org-choose-mark-data.-bot-lower-range data))
 
 	 (top-upper-range
 
 	 (top-upper-range
 
@@ -455,7 +455,7 @@ DATA must be a `org-choose-mark-data.'."
 
 
 
 ;;;_  . org-choose-get-default-mark-index
 
 ;;;_  . org-choose-get-default-mark-index
 
 
 
-(defun org-choose-get-default-mark-index (data)
 
+(defun org-choose-get-default-mark-index (data) 
   "Return the index of the default mark in a choose interpretation.
 
   "Return the index of the default mark in a choose interpretation.
 
 
 
 DATA must be a `org-choose-mark-data.'."
 
 DATA must be a `org-choose-mark-data.'."
 
@@ -475,7 +475,7 @@ DATA must be a `org-choose-mark-data.'."
 
 ;;;_  . org-choose-get-mark-N
 
 ;;;_  . org-choose-get-mark-N
 
 (defun org-choose-get-mark-N (n data)
 
 (defun org-choose-get-mark-N (n data)
 
    "Get the text of the nth mark in a choose interpretation."
 
    "Get the text of the nth mark in a choose interpretation."
 
-
 
+   
    (let*
 
    (let*
 
       ((l (org-choose-mark-data.-all-keywords data)))
 
       ((l (org-choose-mark-data.-all-keywords data)))
 
       (nth n l)))
 
       (nth n l)))

+ 3 - 3
contrib/lisp/org-collector.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; org-collector --- collect properties into tables
 
 ;;; org-collector --- collect properties into tables
 
 
 
-;; Copyright (C) 2008-2012 Free Software Foundation, Inc.
 
+;; Copyright (C) 2008-2011 Free Software Foundation, Inc.
 
 
 
 ;; Author: Eric Schulte <schulte dot eric at gmail dot com>
 
 ;; Author: Eric Schulte <schulte dot eric at gmail dot com>
 
 ;; Keywords: outlines, hypermedia, calendar, wp, experimentation,
 
 ;; Keywords: outlines, hypermedia, calendar, wp, experimentation,
 
@@ -87,7 +87,7 @@
 
 ;; | run (50)  |                          0.116446 |
 
 ;; | run (50)  |                          0.116446 |
 
 ;; | run (100) |                          0.118863 |
 
 ;; | run (100) |                          0.118863 |
 
 ;; #+END:
 
 ;; #+END:
 
-;;
 
+;; 
 
 
 ;;; Code:
 
 ;;; Code:
 
 (require 'org)
 
 (require 'org)
 
@@ -134,7 +134,7 @@ preceeding the dblock, then update the contents of the dblock."
 
 	  (org-narrow-to-subtree)
 
 	  (org-narrow-to-subtree)
 
 	  (setq stringformat (if noquote "%s" "%S"))
 
 	  (setq stringformat (if noquote "%s" "%S"))
 
 	  (setq table (org-propview-to-table
 
 	  (setq table (org-propview-to-table
 
-		       (org-propview-collect cols stringformat conds match scope inherit
 
+		       (org-propview-collect cols stringformat conds match scope inherit 
 					     (if colnames colnames cols)) stringformat))
 
 					     (if colnames colnames cols)) stringformat))
 
 	  (widen))
 
 	  (widen))
 
 	(setq pos (point))
 
 	(setq pos (point))

+ 1 - 1
contrib/lisp/org-contribdir.el
View File 

@@ -1,5 +1,5 @@
 
 ;;; org-contribdir.el --- Mark the location of the contrib directory
 
 ;;; org-contribdir.el --- Mark the location of the contrib directory
 
-;; Copyright (C) 2009-2012 Free Software Foundation, Inc.
 
+;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
 
 ;;
 
 ;;
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 
 ;; Keywords: outlines, hypermedia, calendar, wp
 
 ;; Keywords: outlines, hypermedia, calendar, wp

+ 1 - 1
contrib/lisp/org-depend.el
View File 

@@ -1,5 +1,5 @@
 
 ;;; org-depend.el --- TODO dependencies for Org-mode
 
 ;;; org-depend.el --- TODO dependencies for Org-mode
 
-;; Copyright (C) 2008-2012 Free Software Foundation, Inc.
 
+;; Copyright (C) 2008-2011 Free Software Foundation, Inc.
 
 ;;
 
 ;;
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 
 ;; Keywords: outlines, hypermedia, calendar, wp
 
 ;; Keywords: outlines, hypermedia, calendar, wp

+ 1 - 0
contrib/lisp/org-drill.el
View File 

@@ -2915,3 +2915,4 @@ returns its return value."
 
 
 
 
 
 (provide 'org-drill)
 
 (provide 'org-drill)
 
+

File diff suppressed because it is too large
+ 264 - 383
contrib/lisp/org-element.el


+ 3 - 3
contrib/lisp/org-eval-light.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; org-eval-light.el --- Display result of evaluating code in various languages (light)
 
 ;;; org-eval-light.el --- Display result of evaluating code in various languages (light)
 
 
 
-;; Copyright (C) 2008-2012 Free Software Foundation, Inc.
 
+;; Copyright (C) 2008-2011 Free Software Foundation, Inc.
 
 
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>,
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>,
 
 ;;         Eric Schulte <schulte dot eric at gmail dot com>
 
 ;;         Eric Schulte <schulte dot eric at gmail dot com>
 
@@ -67,7 +67,7 @@ large example block")
 
 (defcustom org-eval-light-interpreters '("lisp" "emacs-lisp" "ruby" "shell")
 
 (defcustom org-eval-light-interpreters '("lisp" "emacs-lisp" "ruby" "shell")
 
   "Interpreters allows for evaluation tags.
 
   "Interpreters allows for evaluation tags.
 
 This is a list of program names (as strings) that can evaluate code and
 
 This is a list of program names (as strings) that can evaluate code and
 
-insert the output into an Org-mode buffer.  Valid choices are
 
+insert the output into an Org-mode buffer.  Valid choices are 
 
 
 lisp    Interpret Emacs Lisp code and display the result
 
 lisp    Interpret Emacs Lisp code and display the result
 
 shell   Pass command to the shell and display the result
 
 shell   Pass command to the shell and display the result
 
@@ -189,7 +189,7 @@ commented by `org-eval-light-make-region-example'."
 
   (with-temp-buffer
 
   (with-temp-buffer
 
     (insert code)
 
     (insert code)
 
     (shell-command-on-region (point-min) (point-max) cmd nil 'replace)
 
     (shell-command-on-region (point-min) (point-max) cmd nil 'replace)
 
-    (buffer-string)))
 
+    (buffer-string)))  
 
 
 (defadvice org-ctrl-c-ctrl-c (around org-cc-eval-source activate)
 
 (defadvice org-ctrl-c-ctrl-c (around org-cc-eval-source activate)
 
   (if (org-eval-light-inside-snippet)
 
   (if (org-eval-light-inside-snippet)

+ 5 - 4
contrib/lisp/org-eval.el
View File 

@@ -1,5 +1,5 @@
 
 ;;; org-eval.el --- Display result of evaluating code in various languages
 
 ;;; org-eval.el --- Display result of evaluating code in various languages
 
-;; Copyright (C) 2008-2012 Free Software Foundation, Inc.
 
+;; Copyright (C) 2008-2011 Free Software Foundation, Inc.
 
 ;;
 
 ;;
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 
 ;; Keywords: outlines, hypermedia, calendar, wp
 
 ;; Keywords: outlines, hypermedia, calendar, wp
 
@@ -105,7 +105,7 @@
 
 (defcustom org-eval-interpreters '("lisp")
 
 (defcustom org-eval-interpreters '("lisp")
 
   "Interpreters allows for evaluation tags.
 
   "Interpreters allows for evaluation tags.
 
 This is a list of program names (as strings) that can evaluate code and
 
 This is a list of program names (as strings) that can evaluate code and
 
-insert the output into an Org-mode buffer.  Valid choices are
 
+insert the output into an Org-mode buffer.  Valid choices are 
 
 
 lisp    Interpret Emacs Lisp code and display the result
 
 lisp    Interpret Emacs Lisp code and display the result
 
 shell   Pass command to the shell and display the result
 
 shell   Pass command to the shell and display the result
 
@@ -120,7 +120,7 @@ ruby    The ruby interpreter"
 
 	      (const "python")
 
 	      (const "python")
 
 	      (const "ruby")
 
 	      (const "ruby")
 
 	      (const "shell")))
 
 	      (const "shell")))
 
-
 
+  
 (defun org-eval-handle-snippets (limit &optional replace)
 
 (defun org-eval-handle-snippets (limit &optional replace)
 
   "Evaluate code snippets and display the results as display property.
 
   "Evaluate code snippets and display the results as display property.
 
 When REPLACE is non-nil, replace the code region with the result (used
 
 When REPLACE is non-nil, replace the code region with the result (used
 
@@ -212,8 +212,9 @@ This should go into the `org-export-preprocess-hook'."
 
   (with-temp-buffer
 
   (with-temp-buffer
 
     (insert code)
 
     (insert code)
 
     (shell-command-on-region (point-min) (point-max) cmd nil 'replace)
 
     (shell-command-on-region (point-min) (point-max) cmd nil 'replace)
 
-    (buffer-string)))
 
+    (buffer-string)))  
 
 
 (provide 'org-eval)
 
 (provide 'org-eval)
 
 
 
 ;;; org-eval.el ends here
 
 ;;; org-eval.el ends here
 
+

+ 1 - 1
contrib/lisp/org-exp-bibtex.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; org-exp-bibtex.el --- Export bibtex fragments
 
 ;;; org-exp-bibtex.el --- Export bibtex fragments
 
 
 
-;; Copyright (C) 2009-2012 Taru Karttunen
 
+;; Copyright (C) 2009-2011 Taru Karttunen
 
 
 
 ;; Author: Taru Karttunen <taruti@taruti.net>
 
 ;; Author: Taru Karttunen <taruti@taruti.net>

+ 13 - 13
contrib/lisp/org-expiry.el
View File 

@@ -25,7 +25,7 @@
 
 ;;; Commentary:
 
 ;;; Commentary:
 
 ;;
 
 ;;
 
 ;; This gives you a chance to get rid of old entries in your Org files
 
 ;; This gives you a chance to get rid of old entries in your Org files
 
-;; by expiring them.
 
+;; by expiring them.  
 ;;
 
 ;;
 
 ;; By default, entries that have no EXPIRY property are considered to be
 
 ;; By default, entries that have no EXPIRY property are considered to be
 
 ;; new (i.e. 0 day old) and only entries older than one year go to the
 
 ;; new (i.e. 0 day old) and only entries older than one year go to the
 
@@ -33,7 +33,7 @@
 
 ;; your tasks will be deleted with the default settings.
 
 ;; your tasks will be deleted with the default settings.
 
 ;;
 
 ;;
 
 ;; When does an entry expires?
 
 ;; When does an entry expires?
 
-;;
 
+;; 
 ;; Consider this entry:
 
 ;; Consider this entry:
 
 ;;
 
 ;;
 
 ;; * Stop watching TV
 
 ;; * Stop watching TV
 
@@ -41,8 +41,8 @@
 
 ;;   :CREATED:  <2008-01-07 lun 08:01>
 
 ;;   :CREATED:  <2008-01-07 lun 08:01>
 
 ;;   :EXPIRY:   <2008-01-09 08:01>
 
 ;;   :EXPIRY:   <2008-01-09 08:01>
 
 ;;   :END:
 
 ;;   :END:
 
-;;
 
-;; This entry will expire on the 9th, january 2008.
 
+;; 
+;; This entry will expire on the 9th, january 2008. 
 
 
 ;; * Stop watching TV
 
 ;; * Stop watching TV
 
 ;;   :PROPERTIES:
 
 ;;   :PROPERTIES:
 
@@ -56,19 +56,19 @@
 
 ;; What happen when an entry is expired?  Nothing until you explicitely
 
 ;; What happen when an entry is expired?  Nothing until you explicitely
 
 ;; M-x org-expiry-process-entries When doing this, org-expiry will check
 
 ;; M-x org-expiry-process-entries When doing this, org-expiry will check
 
 ;; for expired entries and request permission to process them.
 
 ;; for expired entries and request permission to process them.
 
-;;
 
+;; 
 ;; Processing an expired entries means calling the function associated
 
 ;; Processing an expired entries means calling the function associated
 
 ;; with `org-expiry-handler-function'; the default is to add the tag
 
 ;; with `org-expiry-handler-function'; the default is to add the tag
 
-;; :ARCHIVE:, but you can also add a EXPIRED keyword or even archive
 
-;; the subtree.
 
+;; :ARCHIVE:, but you can also add a EXPIRED keyword or even archive 
+;; the subtree.  
 ;;
 
 ;;
 
 ;; Is this useful?  Well, when you're in a brainstorming session, it
 
 ;; Is this useful?  Well, when you're in a brainstorming session, it
 
 ;; might be useful to know about the creation date of an entry, and be
 
 ;; might be useful to know about the creation date of an entry, and be
 
 ;; able to archive those entries that are more than xxx days/weeks old.
 
 ;; able to archive those entries that are more than xxx days/weeks old.
 
-;;
 
+;; 
 ;; When you're in such a session, you can insinuate org-expiry like
 
 ;; When you're in such a session, you can insinuate org-expiry like
 
-;; this: M-x org-expiry-insinuate
 
-;;
 
+;; this: M-x org-expiry-insinuate 
+;; 
 ;; Then, each time you're pressing M-RET to insert an item, the CREATION
 
 ;; Then, each time you're pressing M-RET to insert an item, the CREATION
 
 ;; property will be automatically added.  Same when you're scheduling or
 
 ;; property will be automatically added.  Same when you're scheduling or
 
 ;; deadlining items.  You can deinsinuate: M-x org-expiry-deinsinuate
 
 ;; deadlining items.  You can deinsinuate: M-x org-expiry-deinsinuate
 
@@ -218,7 +218,7 @@ and restart `org-mode' if necessary."
 
 Return nil if the entry is not expired.  Otherwise return the
 
 Return nil if the entry is not expired.  Otherwise return the
 
 amount of time between today and the expiry date.
 
 amount of time between today and the expiry date.
 
 
 
-If there is no creation date, use `org-expiry-created-date'.
 
+If there is no creation date, use `org-expiry-created-date'.  
 If there is no expiry date, use `org-expiry-expiry-date'."
 
 If there is no expiry date, use `org-expiry-expiry-date'."
 
   (let* ((ex-prop org-expiry-expiry-property-name)
 
   (let* ((ex-prop org-expiry-expiry-property-name)
 
 	 (cr-prop org-expiry-created-property-name)
 
 	 (cr-prop org-expiry-created-property-name)
 
@@ -292,7 +292,7 @@ update the date."
 
 	 d-time d-hour timestr)
 
 	 d-time d-hour timestr)
 
     (when (or (null d) arg)
 
     (when (or (null d) arg)
 
       ;; update if no date or non-nil prefix argument
 
       ;; update if no date or non-nil prefix argument
 
-      ;; FIXME Use `org-time-string-to-time'
 
+      ;; FIXME Use `org-time-string-to-time' 
       (setq d-time (if d (org-time-string-to-time d)
 
       (setq d-time (if d (org-time-string-to-time d)
 
 		     (current-time)))
 
 		     (current-time)))
 
       (setq d-hour (format-time-string "%H:%M" d-time))
 
       (setq d-hour (format-time-string "%H:%M" d-time))
 
@@ -326,7 +326,7 @@ and insert today's date."
 
     ;; maybe transform to inactive timestamp
 
     ;; maybe transform to inactive timestamp
 
     (if org-expiry-inactive-timestamps
 
     (if org-expiry-inactive-timestamps
 
 	(setq timestr (concat "[" (substring timestr 1 -1) "]")))
 
 	(setq timestr (concat "[" (substring timestr 1 -1) "]")))
 
-
 
+     
     (save-excursion
 
     (save-excursion
 
       (org-entry-put
 
       (org-entry-put
 
        (point) org-expiry-expiry-property-name timestr))))
 
        (point) org-expiry-expiry-property-name timestr))))

+ 31 - 31
contrib/lisp/org-export-generic.el
View File 

@@ -1,6 +1,6 @@
 
 ;; org-export-generic.el --- Export frameworg with custom backends
 
 ;; org-export-generic.el --- Export frameworg with custom backends
 
 
 
-;; Copyright (C) 2009-2012  Free Software Foundation, Inc.
 
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 
 
 ;; Author:   Wes Hardaker <hardaker at users dot sourceforge dot net>
 
 ;; Author:   Wes Hardaker <hardaker at users dot sourceforge dot net>
 
 ;; Keywords: outlines, hypermedia, calendar, wp, export
 
 ;; Keywords: outlines, hypermedia, calendar, wp, export
 
@@ -35,7 +35,7 @@
 
 ;; org-set-generic-type function:
 
 ;; org-set-generic-type function:
 
 ;;
 
 ;;
 
 ;;    (org-set-generic-type
 
 ;;    (org-set-generic-type
 
-;;     "really-basic-text"
 
+;;     "really-basic-text" 
 ;;     '(:file-suffix  ".txt"
 
 ;;     '(:file-suffix  ".txt"
 
 ;;       :key-binding  ?R
 
 ;;       :key-binding  ?R
 
 ;;
 
 ;;
 
@@ -155,10 +155,10 @@ in this way, it will be wrapped."
 
 
 
      :toc-section-numbers       t
 
      :toc-section-numbers       t
 
      :toc-section-number-format "\#(%s) "
 
      :toc-section-number-format "\#(%s) "
 
-     :toc-format                "--%s--"
 
+     :toc-format                "--%s--"    
      :toc-format-with-todo      "!!%s!!\n"
 
      :toc-format-with-todo      "!!%s!!\n"
 
-     :toc-indent-char           ?\
 
-     :toc-indent-depth          4
 
+     :toc-indent-char           ?\ 
+     :toc-indent-depth          4         
 
 
      :toc-tags-export           t
 
      :toc-tags-export           t
 
      :toc-tags-prefix           "   <tags>"
 
      :toc-tags-prefix           "   <tags>"
 
@@ -217,7 +217,7 @@ in this way, it will be wrapped."
 
      :body-list-checkbox-half-end  "</checkbox (half)>"
 
      :body-list-checkbox-half-end  "</checkbox (half)>"
 
 
 
 
 
-
 
+     
 
 
 					; other body lines
 
 					; other body lines
 
      :body-line-format             "%s"
 
      :body-line-format             "%s"
 
@@ -257,10 +257,10 @@ in this way, it will be wrapped."
 
      :toc-export                t
 
      :toc-export                t
 
      :toc-section-numbers       t
 
      :toc-section-numbers       t
 
      :toc-section-number-format "%s "
 
      :toc-section-number-format "%s "
 
-     :toc-format                "%s\n"
 
+     :toc-format                "%s\n"    
      :toc-format-with-todo      "%s (*)\n"
 
      :toc-format-with-todo      "%s (*)\n"
 
-     :toc-indent-char           ?\
 
-     :toc-indent-depth          4
 
+     :toc-indent-char           ?\ 
+     :toc-indent-depth          4         
 
 
      :body-header-section-numbers 3
 
      :body-header-section-numbers 3
 
      :body-section-prefix         "\n"
 
      :body-section-prefix         "\n"
 
@@ -310,7 +310,7 @@ in this way, it will be wrapped."
 
 
 
      :body-section-header-prefix    ("= " "== " "=== "
 
      :body-section-header-prefix    ("= " "== " "=== "
 
 				     "==== " "===== " "====== ")
 
 				     "==== " "===== " "====== ")
 
-     :body-section-header-suffix    (" =\n\n" " ==\n\n" " ===\n\n"
 
+     :body-section-header-suffix    (" =\n\n" " ==\n\n" " ===\n\n" 
 				     " ====\n\n" " =====\n\n" " ======\n\n")
 
 				     " ====\n\n" " =====\n\n" " ======\n\n")
 
 
 
      :body-line-export-preformated  t          ;; yes/no/maybe???
 
      :body-line-export-preformated  t          ;; yes/no/maybe???
 
@@ -390,7 +390,7 @@ in this way, it will be wrapped."
 
      :body-list-format 	       "<t>%s</t>\n"
 
      :body-list-format 	       "<t>%s</t>\n"
 
 
 
      )
 
      )
 
-    ("trac-wiki"
 
+    ("trac-wiki" 
      :file-suffix     ".txt"
 
      :file-suffix     ".txt"
 
      :key-binding     ?T
 
      :key-binding     ?T
 
 
 
@@ -409,7 +409,7 @@ in this way, it will be wrapped."
 
 
 
      :body-section-header-prefix    (" == " " === " " ==== "
 
      :body-section-header-prefix    (" == " " === " " ==== "
 
 				     " ===== " )
 
 				     " ===== " )
 
-     :body-section-header-suffix    (" ==\n\n" " ===\n\n" " ====\n\n"
 
+     :body-section-header-suffix    (" ==\n\n" " ===\n\n" " ====\n\n" 
 				     " =====\n\n" " ======\n\n" " =======\n\n")
 
 				     " =====\n\n" " ======\n\n" " =======\n\n")
 
 
 
      :body-line-export-preformated  t ;; yes/no/maybe???
 
      :body-line-export-preformated  t ;; yes/no/maybe???
 
@@ -426,7 +426,7 @@ in this way, it will be wrapped."
 
      ;; this is ignored! [2010/02/02:rpg]
 
      ;; this is ignored! [2010/02/02:rpg]
 
      :body-bullet-list-prefix       ("* " "** " "*** " "**** " "***** ")
 
      :body-bullet-list-prefix       ("* " "** " "*** " "**** " "***** ")
 
      )
 
      )
 
-    ("tikiwiki"
 
+    ("tikiwiki" 
      :file-suffix     ".txt"
 
      :file-suffix     ".txt"
 
      :key-binding     ?U
 
      :key-binding     ?U
 
 
 
@@ -445,7 +445,7 @@ in this way, it will be wrapped."
 
 
 
      :body-section-header-prefix    ("! " "!! " "!!! " "!!!! "
 
      :body-section-header-prefix    ("! " "!! " "!!! " "!!!! "
 
 				     "!!!!! " "!!!!!! " "!!!!!!! ")
 
 				     "!!!!! " "!!!!!! " "!!!!!!! ")
 
-     :body-section-header-suffix    (" \n" " \n" " \n"
 
+     :body-section-header-suffix    (" \n" " \n" " \n" 
 				     " \n" " \n" " \n")
 
 				     " \n" " \n" " \n")
 
 
 
 
 
@@ -498,12 +498,12 @@ the body of an org-set-generic-type definition."
 
      ))
 
      ))
 
 
 
 (def-org-export-generic-keyword :body-newline-paragraph
 
 (def-org-export-generic-keyword :body-newline-paragraph
 
-    :documentation "Bound either to NIL or to a pattern to be
 
+    :documentation "Bound either to NIL or to a pattern to be 
 inserted in the output for every blank line in the input.
 
 inserted in the output for every blank line in the input.
 
   The intention is to handle formats where text is flowed, and
 
   The intention is to handle formats where text is flowed, and
 
 newlines are interpreted as significant \(e.g., as indicating
 
 newlines are interpreted as significant \(e.g., as indicating
 
 preformatted text\).  A common non-nil value for this keyword
 
 preformatted text\).  A common non-nil value for this keyword
 
-is \"\\n\".  Should typically be combined with a value for
 
+is \"\\n\".  Should typically be combined with a value for 
 :body-line-format that does NOT end with a newline."
 
 :body-line-format that does NOT end with a newline."
 
     :type string)
 
     :type string)
 
 
 
@@ -515,8 +515,8 @@ is \"\\n\".  Should typically be combined with a value for
 
 (def-org-export-generic-keyword :code-format)
 
 (def-org-export-generic-keyword :code-format)
 
 (def-org-export-generic-keyword :verbatim-format)
 
 (def-org-export-generic-keyword :verbatim-format)
 
 
 
-
 
-
 
+    
+  
 
 
 (defun org-export-generic-remember-section (type suffix &optional prefix)
 
 (defun org-export-generic-remember-section (type suffix &optional prefix)
 
   (setq org-export-generic-section-type type)
 
   (setq org-export-generic-section-type type)
 
@@ -569,7 +569,7 @@ underlined headlines.  The default is 3."
 
 			      (org-export-add-subtree-options opt-plist rbeg)
 
 			      (org-export-add-subtree-options opt-plist rbeg)
 
 			    opt-plist)))
 
 			    opt-plist)))
 
 
 
-	 helpstart
 
+	 helpstart 
 	 (bogus (mapc (lambda (x)
 
 	 (bogus (mapc (lambda (x)
 
 			(setq helpstart
 
 			(setq helpstart
 
 			      (concat helpstart "\["
 
 			      (concat helpstart "\["
 
@@ -611,7 +611,7 @@ underlined headlines.  The default is 3."
 
 	    (unless (setq ass (cadr (assq r2 cmds)))
 
 	    (unless (setq ass (cadr (assq r2 cmds)))
 
 	      (error "No command associated with key %c" r1))
 
 	      (error "No command associated with key %c" r1))
 
 
 
-	    (cdr (assoc
 
+	    (cdr (assoc 
 		  (if (equal ass "default") org-generic-export-type ass)
 
 		  (if (equal ass "default") org-generic-export-type ass)
 
 		  org-generic-alist))))
 
 		  org-generic-alist))))
 
 
 
@@ -732,11 +732,11 @@ underlined headlines.  The default is 3."
 
          (format-code (plist-get export-plist :code-format))
 
          (format-code (plist-get export-plist :code-format))
 
          (format-verbatim (plist-get export-plist :verbatim-format))
 
          (format-verbatim (plist-get export-plist :verbatim-format))
 
 
 
-
 
+         
 
 
 	 thetoc toctags have-headings first-heading-pos
 
 	 thetoc toctags have-headings first-heading-pos
 
 	 table-open table-buffer link-buffer link desc desc0 rpl wrap)
 
 	 table-open table-buffer link-buffer link desc desc0 rpl wrap)
 
-
 
+    
     (let ((inhibit-read-only t))
 
     (let ((inhibit-read-only t))
 
       (org-unmodified
 
       (org-unmodified
 
        (remove-text-properties (point-min) (point-max)
 
        (remove-text-properties (point-min) (point-max)
 
@@ -841,7 +841,7 @@ underlined headlines.  The default is 3."
 
 				(org-re "[ \t]+:\\([[:alnum:]_@:]+\\):[ \t]*$")
 
 				(org-re "[ \t]+:\\([[:alnum:]_@:]+\\):[ \t]*$")
 
 				txt)
 
 				txt)
 
 			       (progn
 
 			       (progn
 
-				 (setq
 
+				 (setq 
 				  toctags
 
 				  toctags
 
 				  (org-export-generic-header
 
 				  (org-export-generic-header
 
 				   (match-string 1 txt)
 
 				   (match-string 1 txt)
 
@@ -852,7 +852,7 @@ underlined headlines.  The default is 3."
 
 				  txt)
 
 				  txt)
 
 				 (setq txt (replace-match "" t t txt)))
 
 				 (setq txt (replace-match "" t t txt)))
 
 			     (setq toctags tocnotagsstr)))
 
 			     (setq toctags tocnotagsstr)))
 
-
 
+			   
 			 (if (string-match quote-re0 txt)
 
 			 (if (string-match quote-re0 txt)
 
 			     (setq txt (replace-match "" t t txt)))
 
 			     (setq txt (replace-match "" t t txt)))
 
 
 
@@ -871,7 +871,7 @@ underlined headlines.  The default is 3."
 
 				   "")
 
 				   "")
 
 
 
 				 (format
 
 				 (format
 
-				  (if todo tocformtodo tocformat)
 
+				  (if todo tocformtodo tocformat) 
 				  txt)
 
 				  txt)
 
 
 
 				 toctags)
 
 				 toctags)
 
@@ -908,7 +908,7 @@ underlined headlines.  The default is 3."
 
 				      (substring link 8)
 
 				      (substring link 8)
 
 				      org-export-code-refs)))
 
 				      org-export-code-refs)))
 
 			t t line))
 
 			t t line))
 
-	  (setq rpl (concat "["
 
+	  (setq rpl (concat "[" 
 			    (or (match-string 3 line) (match-string 1 line))
 
 			    (or (match-string 3 line) (match-string 1 line))
 
 			    "]"))
 
 			    "]"))
 
 	  (when (and desc0 (not (equal desc0 link)))
 
 	  (when (and desc0 (not (equal desc0 link)))
 
@@ -1043,7 +1043,7 @@ underlined headlines.  The default is 3."
 
 	;;
 
 	;;
 
 	(org-export-generic-check-section "body" bodytextpre bodytextsuf)
 
 	(org-export-generic-check-section "body" bodytextpre bodytextsuf)
 
 
 
-        (setq line
 
+        (setq line 
               (org-export-generic-fontify line))
 
               (org-export-generic-fontify line))
 
 
 
 	;; XXX: properties?  list?
 
 	;; XXX: properties?  list?
 
@@ -1208,7 +1208,7 @@ REVERSE means to reverse the list if the plist match is a list
 
 	(setq result (concat result line))
 
 	(setq result (concat result line))
 
 	(setq len 0)))
 
 	(setq len 0)))
 
     (concat result indstr line)))
 
     (concat result indstr line)))
 
-
 
+			   
 (defun org-export-generic-push-links (link-buffer)
 
 (defun org-export-generic-push-links (link-buffer)
 
   "Push out links in the buffer."
 
   "Push out links in the buffer."
 
   (when link-buffer
 
   (when link-buffer
 
@@ -1258,13 +1258,13 @@ REVERSE means to reverse the list if the plist match is a list
 
 	))
 
 	))
 
      ;; same level
 
      ;; same level
 
      ((= level old-level)
 
      ((= level old-level)
 
-      (insert
 
+      (insert 
        (org-export-generic-format export-plist :body-section-suffix 0 level))
 
        (org-export-generic-format export-plist :body-section-suffix 0 level))
 
       )
 
       )
 
      )
 
      )
 
     (insert
 
     (insert
 
      (org-export-generic-format export-plist :body-section-prefix 0 level))
 
      (org-export-generic-format export-plist :body-section-prefix 0 level))
 
-
 
+    
     (if (and org-export-with-section-numbers
 
     (if (and org-export-with-section-numbers
 
 	     secnums
 
 	     secnums
 
 	     (or (not (numberp secnums))
 
 	     (or (not (numberp secnums))
 
@@ -1365,7 +1365,7 @@ REVERSE means to reverse the list if the plist match is a list
 
 Each element of the list is a list of three elements.
 
 Each element of the list is a list of three elements.
 
 The first element is the character used as a marker for fontification.
 
 The first element is the character used as a marker for fontification.
 
 The second element is a variable name, set in org-export-generic.  That
 
 The second element is a variable name, set in org-export-generic.  That
 
-variable will be dereferenced to obtain a formatting string to wrap
 
+variable will be dereferenced to obtain a formatting string to wrap 
 fontified text with.
 
 fontified text with.
 
 The third element decides whether to protect converted text from other
 
 The third element decides whether to protect converted text from other
 
 conversions.")
 
 conversions.")

File diff suppressed because it is too large
+ 332 - 466
contrib/lisp/org-export.el


+ 1 - 1
contrib/lisp/org-git-link.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; org-git-link.el --- Provide org links to specific file version
 
 ;;; org-git-link.el --- Provide org links to specific file version
 
 
 
-;; Copyright (C) 2009-2012  Reimar Finken
 
+;; Copyright (C) 2009-2011  Reimar Finken
 
 
 
 ;; Author: Reimar Finken <reimar.finken@gmx.de>
 
 ;; Author: Reimar Finken <reimar.finken@gmx.de>
 
 ;; Keywords: files, calendar, hypermedia
 
 ;; Keywords: files, calendar, hypermedia

+ 4 - 4
contrib/lisp/org-interactive-query.el
View File 

@@ -6,7 +6,7 @@
 
 ;; Version: 1.0
 
 ;; Version: 1.0
 
 ;; Keywords: org, wp
 
 ;; Keywords: org, wp
 
 ;;
 
 ;;
 
-;; This file is not part of GNU Emacs.
 
+;; This file is not part of GNU Emacs. 
 ;;
 
 ;;
 
 ;; This program is free software; you can redistribute it and/or modify
 
 ;; 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
 
 ;; it under the terms of the GNU General Public License as published by
 
@@ -31,7 +31,7 @@
 
 ;; /   add a keyword as a positive selection criterion
 
 ;; /   add a keyword as a positive selection criterion
 
 ;; \   add a keyword as a newgative selection criterion
 
 ;; \   add a keyword as a newgative selection criterion
 
 ;; =   clear a keyword from the selection string
 
 ;; =   clear a keyword from the selection string
 
-;; ;
 
+;; ;   
 
 
 (require 'org)
 
 (require 'org)
 
 
 
@@ -39,7 +39,7 @@
 
 (org-defkey org-agenda-mode-map "/" 'org-agenda-query-and-cmd)
 
 (org-defkey org-agenda-mode-map "/" 'org-agenda-query-and-cmd)
 
 (org-defkey org-agenda-mode-map ";" 'org-agenda-query-or-cmd)
 
 (org-defkey org-agenda-mode-map ";" 'org-agenda-query-or-cmd)
 
 (org-defkey org-agenda-mode-map "\\" 'org-agenda-query-not-cmd)
 
 (org-defkey org-agenda-mode-map "\\" 'org-agenda-query-not-cmd)
 
-
 
+ 
 ;;; Agenda interactive query manipulation
 
 ;;; Agenda interactive query manipulation
 
 
 
 (defcustom org-agenda-query-selection-single-key t
 
 (defcustom org-agenda-query-selection-single-key t
 
@@ -283,7 +283,7 @@ keyword string."
 
 (defun org-agenda-query-generic-cmd (op)
 
 (defun org-agenda-query-generic-cmd (op)
 
   "Activate query manipulation with OP as initial operator."
 
   "Activate query manipulation with OP as initial operator."
 
   (let ((q (org-agenda-query-selection org-agenda-query-string op
 
   (let ((q (org-agenda-query-selection org-agenda-query-string op
 
-                                       org-tag-alist
 
+                                       org-tag-alist 
                                        (org-agenda-query-global-todo-keys))))
 
                                        (org-agenda-query-global-todo-keys))))
 
     (when q
 
     (when q
 
       (setq org-agenda-query-string q)
 
       (setq org-agenda-query-string q)

+ 10 - 10
contrib/lisp/org-invoice.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; org-invoice.el --- Help manage client invoices in OrgMode
 
 ;;; org-invoice.el --- Help manage client invoices in OrgMode
 
 ;;
 
 ;;
 
-;; Copyright (C) 2008-2012 pmade inc. (Peter Jones pjones@pmade.com)
 
+;; Copyright (C) 2008-2011 pmade inc. (Peter Jones pjones@pmade.com)
 
 ;;
 
 ;;
 
 ;; This file is not part of GNU Emacs.
 
 ;; This file is not part of GNU Emacs.
 
 ;;
 
 ;;
 
@@ -181,7 +181,7 @@ looks like tree2, where the level is 2."
 
         (when (or (not min) (< level min)) (setq min level))
 
         (when (or (not min) (< level min)) (setq min level))
 
         (when (> level max) (setq max level))))
 
         (when (> level max) (setq max level))))
 
     (cons (or min 0) max)))
 
     (cons (or min 0) max)))
 
-
 
+  
 (defun org-invoice-collapse-list (ls)
 
 (defun org-invoice-collapse-list (ls)
 
   "Reorganize the given list by dates."
 
   "Reorganize the given list by dates."
 
   (let ((min-max (org-invoice-level-min-max ls)) new)
 
   (let ((min-max (org-invoice-level-min-max ls)) new)
 
@@ -214,7 +214,7 @@ looks like tree2, where the level is 2."
 
                     (+ price (cdr (assoc 'price (car bucket)))))
 
                     (+ price (cdr (assoc 'price (car bucket)))))
 
             (nconc bucket (list info))))))
 
             (nconc bucket (list info))))))
 
     (nreverse new)))
 
     (nreverse new)))
 
-
 
+  
 (defun org-invoice-info-to-table (info)
 
 (defun org-invoice-info-to-table (info)
 
   "Create a single org table row from the given info alist."
 
   "Create a single org table row from the given info alist."
 
   (let ((title (cdr (assoc 'title info)))
 
   (let ((title (cdr (assoc 'title info)))
 
@@ -223,19 +223,19 @@ looks like tree2, where the level is 2."
 
         (price (cdr (assoc 'price info)))
 
         (price (cdr (assoc 'price info)))
 
         (with-price (plist-get org-invoice-table-params :price)))
 
         (with-price (plist-get org-invoice-table-params :price)))
 
     (unless total
 
     (unless total
 
-      (setq
 
+      (setq 
        org-invoice-total-time (+ org-invoice-total-time work)
 
        org-invoice-total-time (+ org-invoice-total-time work)
 
        org-invoice-total-price (+ org-invoice-total-price price)))
 
        org-invoice-total-price (+ org-invoice-total-price price)))
 
     (setq total (and total (org-minutes-to-hh:mm-string total)))
 
     (setq total (and total (org-minutes-to-hh:mm-string total)))
 
     (setq work  (and work  (org-minutes-to-hh:mm-string work)))
 
     (setq work  (and work  (org-minutes-to-hh:mm-string work)))
 
-    (insert-before-markers
 
+    (insert-before-markers 
      (concat "|" title
 
      (concat "|" title
 
              (cond
 
              (cond
 
               (total (concat "|" total))
 
               (total (concat "|" total))
 
               (work  (concat "|" work)))
 
               (work  (concat "|" work)))
 
              (and with-price price (concat "|" (format "%.2f" price)))
 
              (and with-price price (concat "|" (format "%.2f" price)))
 
              "|" "\n"))))
 
              "|" "\n"))))
 
-
 
+  
 (defun org-invoice-list-to-table (ls)
 
 (defun org-invoice-list-to-table (ls)
 
   "Convert a list of heading info to an org table"
 
   "Convert a list of heading info to an org table"
 
   (let ((with-price (plist-get org-invoice-table-params :price))
 
   (let ((with-price (plist-get org-invoice-table-params :price))
 
@@ -243,7 +243,7 @@ looks like tree2, where the level is 2."
 
         (with-header (plist-get org-invoice-table-params :headers))
 
         (with-header (plist-get org-invoice-table-params :headers))
 
         (org-invoice-total-time 0)
 
         (org-invoice-total-time 0)
 
         (org-invoice-total-price 0))
 
         (org-invoice-total-price 0))
 
-    (insert-before-markers
 
+    (insert-before-markers 
      (concat "| Task / Date | Time" (and with-price "| Price") "|\n"))
 
      (concat "| Task / Date | Time" (and with-price "| Price") "|\n"))
 
     (dolist (info ls)
 
     (dolist (info ls)
 
       (insert-before-markers "|-\n")
 
       (insert-before-markers "|-\n")
 
@@ -268,9 +268,9 @@ heading that begins the invoice data, usually using the
 
       (org-clock-sum)
 
       (org-clock-sum)
 
       (run-hook-with-args 'org-invoice-start-hook)
 
       (run-hook-with-args 'org-invoice-start-hook)
 
       (cons org-invoice-current-invoice
 
       (cons org-invoice-current-invoice
 
-            (org-invoice-collapse-list
 
+            (org-invoice-collapse-list 
              (org-map-entries 'org-invoice-heading-info t 'tree 'archive))))))
 
              (org-map-entries 'org-invoice-heading-info t 'tree 'archive))))))
 
-
 
+  
 (defun org-dblock-write:invoice (params)
 
 (defun org-dblock-write:invoice (params)
 
   "Function called by OrgMode to write the invoice dblock.  To
 
   "Function called by OrgMode to write the invoice dblock.  To
 
 create an invoice dblock you can use the `org-invoice-report'
 
 create an invoice dblock you can use the `org-invoice-report'
 
@@ -397,5 +397,5 @@ I place mine under a third-level heading like so:
 
     (if report (goto-char report)
 
     (if report (goto-char report)
 
       (org-create-dblock (list :name "invoice")))
 
       (org-create-dblock (list :name "invoice")))
 
     (org-update-dblock)))
 
     (org-update-dblock)))
 
-
 
+  
 (provide 'org-invoice)
 
 (provide 'org-invoice)

+ 1 - 1
contrib/lisp/org-jira.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; org-jira.el --- add a jira:ticket protocol to Org
 
 ;;; org-jira.el --- add a jira:ticket protocol to Org
 
 (defconst org-jira-version "0.1")
 
 (defconst org-jira-version "0.1")
 
-;; Copyright (C) 2008-2012 Jonathan Arkell.
 
+;; Copyright (C) 2008-2011 Jonathan Arkell.
 
 ;; Author: Jonathan Arkell <jonnay@jonnay.net>
 
 ;; Author: Jonathan Arkell <jonnay@jonnay.net>
 
 
 
 ;; This file is not part of GNU Emacs.
 
 ;; This file is not part of GNU Emacs.

+ 1 - 1
contrib/lisp/org-learn.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; org-learn.el --- Implements SuperMemo's incremental learning algorithm
 
 ;;; org-learn.el --- Implements SuperMemo's incremental learning algorithm
 
 
 
-;; Copyright (C) 2009-2012 Free Software Foundation, Inc.
 
+;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
 
 
 
 ;; Author: John Wiegley <johnw at gnu dot org>
 
 ;; Author: John Wiegley <johnw at gnu dot org>
 
 ;; Keywords: outlines, hypermedia, calendar, wp
 
 ;; Keywords: outlines, hypermedia, calendar, wp

+ 4 - 4
contrib/lisp/org-mac-iCal.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; org-mac-iCal.el --- Imports events from iCal.app to the Emacs diary
 
 ;;; org-mac-iCal.el --- Imports events from iCal.app to the Emacs diary
 
 
 
-;; Copyright (C) 2009-2012 Christopher Suckling
 
+;; Copyright (C) 2009-2011 Christopher Suckling
 
 
 
 ;; Author: Christopher Suckling <suckling at gmail dot com>
 
 ;; Author: Christopher Suckling <suckling at gmail dot com>
 
 
 
@@ -101,7 +101,7 @@ the the Emacs diary"
 
     (shell-command "sw_vers" (current-buffer))
 
     (shell-command "sw_vers" (current-buffer))
 
     (when (re-search-backward "10\\.[567]" nil t)
 
     (when (re-search-backward "10\\.[567]" nil t)
 
       (omi-concat-leopard-ics all-calendars)))
 
       (omi-concat-leopard-ics all-calendars)))
 
-
 
+  
   ;; move all caldav ics files to the same place as local ics files
 
   ;; move all caldav ics files to the same place as local ics files
 
   (mapc
 
   (mapc
 
    (lambda (x)
 
    (lambda (x)
 
@@ -111,7 +111,7 @@ the the Emacs diary"
 
                      (concat "~/Library/Calendars/" y)))
 
                      (concat "~/Library/Calendars/" y)))
 
       (directory-files x nil ".*ics$")))
 
       (directory-files x nil ".*ics$")))
 
    caldav-folders)
 
    caldav-folders)
 
-
 
+  
   ;; check calendar has contents and import
 
   ;; check calendar has contents and import
 
   (setq import-calendars (directory-files "~/Library/Calendars" 1 ".*ics$"))
 
   (setq import-calendars (directory-files "~/Library/Calendars" 1 ".*ics$"))
 
   (mapc
 
   (mapc
 
@@ -181,7 +181,7 @@ date range so that Emacs calendar view doesn't grind to a halt"
 
                   (* (/ org-mac-iCal-range 2) 30))
 
                   (* (/ org-mac-iCal-range 2) 30))
 
 	  (delete-region startEntry endEntry)))
 
 	  (delete-region startEntry endEntry)))
 
           (goto-char (point-max))))
 
           (goto-char (point-max))))
 
-    (while
 
+    (while 
 	(re-search-forward "^END:VEVENT$" nil t)
 
 	(re-search-forward "^END:VEVENT$" nil t)
 
       (delete-blank-lines))
 
       (delete-blank-lines))
 
     (goto-line 1)
 
     (goto-line 1)

+ 5 - 5
contrib/lisp/org-mac-link-grabber.el
View File 

@@ -2,7 +2,7 @@
 
 ;;; application and insert them as links into org-mode documents
 
 ;;; application and insert them as links into org-mode documents
 
 ;;
 
 ;;
 
 ;; Copyright (c) 2010-2012 Free Software Foundation, Inc.
 
 ;; Copyright (c) 2010-2012 Free Software Foundation, Inc.
 
-;;
 
+;; 
 ;; Author: Anthony Lander <anthony.lander@gmail.com>
 
 ;; Author: Anthony Lander <anthony.lander@gmail.com>
 
 ;; Version: 1.0.1
 
 ;; Version: 1.0.1
 
 ;; Keywords: org, mac, hyperlink
 
 ;; Keywords: org, mac, hyperlink
 
@@ -52,7 +52,7 @@
 
 ;; add (require 'org-mac-link-grabber) to your .emacs, and optionally
 
 ;; add (require 'org-mac-link-grabber) to your .emacs, and optionally
 
 ;; bind a key to activate the link grabber menu, like this:
 
 ;; bind a key to activate the link grabber menu, like this:
 
 ;;
 
 ;;
 
-;; (add-hook 'org-mode-hook (lambda ()
 
+;; (add-hook 'org-mode-hook (lambda () 
 ;;   (define-key org-mode-map (kbd "C-c g") 'omlg-grab-link)))
 
 ;;   (define-key org-mode-map (kbd "C-c g") 'omlg-grab-link)))
 
 ;;
 
 ;;
 
 ;;
 
 ;;
 
@@ -161,7 +161,7 @@ applications and inserting them in org documents"
 
 			  (when (and active (eq input key))
 
 			  (when (and active (eq input key))
 
 				(call-interactively grab-function))))
 
 				(call-interactively grab-function))))
 
 		  descriptors)))
 
 		  descriptors)))
 
-
 
+  
 (defalias 'omgl-grab-link 'omlg-grab-link
 
 (defalias 'omgl-grab-link 'omlg-grab-link
 
   "Renamed, and this alias will be obsolete next revision.")
 
   "Renamed, and this alias will be obsolete next revision.")
 
 
 
@@ -344,7 +344,7 @@ applications and inserting them in org documents"
 
 					 "	return theUrl & \"::split::\" & theName & \"\n\"\n"
 
 					 "	return theUrl & \"::split::\" & theName & \"\n\"\n"
 
 					 "end tell\n"))))
 
 					 "end tell\n"))))
 
 	(car (split-string result "[\r\n]+" t))))
 
 	(car (split-string result "[\r\n]+" t))))
 
-
 
+	
 (defun org-mac-safari-get-frontmost-url ()
 
 (defun org-mac-safari-get-frontmost-url ()
 
   (interactive)
 
   (interactive)
 
   (message "Applescript: Getting Safari url...")
 
   (message "Applescript: Getting Safari url...")
 
@@ -361,7 +361,7 @@ applications and inserting them in org documents"
 
 (defun org-mac-safari-insert-frontmost-url ()
 
 (defun org-mac-safari-insert-frontmost-url ()
 
   (interactive)
 
   (interactive)
 
   (insert (org-mac-safari-get-frontmost-url)))
 
   (insert (org-mac-safari-get-frontmost-url)))
 
-
 
+		
 
 
 ;;
 
 ;;
 
 ;;
 
 ;;

+ 4 - 4
contrib/lisp/org-mairix.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; org-mairix.el - Support for hooking mairix search into Org for different MUAs
 
 ;;; org-mairix.el - Support for hooking mairix search into Org for different MUAs
 
 ;;
 
 ;;
 
-;; Copyright (C) 2007-2012 Georg C. F. Greve
 
+;; Copyright (C) 2007-2011 Georg C. F. Greve
 
 ;; mutt support by Adam Spiers <orgmode at adamspiers dot org>
 
 ;; mutt support by Adam Spiers <orgmode at adamspiers dot org>
 
 ;;
 
 ;;
 
 ;; Author: Georg C. F. Greve <greve at fsfeurope dot org>
 
 ;; Author: Georg C. F. Greve <greve at fsfeurope dot org>
 
@@ -207,7 +207,7 @@ applications in order to mimic `org-store-link'.  Used by
 
   :group 'org-mairix)
 
   :group 'org-mairix)
 
 
 
 (defcustom org-mairix-mutt-display-command
 
 (defcustom org-mairix-mutt-display-command
 
-  "xterm -title 'mairix search: %search%' -e 'unset COLUMNS; mutt -f
 
+  "xterm -title 'mairix search: %search%' -e 'unset COLUMNS; mutt -f 
 ~/mail/mairix -e \"push <display-message>\"' &"
 
 ~/mail/mairix -e \"push <display-message>\"' &"
 
   "Command to execute to display mairix search results via mutt within
 
   "Command to execute to display mairix search results via mutt within
 
 an xterm.
 
 an xterm.
 
@@ -244,7 +244,7 @@ along with general mairix configuration."
 
   :group 'org-mairix-gnus
 
   :group 'org-mairix-gnus
 
   :type 'string)
 
   :type 'string)
 
 
 
-(defcustom org-mairix-gnus-select-display-group-function
 
+(defcustom org-mairix-gnus-select-display-group-function 
 'org-mairix-gnus-select-display-group-function-gg
 
 'org-mairix-gnus-select-display-group-function-gg
 
   "Hook to call to select the group that contains the matching articles.
 
   "Hook to call to select the group that contains the matching articles.
 
 We should not need this, it is owed to a problem of gnus that people were
 
 We should not need this, it is owed to a problem of gnus that people were
 
@@ -285,7 +285,7 @@ to do that -- so you're likely to see zombies floating around.
 
 
 
 If you can improve this, please do!"
 
 If you can improve this, please do!"
 
   (if (not (equal (substring search 0 2) "m:" ))
 
   (if (not (equal (substring search 0 2) "m:" ))
 
-      (error "org-mairix-gnus-display-results: display of search other than
 
+      (error "org-mairix-gnus-display-results: display of search other than 
 message-id not implemented yet"))
 
 message-id not implemented yet"))
 
   (setq message-id (substring search 2 nil))
 
   (setq message-id (substring search 2 nil))
 
   (require 'gnus)
 
   (require 'gnus)

+ 2 - 2
contrib/lisp/org-mime.el
View File 

@@ -43,13 +43,13 @@
 
 ;;
 
 ;;
 
 ;; you might want to bind this to a key with something like the
 
 ;; you might want to bind this to a key with something like the
 
 ;; following message-mode binding
 
 ;; following message-mode binding
 
-;;
 
+;; 
 ;;   (add-hook 'message-mode-hook
 
 ;;   (add-hook 'message-mode-hook
 
 ;;             (lambda ()
 
 ;;             (lambda ()
 
 ;;               (local-set-key "\C-c\M-o" 'org-mime-htmlize)))
 
 ;;               (local-set-key "\C-c\M-o" 'org-mime-htmlize)))
 
 ;;
 
 ;;
 
 ;; and the following org-mode binding
 
 ;; and the following org-mode binding
 
-;;
 
+;; 
 ;;   (add-hook 'org-mode-hook
 
 ;;   (add-hook 'org-mode-hook
 
 ;;             (lambda ()
 
 ;;             (lambda ()
 
 ;;               (local-set-key "\C-c\M-o" 'org-mime-org-buffer-htmlize)))
 
 ;;               (local-set-key "\C-c\M-o" 'org-mime-org-buffer-htmlize)))

+ 2 - 2
contrib/lisp/org-mtags.el
View File 

@@ -1,6 +1,5 @@
 
 ;;; org-mtags.el --- Muse-like tags in Org-mode
 
 ;;; org-mtags.el --- Muse-like tags in Org-mode
 
-
 
-;; Copyright (C) 2008-2012 Free Software Foundation, Inc.
 
+;; Copyright (C) 2008-2011 Free Software Foundation, Inc.
 
 ;;
 
 ;;
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 
 ;; Keywords: outlines, hypermedia, calendar, wp
 
 ;; Keywords: outlines, hypermedia, calendar, wp
 
@@ -255,3 +254,4 @@ with string values.  In addition, it reutnrs the following properties:
 
 (provide 'org-mtags)
 
 (provide 'org-mtags)
 
 
 
 ;;; org-mtags.el ends here
 
 ;;; org-mtags.el ends here
 
+

+ 5 - 5
contrib/lisp/org-notmuch.el
View File 

@@ -32,7 +32,7 @@
 
 
 
 ;; Links have one the following form
 
 ;; Links have one the following form
 
 ;; notmuch:<search terms>
 
 ;; notmuch:<search terms>
 
-;; notmuch-search:<search terms>.
 
+;; notmuch-search:<search terms>. 
 
 
 ;; The first form open the queries in notmuch-show mode, whereas the
 
 ;; The first form open the queries in notmuch-show mode, whereas the
 
 ;; second link open it in notmuch-search mode. Note that queries are
 
 ;; second link open it in notmuch-search mode. Note that queries are
 
@@ -61,13 +61,13 @@
 
       (setq link (org-make-link "notmuch:"  "id:" message-id))
 
       (setq link (org-make-link "notmuch:"  "id:" message-id))
 
       (org-add-link-props :link link :description desc)
 
       (org-add-link-props :link link :description desc)
 
       link)))
 
       link)))
 
-
 
+  
 (defun org-notmuch-open (path)
 
 (defun org-notmuch-open (path)
 
   "Follow a notmuch message link specified by PATH."
 
   "Follow a notmuch message link specified by PATH."
 
   (org-notmuch-follow-link path))
 
   (org-notmuch-follow-link path))
 
 
 
 (defun org-notmuch-follow-link (search)
 
 (defun org-notmuch-follow-link (search)
 
-  "Follow a notmuch link to SEARCH.
 
+  "Follow a notmuch link to SEARCH. 
 
 
 Can link to more than one message, if so all matching messages are shown."
 
 Can link to more than one message, if so all matching messages are shown."
 
   (require 'notmuch)
 
   (require 'notmuch)
 
@@ -82,10 +82,10 @@ Can link to more than one message, if so all matching messages are shown."
 
 (defun org-notmuch-search-store-link ()
 
 (defun org-notmuch-search-store-link ()
 
   "Store a link to a notmuch search or message."
 
   "Store a link to a notmuch search or message."
 
   (when (eq major-mode 'notmuch-search-mode)
 
   (when (eq major-mode 'notmuch-search-mode)
 
-    (let ((link (org-make-link "notmuch-search:"
 
+    (let ((link (org-make-link "notmuch-search:" 
 			       (org-link-escape notmuch-search-query-string)))
 
 			       (org-link-escape notmuch-search-query-string)))
 
 	  (desc (concat "Notmuch search: " notmuch-search-query-string)))
 
 	  (desc (concat "Notmuch search: " notmuch-search-query-string)))
 
-      (org-store-link-props :type "notmuch-search"
 
+      (org-store-link-props :type "notmuch-search" 
 			    :link link
 
 			    :link link
 
 			    :description desc)
 
 			    :description desc)
 
       link)))
 
       link)))

+ 2 - 0
contrib/lisp/org-panel.el
View File 

@@ -639,3 +639,5 @@ button changes the binding of the arrow keys."
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 
 
 ;;; org-panel.el ends here
 
 ;;; org-panel.el ends here
 
+
 
+

+ 4 - 4
contrib/lisp/org-registry.el
View File 

@@ -145,15 +145,15 @@ buffer."
 
 
 
 (defun org-registry-assoc-all (link &optional registry)
 
 (defun org-registry-assoc-all (link &optional registry)
 
   "Return all associated entries of LINK in the registry."
 
   "Return all associated entries of LINK in the registry."
 
-  (org-registry-find-all
 
+  (org-registry-find-all 
    (lambda (entry) (string= link (car entry)))
 
    (lambda (entry) (string= link (car entry)))
 
    registry))
 
    registry))
 
 
 
 (defun org-registry-find-all (test &optional registry)
 
 (defun org-registry-find-all (test &optional registry)
 
   "Return all entries satisfying `test' in the registry."
 
   "Return all entries satisfying `test' in the registry."
 
-  (delq nil
 
-        (mapcar
 
-         (lambda (x) (and (funcall test x) x))
 
+  (delq nil 
+        (mapcar 
+         (lambda (x) (and (funcall test x) x)) 
          (or registry org-registry-alist))))
 
          (or registry org-registry-alist))))
 
 
 
 ;;;###autoload
 
 ;;;###autoload

+ 4 - 4
contrib/lisp/org-screen.el
View File 

@@ -40,7 +40,7 @@
 
 ;; associated with that task, go to the end of your item and type:
 
 ;; associated with that task, go to the end of your item and type:
 
 ;;
 
 ;;
 
 ;; M-x org-screen
 
 ;; M-x org-screen
 
-;;
 
+;; 
 ;; This will prompt you for a name of a screen session.  Type in a
 
 ;; This will prompt you for a name of a screen session.  Type in a
 
 ;; name and it will insert a link into your org file at your current
 
 ;; name and it will insert a link into your org file at your current
 
 ;; location.
 
 ;; location.
 
@@ -79,10 +79,10 @@ is copied from ansi-term method."
 
 
 
   ;; Pick the name of the new buffer.
 
   ;; Pick the name of the new buffer.
 
   (let ((term-ansi-buffer-name
 
   (let ((term-ansi-buffer-name
 
-        (generate-new-buffer-name
 
+        (generate-new-buffer-name 
          (org-screen-buffer-name name))))
 
          (org-screen-buffer-name name))))
 
     (setq term-ansi-buffer-name
 
     (setq term-ansi-buffer-name
 
-          (term-ansi-make-term
 
+          (term-ansi-make-term 
           term-ansi-buffer-name org-screen-program-name nil arg name))
 
           term-ansi-buffer-name org-screen-program-name nil arg name))
 
     (set-buffer term-ansi-buffer-name)
 
     (set-buffer term-ansi-buffer-name)
 
     (term-mode)
 
     (term-mode)
 
@@ -104,5 +104,5 @@ is copied from ansi-term method."
 
 		 '("screen" . "elisp:(org-screen-goto \"%s\")"))
 
 		 '("screen" . "elisp:(org-screen-goto \"%s\")"))
 
   (setq org-link-abbrev-alist
 
   (setq org-link-abbrev-alist
 
 	'(("screen" . "elisp:(org-screen-goto \"%s\")"))))
 
 	'(("screen" . "elisp:(org-screen-goto \"%s\")"))))
 
-
 
+ 
 (provide 'org-screen)
 
 (provide 'org-screen)

+ 6 - 6
contrib/lisp/org-static-mathjax.el
View File 

@@ -86,7 +86,7 @@ org-static-mathjax-options:      The string given with #+STATICMATHJAX: in the f
 
 						 (set 'org-static-mathjax-mathjax-path
 
 						 (set 'org-static-mathjax-mathjax-path
 
 							  (car (read-from-string
 
 							  (car (read-from-string
 
 									(substring mathjax-options (match-end 0))))))))
 
 									(substring mathjax-options (match-end 0))))))))
 
-			   (add-hook 'after-save-hook
 
+			   (add-hook 'after-save-hook 
 						 'org-static-mathjax-process
 
 						 'org-static-mathjax-process
 
 						 nil t)))))
 
 						 nil t)))))
 
 
 
@@ -117,20 +117,20 @@ org-static-mathjax-options:      The string given with #+STATICMATHJAX: in the f
 
 			 (set symbol (eval (car (read-from-string
 
 			 (set symbol (eval (car (read-from-string
 
 									 (substring options (match-end 0))))))))
 
 									 (substring options (match-end 0))))))))
 
 	   '(embed-fonts output-file-name))
 
 	   '(embed-fonts output-file-name))
 
-
 
+	  
 	  ; debug
 
 	  ; debug
 
 	  (when org-static-mathjax-debug
 
 	  (when org-static-mathjax-debug
 
 		(message "output file name, embed-fonts")
 
 		(message "output file name, embed-fonts")
 
 		(print output-file-name)
 
 		(print output-file-name)
 
 		(print embed-fonts))
 
 		(print embed-fonts))
 
-
 
+	  
 	  ; open (temporary) input file, copy contents there, replace MathJax path with local installation
 
 	  ; open (temporary) input file, copy contents there, replace MathJax path with local installation
 
 	  (with-temp-buffer
 
 	  (with-temp-buffer
 
 		(insert html-code)
 
 		(insert html-code)
 
 		(goto-char 1)
 
 		(goto-char 1)
 
 		(replace-regexp mathjax-oldpath mathjax-newpath)
 
 		(replace-regexp mathjax-oldpath mathjax-newpath)
 
 		(write-file input-file-name))
 
 		(write-file input-file-name))
 
-
 
+	  
 	  ; prepare argument list for call-process
 
 	  ; prepare argument list for call-process
 
 	  (let ((call-process-args (list org-static-mathjax-xulrunner-path
 
 	  (let ((call-process-args (list org-static-mathjax-xulrunner-path
 
 									 nil nil nil
 
 									 nil nil nil
 
@@ -146,10 +146,10 @@ org-static-mathjax-options:      The string given with #+STATICMATHJAX: in the f
 
 		(if (not embed-fonts)
 
 		(if (not embed-fonts)
 
 			(progn
 
 			(progn
 
 			  (add-to-list 'call-process-args "--final-mathjax-url" t)
 
 			  (add-to-list 'call-process-args "--final-mathjax-url" t)
 
-			  (add-to-list 'call-process-args
 
+			  (add-to-list 'call-process-args 
 						   (file-name-directory org-static-mathjax-mathjax-path)
 
 						   (file-name-directory org-static-mathjax-mathjax-path)
 
 						   t)))
 
 						   t)))
 
-
 
+		
 		; debug
 
 		; debug
 
 		(when org-static-mathjax-debug
 
 		(when org-static-mathjax-debug
 
 		  (print call-process-args))
 
 		  (print call-process-args))

+ 3 - 4
contrib/lisp/org-sudoku.el
View File 

@@ -1,6 +1,5 @@
 
 ;;; org-sudoku.el --- Greate and solve SUDOKU games in Org tables
 
 ;;; org-sudoku.el --- Greate and solve SUDOKU games in Org tables
 
-
 
-;; Copyright (C) 2012 Free Software Foundation, Inc.
 
+;; Copyright (C) 2011 Free Software Foundation, Inc.
 
 ;;
 
 ;;
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 
 ;; Keywords: outlines, hypermedia, calendar, wp, games
 
 ;; Keywords: outlines, hypermedia, calendar, wp, games
 
@@ -127,7 +126,7 @@ This works by solving the whole game, then inserting only the single field."
 
     (setq game (org-sudoku-solve-game game))
 
     (setq game (org-sudoku-solve-game game))
 
     (if game
 
     (if game
 
 	(progn
 
 	(progn
 
-	  (org-table-put i j (number-to-string
 
+	  (org-table-put i j (number-to-string 
 			      (nth 1 (assoc (cons i j) game)))
 
 			      (nth 1 (assoc (cons i j) game)))
 
 			 'align)
 
 			 'align)
 
 	  (org-table-goto-line i)
 
 	  (org-table-goto-line i)
 
@@ -140,7 +139,7 @@ This works by solving the whole game, then inserting only the single field."
 
   "Interpret table at point as sudoku game and read it.
 
   "Interpret table at point as sudoku game and read it.
 
 A game structure is returned."
 
 A game structure is returned."
 
   (let (b e g i j game)
 
   (let (b e g i j game)
 
-
 
+    
     (org-table-goto-line 1)
 
     (org-table-goto-line 1)
 
     (org-table-goto-column 1)
 
     (org-table-goto-column 1)
 
     (setq b (point))
 
     (setq b (point))

+ 4 - 4
contrib/lisp/org-toc.el
View File 

@@ -278,7 +278,7 @@ specified, then make `org-toc-recenter' use this value."
 
 ;;; Navigation functions:
 
 ;;; Navigation functions:
 
 (defun org-toc-goto (&optional jump cycle)
 
 (defun org-toc-goto (&optional jump cycle)
 
   "From Org TOC buffer, follow the targeted subtree in the Org window.
 
   "From Org TOC buffer, follow the targeted subtree in the Org window.
 
-If JUMP is non-nil, go to the base buffer.
 
+If JUMP is non-nil, go to the base buffer.  
 If JUMP is 'delete, go to the base buffer and delete other windows.
 
 If JUMP is 'delete, go to the base buffer and delete other windows.
 
 If CYCLE is non-nil, cycle the targeted subtree in the Org window."
 
 If CYCLE is non-nil, cycle the targeted subtree in the Org window."
 
   (interactive)
 
   (interactive)
 
@@ -459,15 +459,15 @@ status."
 
 (defun org-toc-help ()
 
 (defun org-toc-help ()
 
   "Display a quick help message in the echo-area for `org-toc-mode'."
 
   "Display a quick help message in the echo-area for `org-toc-mode'."
 
   (interactive)
 
   (interactive)
 
-  (let ((st-start 0)
 
+  (let ((st-start 0) 
 	(help-message
 
 	(help-message
 
 	 "\[space\]   show heading                     \[1-4\] hide headlines below this level
 
 	 "\[space\]   show heading                     \[1-4\] hide headlines below this level
 
 \[TAB\]     jump to heading                  \[f\]   toggle follow mode (currently %s)
 
 \[TAB\]     jump to heading                  \[f\]   toggle follow mode (currently %s)
 
 \[return\]  jump and delete others windows   \[i\]   toggle info mode (currently %s)
 
 \[return\]  jump and delete others windows   \[i\]   toggle info mode (currently %s)
 
 \[S-TAB\]   cycle subtree (in Org)           \[S\]   toggle show subtree mode (currently %s)
 
 \[S-TAB\]   cycle subtree (in Org)           \[S\]   toggle show subtree mode (currently %s)
 
-\[C-S-TAB\] global cycle (in Org)            \[r\]   toggle recenter mode (currently %s)
 
+\[C-S-TAB\] global cycle (in Org)            \[r\]   toggle recenter mode (currently %s)   
 \[:\]       cycle subtree (in TOC)           \[c\]   toggle column view (currently %s)
 
 \[:\]       cycle subtree (in TOC)           \[c\]   toggle column view (currently %s)
 
-\[n/p\]     next/previous heading            \[s\]   save TOC configuration
 
+\[n/p\]     next/previous heading            \[s\]   save TOC configuration 
 \[q\]       quit the TOC                     \[g\]   restore last TOC configuration"))
 
 \[q\]       quit the TOC                     \[g\]   restore last TOC configuration"))
 
     (while (string-match "\\[[^]]+\\]" help-message st-start)
 
     (while (string-match "\\[[^]]+\\]" help-message st-start)
 
       (add-text-properties (match-beginning 0)
 
       (add-text-properties (match-beginning 0)

+ 1 - 1
contrib/lisp/org-track.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; org-track.el --- Track the most recent Org-mode version available.
 
 ;;; org-track.el --- Track the most recent Org-mode version available.
 
 ;;
 
 ;;
 
-;; Copyright (C) 2009-2012
 
+;; Copyright (C) 2009-2011
 
 ;;   Free Software Foundation, Inc.
 
 ;;   Free Software Foundation, Inc.
 
 ;;
 
 ;;
 
 ;; Author: Bastien Guerry <bzg at altern dot org>
 
 ;; Author: Bastien Guerry <bzg at altern dot org>

+ 3 - 3
contrib/lisp/org-wikinodes.el
View File 

@@ -174,7 +174,7 @@ setting of `org-wikinodes-create-targets'."
 
 	(message "New Wiki target `%s' created in current buffer"
 
 	(message "New Wiki target `%s' created in current buffer"
 
 		 target))))))
 
 		 target))))))
 
 
 
-;;; The target cache
 
+;;; The target cache 
 
 
 (defvar org-wikinodes-directory-targets-cache nil)
 
 (defvar org-wikinodes-directory-targets-cache nil)
 
 
 
@@ -206,7 +206,7 @@ setting of `org-wikinodes-create-targets'."
 
 	(while (re-search-forward re nil t)
 
 	(while (re-search-forward re nil t)
 
 	  (push (org-match-string-no-properties 4) targets))))
 
 	  (push (org-match-string-no-properties 4) targets))))
 
     (nreverse targets)))
 
     (nreverse targets)))
 
-
 
+		    
 (defun org-wikinodes-get-links-for-directory (dir)
 
 (defun org-wikinodes-get-links-for-directory (dir)
 
   "Return an alist that connects wiki links to files in directory DIR."
 
   "Return an alist that connects wiki links to files in directory DIR."
 
   (let ((files (directory-files dir nil "\\`[^.#].*\\.org\\'"))
 
   (let ((files (directory-files dir nil "\\`[^.#].*\\.org\\'"))
 
@@ -328,7 +328,7 @@ with working links."
 
 	(setcdr m (cons '(org-wikinodes-activate-links) (cdr m)))
 
 	(setcdr m (cons '(org-wikinodes-activate-links) (cdr m)))
 
       (message
 
       (message
 
        "Failed to add wikinodes to `org-font-lock-extra-keywords'."))))
 
        "Failed to add wikinodes to `org-font-lock-extra-keywords'."))))
 
-
 
+  
 (add-hook 'org-font-lock-set-keywords-hook
 
 (add-hook 'org-font-lock-set-keywords-hook
 
 	  'org-wikinodes-add-to-font-lock-keywords)
 
 	  'org-wikinodes-add-to-font-lock-keywords)

+ 1 - 1
contrib/lisp/org-xhtml.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; org-xhtml.el --- XHTML export for Org-mode (uses org-lparse)
 
 ;;; org-xhtml.el --- XHTML export for Org-mode (uses org-lparse)
 
 
 
-;; Copyright (C) 2004-2012 Free Software Foundation, Inc.
 
+;; Copyright (C) 2004-2011 Free Software Foundation, Inc.
 
 
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 
 ;; Keywords: outlines, hypermedia, calendar, wp
 
 ;; Keywords: outlines, hypermedia, calendar, wp

+ 4 - 4
contrib/lisp/org2rem.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; org2rem.el --- Convert org appointments into reminders
 
 ;;; org2rem.el --- Convert org appointments into reminders
 
 
 
-;; Copyright (C) 2006-2012 Free Software Foundation, Inc.
 
+;; Copyright (C) 2006-2011 Free Software Foundation, Inc.
 
 
 
 ;; Author: Bastien Guerry and Shatad Pratap
 
 ;; Author: Bastien Guerry and Shatad Pratap
 
 ;; Keywords: outlines, hypermedia, calendar, wp
 
 ;; Keywords: outlines, hypermedia, calendar, wp
 
@@ -402,7 +402,7 @@ REM %s %s MSG EVENT:%s%s %s%s%%
 
 	      (insert sexp "\n"))))
 
 	      (insert sexp "\n"))))
 
 	;; (princ (org-diary-to-rem-string sexp-buffer))
 
 	;; (princ (org-diary-to-rem-string sexp-buffer))
 
 	(kill-buffer sexp-buffer))
 
 	(kill-buffer sexp-buffer))
 
-
 
+      
       (when org-remind-include-todo
 
       (when org-remind-include-todo
 
 	(setq prefix "TODO-")
 
 	(setq prefix "TODO-")
 
 	(goto-char (point-min))
 
 	(goto-char (point-min))
 
@@ -450,7 +450,7 @@ REM %s %s MSG EVENT:%s%s %s%s%%
 
                                 (if dos diff-days 0)
 
                                 (if dos diff-days 0)
 
                               (if dos 0 diff-days))
 
                               (if dos 0 diff-days))
 
                           1000)))
 
                           1000)))
 
-
 
+              
               (if (and (numberp org-rem-aw) (> org-rem-aw 0))
 
               (if (and (numberp org-rem-aw) (> org-rem-aw 0))
 
                   (setq remind-aw (+ (or remind-aw 0) org-rem-aw)))
 
                   (setq remind-aw (+ (or remind-aw 0) org-rem-aw)))
 
 
 
@@ -470,7 +470,7 @@ REM %s %s MSG EVENT:%s%s %s%s%%
 
               (and due (setq due (org-rem-ts-to-remind-date-type due)))
 
               (and due (setq due (org-rem-ts-to-remind-date-type due)))
 
               (and start (setq start (org-rem-ts-to-remind-date-type start)))
 
               (and start (setq start (org-rem-ts-to-remind-date-type start)))
 
               (and remind-ew (setq remind-ew (org-rem-ts-to-remind-date-type remind-ew)))
 
               (and remind-ew (setq remind-ew (org-rem-ts-to-remind-date-type remind-ew)))
 
-
 
+               
 	      (if (string-match org-bracket-link-regexp hd)
 
 	      (if (string-match org-bracket-link-regexp hd)
 
 		  (setq hd (replace-match (if (match-end 3) (match-string 3 hd)
 
 		  (setq hd (replace-match (if (match-end 3) (match-string 3 hd)
 
 					    (match-string 1 hd))
 
 					    (match-string 1 hd))

+ 1 - 1
contrib/lisp/orgtbl-sqlinsert.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; orgtbl-sqlinsert.el --- orgtbl to SQL insert statements.
 
 ;;; orgtbl-sqlinsert.el --- orgtbl to SQL insert statements.
 
 
 
-;; Copyright (C) 2008-2012  Free Software Foundation
 
+;; Copyright (C) 2008-2011  Free Software Foundation
 
 
 
 ;; Author: Jason Riedy <jason@acm.org>
 
 ;; Author: Jason Riedy <jason@acm.org>
 
 ;; Keywords: org, tables, sql
 
 ;; Keywords: org, tables, sql

+ 1 - 0
contrib/lisp/test-org-export-preproc.el
View File 

@@ -36,3 +36,4 @@
 
       (org-pop-to-buffer-same-window "*preproc-temp*")
 
       (org-pop-to-buffer-same-window "*preproc-temp*")
 
       (point-max)
 
       (point-max)
 
       (insert string))))
 
       (insert string))))
 
+

+ 1 - 1
contrib/scripts/StartOzServer.oz
View File 

@@ -1,5 +1,5 @@
 
 %%% *************************************************************
 
 %%% *************************************************************
 
-%%% Copyright (C) 2009-2012 Torsten Anders (www.torsten-anders.de) 
+%%% Copyright (C) 2009 Torsten Anders (www.torsten-anders.de) 
 %%% This program is free software; you can redistribute it and/or
 
 %%% This program is free software; you can redistribute it and/or
 
 %%% modify it under the terms of the GNU General Public License
 
 %%% modify it under the terms of the GNU General Public License
 
 %%% as published by the Free Software Foundation; either version 2
 
 %%% as published by the Free Software Foundation; either version 2

+ 1 - 1
contrib/scripts/org2hpda
View File 

@@ -1,5 +1,5 @@
 
 # org2hpda - a small utility to generate hipster pda style printouts from org mode 
 # org2hpda - a small utility to generate hipster pda style printouts from org mode 
-# Copyright (C) 2007-2012  Christian Egli
 
+# Copyright (C) 2007  Christian Egli
 
 # 
 # 
 # Version: 0.6
 
 # Version: 0.6
 
 #
 
 #

+ 117 - 176
doc/org.texi
View File 

@@ -265,7 +265,7 @@
 
 @copying
 
 @copying
 
 This manual is for Org version @value{VERSION}.
 
 This manual is for Org version @value{VERSION}.
 
 
 
-Copyright @copyright{} 2004-2012  Free Software Foundation, Inc.
 
+Copyright @copyright{} 2004-2011  Free Software Foundation, Inc.
 
 
 
 @quotation
 
 @quotation
 
 Permission is granted to copy, distribute and/or modify this document
 
 Permission is granted to copy, distribute and/or modify this document
 
@@ -717,7 +717,6 @@ Specific header arguments
 
 * rownames::                    Handle row names in tables
 
 * rownames::                    Handle row names in tables
 
 * shebang::                     Make tangled files executable
 
 * shebang::                     Make tangled files executable
 
 * eval::                        Limit evaluation of specific code blocks
 
 * eval::                        Limit evaluation of specific code blocks
 
-* wrap::                        Mark source block evaluation results
 
 
 
 Miscellaneous
 
 Miscellaneous
 
 
 
@@ -1081,7 +1080,7 @@ attach it to your bug report.
 
 @node Conventions,  , Feedback, Introduction
 
 @node Conventions,  , Feedback, Introduction
 
 @section Typesetting conventions used in this manual
 
 @section Typesetting conventions used in this manual
 
 
 
-Org uses three types of keywords: TODO keywords, tags and property
 
+Org uses three types of keywords: TODO keywords, tags, and property
 
 names.  In this manual we use the following conventions:
 
 names.  In this manual we use the following conventions:
 
 
 
 @table @code
 
 @table @code
 
@@ -1099,14 +1098,7 @@ User-defined properties are capitalized; built-in properties with
 
 special meaning are written with all capitals.
 
 special meaning are written with all capitals.
 
 @end table
 
 @end table
 
 
 
-Moreover, Org uses @i{option keywords} (like @code{#+TITLE} to set the title)
 
-and @i{environment keywords} (like @code{#+BEGIN_HTML} to start a @code{HTML}
 
-environment).  They are written in uppercase in the manual to enhance its
 
-readability, but you can use lowercase in your Org files@footnote{Easy
 
-templates insert lowercase keywords and Babel dynamically inserts
 
-@code{#+results}.}
 
-
 
-The manual lists both the keys and the corresponding commands for accessing a
 
+The manual lists both the keys and the corresponding commands for accessing
 
 functionality.  Org mode often uses the same key for different functions,
 
 functionality.  Org mode often uses the same key for different functions,
 
 depending on context.  The command that is bound to such keys has a generic
 
 depending on context.  The command that is bound to such keys has a generic
 
 name, like @code{org-metaright}.  In the manual we will, wherever possible,
 
 name, like @code{org-metaright}.  In the manual we will, wherever possible,
 
@@ -1166,8 +1158,7 @@ Headlines define the structure of an outline tree.  The headlines in Org
 
 start with one or more stars, on the left margin@footnote{See the variables
 
 start with one or more stars, on the left margin@footnote{See the variables
 
 @code{org-special-ctrl-a/e}, @code{org-special-ctrl-k}, and
 
 @code{org-special-ctrl-a/e}, @code{org-special-ctrl-k}, and
 
 @code{org-ctrl-k-protect-subtree} to configure special behavior of @kbd{C-a},
 
 @code{org-ctrl-k-protect-subtree} to configure special behavior of @kbd{C-a},
 
-@kbd{C-e}, and @kbd{C-k} in headlines.} @footnote{Clocking only works with
 
-headings indented less then 30 stars.}.  For example:
 
+@kbd{C-e}, and @kbd{C-k} in headlines.}.  For example:
 
 
 
 @example
 
 @example
 
 * Top level headline
 
 * Top level headline
 
@@ -1437,7 +1428,7 @@ more details, see the docstring of the command
 
 @code{org-clone-subtree-with-time-shift}.
 
 @code{org-clone-subtree-with-time-shift}.
 
 @orgcmd{C-c C-w,org-refile}
 
 @orgcmd{C-c C-w,org-refile}
 
 Refile entry or region to a different location.  @xref{Refiling notes}.
 
 Refile entry or region to a different location.  @xref{Refiling notes}.
 
-@orgcmd{C-c ^,org-sort}
 
+@orgcmd{C-c ^,org-sort-entries-or-items}
 
 Sort same-level entries.  When there is an active region, all entries in the
 
 Sort same-level entries.  When there is an active region, all entries in the
 
 region will be sorted.  Otherwise the children of the current headline are
 
 region will be sorted.  Otherwise the children of the current headline are
 
 sorted.  The command prompts for the sorting method, which can be
 
 sorted.  The command prompts for the sorting method, which can be
 
@@ -1764,13 +1755,11 @@ numerically, alphabetically, by time, or by custom function.
 
 @cindex visibility cycling, drawers
 
 @cindex visibility cycling, drawers
 
 
 
 @vindex org-drawers
 
 @vindex org-drawers
 
-@cindex org-insert-drawer
 
-@kindex C-c C-x d
 
 Sometimes you want to keep information associated with an entry, but you
 
 Sometimes you want to keep information associated with an entry, but you
 
 normally don't want to see it.  For this, Org mode has @emph{drawers}.
 
 normally don't want to see it.  For this, Org mode has @emph{drawers}.
 
 Drawers need to be configured with the variable
 
 Drawers need to be configured with the variable
 
-@code{org-drawers}@footnote{You can define additional drawers on a
 
-per-file basis with a line like @code{#+DRAWERS: HIDDEN STATE}}.  Drawers
 
+@code{org-drawers}@footnote{You can define drawers on a per-file basis
 
+with a line like @code{#+DRAWERS: HIDDEN PROPERTIES STATE}}.  Drawers
 
 look like this:
 
 look like this:
 
 
 
 @example
 
 @example
 
@@ -1782,13 +1771,6 @@ look like this:
 
    After the drawer.
 
    After the drawer.
 
 @end example
 
 @end example
 
 
 
-You can interactively insert drawers at point by calling
 
-@code{org-insert-drawer}, which is bound to @key{C-c C-x d}.  With an active
 
-region, this command will put the region inside the drawer.  With a prefix
 
-argument, this command calls @code{org-insert-property-drawer} and add a
 
-property drawer right below the current headline.  Completion over drawer
 
-keywords is also possible using @key{M-TAB}.
 
-
 
 Visibility cycling (@pxref{Visibility cycling}) on the headline will hide and
 
 Visibility cycling (@pxref{Visibility cycling}) on the headline will hide and
 
 show the entry, but keep the drawer collapsed to a single line.  In order to
 
 show the entry, but keep the drawer collapsed to a single line.  In order to
 
 look inside the drawer, you need to move the cursor to the drawer line and
 
 look inside the drawer, you need to move the cursor to the drawer line and
 
@@ -3243,8 +3225,6 @@ mailto:adent@@galaxy.net                   @r{Mail link}
 
 vm:folder                                 @r{VM folder link}
 
 vm:folder                                 @r{VM folder link}
 
 vm:folder#id                              @r{VM message link}
 
 vm:folder#id                              @r{VM message link}
 
 vm://myself@@some.where.org/folder#id      @r{VM on remote machine}
 
 vm://myself@@some.where.org/folder#id      @r{VM on remote machine}
 
-vm-imap:account:folder                    @r{VM IMAP folder link}
 
-vm-imap:account:folder#id                 @r{VM IMAP message link}
 
 wl:folder                                 @r{WANDERLUST folder link}
 
 wl:folder                                 @r{WANDERLUST folder link}
 
 wl:folder#id                              @r{WANDERLUST message link}
 
 wl:folder#id                              @r{WANDERLUST message link}
 
 mhe:folder                                @r{MH-E folder link}
 
 mhe:folder                                @r{MH-E folder link}
 
@@ -4083,11 +4063,9 @@ time-stamped note for a change.  These records will be inserted after the
 
 headline as an itemized list, newest first@footnote{See the variable
 
 headline as an itemized list, newest first@footnote{See the variable
 
 @code{org-log-states-order-reversed}}.  When taking a lot of notes, you might
 
 @code{org-log-states-order-reversed}}.  When taking a lot of notes, you might
 
 want to get the notes out of the way into a drawer (@pxref{Drawers}).
 
 want to get the notes out of the way into a drawer (@pxref{Drawers}).
 
-Customize the variable @code{org-log-into-drawer} to get this behavior---the
 
-recommended drawer for this is called @code{LOGBOOK}@footnote{Note that the
 
-@code{LOGBOOK} drawer is unfolded when pressing @key{SPC} in the agenda to
 
-show an entry---use @key{C-u SPC} to keep it folded here}.  You can also
 
-overrule the setting of this variable for a subtree by setting a
 
+Customize the variable @code{org-log-into-drawer} to get this
 
+behavior---the recommended drawer for this is called @code{LOGBOOK}.  You can
 
+also overrule the setting of this variable for a subtree by setting a
 
 @code{LOG_INTO_DRAWER} property.
 
 @code{LOG_INTO_DRAWER} property.
 
 
 
 Since it is normally too much to record a note for every state, Org mode
 
 Since it is normally too much to record a note for every state, Org mode
 
@@ -4892,8 +4870,8 @@ in the current file will be offered as possible completions.
 
 @orgcmd{C-c C-x p,org-set-property}
 
 @orgcmd{C-c C-x p,org-set-property}
 
 Set a property.  This prompts for a property name and a value.  If
 
 Set a property.  This prompts for a property name and a value.  If
 
 necessary, the property drawer is created as well.
 
 necessary, the property drawer is created as well.
 
-@item C-u M-x org-insert-drawer
 
-@cindex org-insert-drawer
 
+@item M-x org-insert-property-drawer
 
+@findex org-insert-property-drawer
 
 Insert a property drawer into the current entry.  The drawer will be
 
 Insert a property drawer into the current entry.  The drawer will be
 
 inserted early in the entry, but after the lines with planning
 
 inserted early in the entry, but after the lines with planning
 
 information like deadlines.
 
 information like deadlines.
 
@@ -5918,14 +5896,12 @@ created for this purpose, it is described in @ref{Structure editing}.
 
 @cindex time clocking
 
 @cindex time clocking
 
 
 
 Org mode allows you to clock the time you spend on specific tasks in a
 
 Org mode allows you to clock the time you spend on specific tasks in a
 
-project.  When you start working on an item, you can start the clock.  When
 
-you stop working on that task, or when you mark the task done, the clock is
 
-stopped and the corresponding time interval is recorded.  It also computes
 
-the total time spent on each subtree@footnote{Clocking only works if all
 
-headings are indented with less than 30 stars.  This is a hardcoded
 
-limitation of `lmax' in `org-clock-sum'.} of a project.  And it remembers a
 
-history or tasks recently clocked, to that you can jump quickly between a
 
-number of tasks absorbing your time.
 
+project.  When you start working on an item, you can start the clock.
 
+When you stop working on that task, or when you mark the task done, the
 
+clock is stopped and the corresponding time interval is recorded.  It
 
+also computes the total time spent on each subtree of a project.  And it
 
+remembers a history or tasks recently clocked, to that you can jump quickly
 
+between a number of tasks absorbing your time.
 
 
 
 To save the clock history across Emacs sessions, use
 
 To save the clock history across Emacs sessions, use
 
 @lisp
 
 @lisp
 
@@ -6704,21 +6680,21 @@ similar way.}:
 
 
 
 @vindex org-from-is-user-regexp
 
 @vindex org-from-is-user-regexp
 
 @smallexample
 
 @smallexample
 
-Link type                        |  Available keywords
 
----------------------------------+----------------------------------------------
 
-bbdb                             |  %:name %:company
 
-irc                              |  %:server %:port %:nick
 
-vm, vm-imap, wl, mh, mew, rmail  |  %:type %:subject %:message-id
 
-                                 |  %:from %:fromname %:fromaddress
 
-                                 |  %:to   %:toname   %:toaddress
 
-                                 |  %:date @r{(message date header field)}
 
-                                 |  %:date-timestamp @r{(date as active timestamp)}
 
-                                 |  %:date-timestamp-inactive @r{(date as inactive timestamp)}
 
-                                 |  %:fromto @r{(either "to NAME" or "from NAME")@footnote{This will always be the other, not the user.  See the variable @code{org-from-is-user-regexp}.}}
 
-gnus                             |  %:group, @r{for messages also all email fields}
 
-w3, w3m                          |  %:url
 
-info                             |  %:file %:node
 
-calendar                         |  %:date
 
+Link type               |  Available keywords
 
+------------------------+----------------------------------------------
 
+bbdb                    |  %:name %:company
 
+irc                     |  %:server %:port %:nick
 
+vm, wl, mh, mew, rmail  |  %:type %:subject %:message-id
 
+                        |  %:from %:fromname %:fromaddress
 
+                        |  %:to   %:toname   %:toaddress
 
+                        |  %:date @r{(message date header field)}
 
+                        |  %:date-timestamp @r{(date as active timestamp)}
 
+                        |  %:date-timestamp-inactive @r{(date as inactive timestamp)}
 
+                        |  %:fromto @r{(either "to NAME" or "from NAME")@footnote{This will always be the other, not the user.  See the variable @code{org-from-is-user-regexp}.}}
 
+gnus                    |  %:group, @r{for messages also all email fields}
 
+w3, w3m                 |  %:url
 
+info                    |  %:file %:node
 
+calendar                |  %:date
 
 @end smallexample
 
 @end smallexample
 
 
 
 @noindent
 
 @noindent
 
@@ -9041,7 +9017,7 @@ the object with @code{\ref@{tab:basic-data@}}:
 
 
 
 @example
 
 @example
 
 #+CAPTION: This is the caption for the next table (or link)
 
 #+CAPTION: This is the caption for the next table (or link)
 
-#+LABEL:   tab:basic-data
 
+#+LABEL:   tbl:basic-data
 
    | ... | ...|
 
    | ... | ...|
 
    |-----|----|
 
    |-----|----|
 
 @end example
 
 @end example
 
@@ -9655,7 +9631,7 @@ Insert template with export options, see example below.
 
 @cindex #+EXPORT_SELECT_TAGS
 
 @cindex #+EXPORT_SELECT_TAGS
 
 @cindex #+EXPORT_EXCLUDE_TAGS
 
 @cindex #+EXPORT_EXCLUDE_TAGS
 
 @cindex #+XSLT
 
 @cindex #+XSLT
 
-@cindex #+LaTeX_HEADER
 
+@cindex #+LATEX_HEADER
 
 @vindex user-full-name
 
 @vindex user-full-name
 
 @vindex user-mail-address
 
 @vindex user-mail-address
 
 @vindex org-export-default-language
 
 @vindex org-export-default-language
 
@@ -9675,7 +9651,7 @@ Insert template with export options, see example below.
 
                @r{You need to confirm using these, or configure @code{org-export-allow-BIND}}
 
                @r{You need to confirm using these, or configure @code{org-export-allow-BIND}}
 
 #+LINK_UP:     the ``up'' link of an exported page
 
 #+LINK_UP:     the ``up'' link of an exported page
 
 #+LINK_HOME:   the ``home'' link of an exported page
 
 #+LINK_HOME:   the ``home'' link of an exported page
 
-#+LaTeX_HEADER: extra line(s) for the @LaTeX{} header, like \usepackage@{xyz@}
 
+#+LATEX_HEADER: extra line(s) for the @LaTeX{} header, like \usepackage@{xyz@}
 
 #+EXPORT_SELECT_TAGS:   Tags that select a tree for export
 
 #+EXPORT_SELECT_TAGS:   Tags that select a tree for export
 
 #+EXPORT_EXCLUDE_TAGS:  Tags that exclude a tree from export
 
 #+EXPORT_EXCLUDE_TAGS:  Tags that exclude a tree from export
 
 #+XSLT:        the XSLT stylesheet used by DocBook exporter to generate FO file
 
 #+XSLT:        the XSLT stylesheet used by DocBook exporter to generate FO file
 
@@ -10347,11 +10323,11 @@ By default, the @LaTeX{} output uses the class @code{article}.
 
 @vindex org-export-latex-classes
 
 @vindex org-export-latex-classes
 
 @vindex org-export-latex-default-packages-alist
 
 @vindex org-export-latex-default-packages-alist
 
 @vindex org-export-latex-packages-alist
 
 @vindex org-export-latex-packages-alist
 
-@cindex #+LaTeX_HEADER
 
-@cindex #+LaTeX_CLASS
 
-@cindex #+LaTeX_CLASS_OPTIONS
 
-@cindex property, LaTeX_CLASS
 
-@cindex property, LaTeX_CLASS_OPTIONS
 
+@cindex #+LATEX_HEADER
 
+@cindex #+LATEX_CLASS
 
+@cindex #+LATEX_CLASS_OPTIONS
 
+@cindex property, LATEX_CLASS
 
+@cindex property, LATEX_CLASS_OPTIONS
 
 You can change this globally by setting a different value for
 
 You can change this globally by setting a different value for
 
 @code{org-export-latex-default-class} or locally by adding an option like
 
 @code{org-export-latex-default-class} or locally by adding an option like
 
 @code{#+LaTeX_CLASS: myclass} in your file, or with a @code{:LaTeX_CLASS:}
 
 @code{#+LaTeX_CLASS: myclass} in your file, or with a @code{:LaTeX_CLASS:}
 
@@ -10361,22 +10337,11 @@ defines a header template for each class@footnote{Into which the values of
 
 @code{org-export-latex-default-packages-alist} and
 
 @code{org-export-latex-default-packages-alist} and
 
 @code{org-export-latex-packages-alist} are spliced.}, and allows you to
 
 @code{org-export-latex-packages-alist} are spliced.}, and allows you to
 
 define the sectioning structure for each class.  You can also define your own
 
 define the sectioning structure for each class.  You can also define your own
 
-classes there.  @code{#+LaTeX_CLASS_OPTIONS} or a @code{:LaTeX_CLASS_OPTIONS:}
 
-property can specify the options for the @code{\documentclass} macro.  The
 
-options to documentclass have to be provided, as expected by @LaTeX{}, within
 
-square brackets.  You can also use @code{#+LaTeX_HEADER: \usepackage@{xyz@}}
 
-to add lines to the header.  See the docstring of
 
-@code{org-export-latex-classes} for more information.  An example is shown
 
-below.
 
-
 
-@example
 
-#+LaTeX_CLASS: article
 
-#+LaTeX_CLASS_OPTIONS: [a4paper]
 
-#+LaTeX_HEADER: \usepackage@{xyz@}
 
-
 
-* Headline 1
 
-  some text
 
-@end example
 
+classes there.  @code{#+LaTeX_CLASS_OPTIONS} or a @code{LaTeX_CLASS_OPTIONS}
 
+property can specify the options for the @code{\documentclass} macro.  You
 
+can also use @code{#+LATEX_HEADER: \usepackage@{xyz@}} to add lines to the
 
+header.  See the docstring of @code{org-export-latex-classes} for more
 
+information.
 
 
 
 @node Quoting @LaTeX{} code, Tables in @LaTeX{} export, Header and sectioning, @LaTeX{} and PDF export
 
 @node Quoting @LaTeX{} code, Tables in @LaTeX{} export, Header and sectioning, @LaTeX{} and PDF export
 
 @subsection Quoting @LaTeX{} code
 
 @subsection Quoting @LaTeX{} code
 
@@ -10460,7 +10425,9 @@ add something like @samp{placement=[h!]} to the attributes.  It is to be noted
 
 this option can be used with tables as well@footnote{One can also take
 
 this option can be used with tables as well@footnote{One can also take
 
 advantage of this option to pass other, unrelated options into the figure or
 
 advantage of this option to pass other, unrelated options into the figure or
 
 table environment.  For an example see the section ``Exporting org files'' in
 
 table environment.  For an example see the section ``Exporting org files'' in
 
-@url{http://orgmode.org/worg/org-hacks.html}}.
 
+@url{http://orgmode.org/worg/org-hacks.html}}.  For example the
 
+@code{#+ATTR_LaTeX:} line below is exported as the @code{figure} environment
 
+below it.
 
 
 
 If you would like to let text flow around the image, add the word @samp{wrap}
 
 If you would like to let text flow around the image, add the word @samp{wrap}
 
 to the @code{#+ATTR_LaTeX:} line, which will make the figure occupy the left
 
 to the @code{#+ATTR_LaTeX:} line, which will make the figure occupy the left
 
@@ -10547,7 +10514,7 @@ transitions.
 
 Frames will automatically receive a @code{fragile} option if they contain
 
 Frames will automatically receive a @code{fragile} option if they contain
 
 source code that uses the verbatim environment.  Special @file{beamer}
 
 source code that uses the verbatim environment.  Special @file{beamer}
 
 specific code can be inserted using @code{#+BEAMER:} and
 
 specific code can be inserted using @code{#+BEAMER:} and
 
-@code{#+BEGIN_BEAMER...#+END_BEAMER} constructs, similar to other export
 
+@code{#+BEGIN_beamer...#+end_beamer} constructs, similar to other export
 
 backends, but with the difference that @code{#+LaTeX:} stuff will be included
 
 backends, but with the difference that @code{#+LaTeX:} stuff will be included
 
 in the presentation as well.
 
 in the presentation as well.
 
 
 
@@ -12310,7 +12277,7 @@ publish it as @file{theindex.html}.
 
 @end multitable
 
 @end multitable
 
 
 
 The file will be created when first publishing a project with the
 
 The file will be created when first publishing a project with the
 
-@code{:makeindex} set.  The file only contains a statement @code{#+INCLUDE:
 
+@code{:makeindex} set.  The file only contains a statement @code{#+include:
 
 "theindex.inc"}.  You can then build around this include statement by adding
 
 "theindex.inc"}.  You can then build around this include statement by adding
 
 a title, style information, etc.
 
 a title, style information, etc.
 
 
 
@@ -12698,10 +12665,10 @@ Org mode buffer.  The results of evaluation are placed following a line that
 
 begins by default with @code{#+RESULTS} and optionally a cache identifier
 
 begins by default with @code{#+RESULTS} and optionally a cache identifier
 
 and/or the name of the evaluated code block.  The default value of
 
 and/or the name of the evaluated code block.  The default value of
 
 @code{#+RESULTS} can be changed with the customizable variable
 
 @code{#+RESULTS} can be changed with the customizable variable
 
-@code{org-babel-results-keyword}.
 
+@code{org-babel-results-keyword}. 
 
 
 By default, the evaluation facility is only enabled for Lisp code blocks
 
 By default, the evaluation facility is only enabled for Lisp code blocks
 
-specified as @code{emacs-lisp}.  However, source code blocks in many languages
 
+specified as @code{emacs-lisp}. However, source code blocks in many languages
 
 can be evaluated within Org mode (see @ref{Languages} for a list of supported
 
 can be evaluated within Org mode (see @ref{Languages} for a list of supported
 
 languages and @ref{Structure of code blocks} for information on the syntax
 
 languages and @ref{Structure of code blocks} for information on the syntax
 
 used to define a code block).
 
 used to define a code block).
 
@@ -12715,8 +12682,8 @@ evaluation from the @kbd{C-c C-c} key binding.}.  This will call the
 
 its results into the Org mode buffer.
 
 its results into the Org mode buffer.
 
 @cindex #+CALL
 
 @cindex #+CALL
 
 
 
-It is also possible to evaluate named code blocks from anywhere in an Org
 
-mode buffer or an Org mode table.  Live code blocks located in the current
 
+It is also possible to evaluate named code blocks from anywhere in an
 
+Org mode buffer or an Org mode table. Live code blocks located in the current
 
 Org mode buffer or in the ``Library of Babel'' (see @ref{Library of Babel})
 
 Org mode buffer or in the ``Library of Babel'' (see @ref{Library of Babel})
 
 can be executed.  Named code blocks can be executed with a separate
 
 can be executed.  Named code blocks can be executed with a separate
 
 @code{#+CALL:} line or inline within a block of text.
 
 @code{#+CALL:} line or inline within a block of text.
 
@@ -13010,7 +12977,7 @@ Multi-line header arguments on an un-named code block:
 
    (message "data1:%S, data2:%S" data1 data2)
 
    (message "data1:%S, data2:%S" data1 data2)
 
  #+END_SRC
 
  #+END_SRC
 
 
 
- #+RESULTS:
 
+ #+results:
 
  : data1:1, data2:2
 
  : data1:1, data2:2
 
 @end example
 
 @end example
 
 
 
@@ -13022,7 +12989,7 @@ Multi-line header arguments on a named code block:
 
      (message "data:%S" data)
 
      (message "data:%S" data)
 
    #+END_SRC
 
    #+END_SRC
 
 
 
-   #+RESULTS: named-block
 
+   #+results: named-block
 
    : data:2
 
    : data:2
 
 @end example
 
 @end example
 
 
 
@@ -13080,7 +13047,6 @@ argument in lowercase letters.  The following header arguments are defined:
 
 * rownames::                    Handle row names in tables
 
 * rownames::                    Handle row names in tables
 
 * shebang::                     Make tangled files executable
 
 * shebang::                     Make tangled files executable
 
 * eval::                        Limit evaluation of specific code blocks
 
 * eval::                        Limit evaluation of specific code blocks
 
-* wrap::                        Mark source block evaluation results
 
 @end menu
 
 @end menu
 
 
 
 Additional header arguments are defined on a language-specific basis, see
 
 Additional header arguments are defined on a language-specific basis, see
 
@@ -13095,7 +13061,7 @@ syntax used to specify arguments is the same across all languages.  In every
 
 case, variables require a default value when they are declared.
 
 case, variables require a default value when they are declared.
 
 
 
 The values passed to arguments can either be literal values, references, or
 
 The values passed to arguments can either be literal values, references, or
 
-Emacs Lisp code (see @ref{var, Emacs Lisp evaluation of variables}).  References
 
+Emacs Lisp code (see @ref{var, Emacs Lisp evaluation of variables}). References
 
 include anything in the Org mode file that takes a @code{#+NAME:},
 
 include anything in the Org mode file that takes a @code{#+NAME:},
 
 @code{#+TBLNAME:}, or @code{#+RESULTS:} line.  This includes tables, lists,
 
 @code{#+TBLNAME:}, or @code{#+RESULTS:} line.  This includes tables, lists,
 
 @code{#+BEGIN_EXAMPLE} blocks, other code blocks, and the results of other
 
 @code{#+BEGIN_EXAMPLE} blocks, other code blocks, and the results of other
 
@@ -13134,7 +13100,7 @@ an Org mode table named with either a @code{#+NAME:} or @code{#+TBLNAME:} line
 
 (length table)
 
 (length table)
 
 #+END_SRC
 
 #+END_SRC
 
 
 
-#+RESULTS: table-length
 
+#+results: table-length
 
 : 4
 
 : 4
 
 @end example
 
 @end example
 
 
 
@@ -13153,7 +13119,7 @@ carried through to the source code block)
 
   (print x)
 
   (print x)
 
 #+END_SRC
 
 #+END_SRC
 
 
 
-#+RESULTS:
 
+#+results:
 
 | simple | list |
 
 | simple | list |
 
 @end example
 
 @end example
 
 
 
@@ -13166,7 +13132,7 @@ optionally followed by parentheses
 
 (* 2 length)
 
 (* 2 length)
 
 #+END_SRC
 
 #+END_SRC
 
 
 
-#+RESULTS:
 
+#+results:
 
 : 8
 
 : 8
 
 @end example
 
 @end example
 
 
 
@@ -13181,7 +13147,7 @@ code block name using standard function call syntax
 
 (* 2 input)
 
 (* 2 input)
 
 #+END_SRC
 
 #+END_SRC
 
 
 
-#+RESULTS: double
 
+#+results: double
 
 : 16
 
 : 16
 
 
 
 #+NAME: squared
 
 #+NAME: squared
 
@@ -13189,7 +13155,7 @@ code block name using standard function call syntax
 
 (* input input)
 
 (* input input)
 
 #+END_SRC
 
 #+END_SRC
 
 
 
-#+RESULTS: squared
 
+#+results: squared
 
 : 4
 
 : 4
 
 @end example
 
 @end example
 
 
 
@@ -13208,7 +13174,7 @@ on two lines
 
   (concatenate 'string x " for you.")
 
   (concatenate 'string x " for you.")
 
 #+END_SRC
 
 #+END_SRC
 
 
 
-#+RESULTS: read-literal-example
 
+#+results: read-literal-example
 
 : A literal example
 
 : A literal example
 
 : on two lines for you.
 
 : on two lines for you.
 
 
 
@@ -13250,7 +13216,7 @@ following example assigns the last cell of the first row the table
 
   data
 
   data
 
 #+END_SRC
 
 #+END_SRC
 
 
 
-#+RESULTS:
 
+#+results:
 
 : a
 
 : a
 
 @end example
 
 @end example
 
 
 
@@ -13271,7 +13237,7 @@ to @code{data}.
 
   data
 
   data
 
 #+END_SRC
 
 #+END_SRC
 
 
 
-#+RESULTS:
 
+#+results:
 
 | 2 | b |
 
 | 2 | b |
 
 | 3 | c |
 
 | 3 | c |
 
 | 4 | d |
 
 | 4 | d |
 
@@ -13293,7 +13259,7 @@ column is referenced.
 
   data
 
   data
 
 #+END_SRC
 
 #+END_SRC
 
 
 
-#+RESULTS:
 
+#+results:
 
 | 1 | 2 | 3 | 4 |
 
 | 1 | 2 | 3 | 4 |
 
 @end example
 
 @end example
 
 
 
@@ -13313,7 +13279,7 @@ another by commas, as shown in the following example.
 
   data
 
   data
 
 #+END_SRC
 
 #+END_SRC
 
 
 
-#+RESULTS:
 
+#+results:
 
 | 11 | 14 | 17 |
 
 | 11 | 14 | 17 |
 
 @end example
 
 @end example
 
 
 
@@ -13346,7 +13312,7 @@ Emacs Lisp, as shown in the following example.
 
   $data
 
   $data
 
 #+END_SRC
 
 #+END_SRC
 
 
 
-#+RESULTS:
 
+#+results:
 
 : (a b c)
 
 : (a b c)
 
 @end example
 
 @end example
 
 
 
@@ -13412,10 +13378,10 @@ The results are interpreted as raw Org mode code and are inserted directly
 
 into the buffer.  If the results look like a table they will be aligned as
 
 into the buffer.  If the results look like a table they will be aligned as
 
 such by Org mode.  E.g., @code{:results value raw}.
 
 such by Org mode.  E.g., @code{:results value raw}.
 
 @item @code{html}
 
 @item @code{html}
 
-Results are assumed to be HTML and will be enclosed in a @code{BEGIN_HTML}
 
+Results are assumed to be HTML and will be enclosed in a @code{begin_html}
 
 block.  E.g., @code{:results value html}.
 
 block.  E.g., @code{:results value html}.
 
 @item @code{latex}
 
 @item @code{latex}
 
-Results assumed to be @LaTeX{} and are enclosed in a @code{BEGIN_LaTeX} block.
 
+Results assumed to be @LaTeX{} and are enclosed in a @code{begin_latex} block.
 
 E.g., @code{:results value latex}.
 
 E.g., @code{:results value latex}.
 
 @item @code{code}
 
 @item @code{code}
 
 Result are assumed to be parsable code and are enclosed in a code block.
 
 Result are assumed to be parsable code and are enclosed in a code block.
 
@@ -13648,34 +13614,21 @@ interpreted language.
 
 @node noweb, noweb-ref, session, Specific header arguments
 
 @node noweb, noweb-ref, session, Specific header arguments
 
 @subsubsection @code{:noweb}
 
 @subsubsection @code{:noweb}
 
 
 
-The @code{:noweb} header argument controls expansion of ``noweb'' syntax
 
-references (see @ref{Noweb reference syntax}) when the code block is
 
-evaluated, tangled, or exported.  The @code{:noweb} header argument can have
 
-one of the five values: @code{no}, @code{yes}, @code{tangle}, or
 
-@code{no-export} @code{strip-export}.
 
+The @code{:noweb} header argument controls expansion of ``noweb'' style (see
 
+@ref{Noweb reference syntax}) references in a code block.  This header
 
+argument can have one of three values: @code{yes}, @code{no}, or @code{tangle}.
 
 
 
 @itemize @bullet
 
 @itemize @bullet
 
-@item @code{no}
 
-The default.  ``Noweb'' syntax references in the body of the code block will
 
-not be expanded before the code block is evaluated, tangled or exported.
 
 @item @code{yes}
 
 @item @code{yes}
 
-``Noweb'' syntax references in the body of the code block will be
 
-expanded before the code block is evaluated, tangled or exported.
 
+All ``noweb'' syntax references in the body of the code block will be
 
+expanded before the block is evaluated, tangled or exported.
 
+@item @code{no}
 
+The default.  No ``noweb'' syntax specific action is taken when the code
 
+block is evaluated, tangled or exported.
 
 @item @code{tangle}
 
 @item @code{tangle}
 
-``Noweb'' syntax references in the body of the code block will be expanded
 
-before the code block is tangled.  However, ``noweb'' syntax references will
 
-not be expanded when the code block is evaluated or exported.
 
-@item @code{no-export}
 
-``Noweb'' syntax references in the body of the code block will be expanded
 
-before the block is evaluated or tangled.  However, ``noweb'' syntax
 
-references will not be expanded when the code block is exported.
 
-@item @code{strip-export}
 
-``Noweb'' syntax references in the body of the code block will be expanded
 
-before the block is evaluated or tangled.  However, ``noweb'' syntax
 
-references will not be removed when the code block is exported.
 
-@item @code{eval}
 
-``Noweb'' syntax references in the body of the code block will only be
 
-expanded before the block is evaluated.
 
+All ``noweb'' syntax references in the body of the code block will be
 
+expanded before the block is tangled, however ``noweb'' references will not
 
+be expanded when the block is evaluated or exported.
 
 @end itemize
 
 @end itemize
 
 
 
 @subsubheading Noweb prefix lines
 
 @subsubheading Noweb prefix lines
 
@@ -13776,7 +13729,7 @@ every time it is called.
 
 @item @code{yes}
 
 @item @code{yes}
 
 Every time the code block is run a SHA1 hash of the code and arguments
 
 Every time the code block is run a SHA1 hash of the code and arguments
 
 passed to the block will be generated.  This hash is packed into the
 
 passed to the block will be generated.  This hash is packed into the
 
-@code{#+RESULTS:} line and will be checked on subsequent
 
+@code{#+results:} line and will be checked on subsequent
 
 executions of the code block.  If the code block has not
 
 executions of the code block.  If the code block has not
 
 changed since the last time it was evaluated, it will not be re-evaluated.
 
 changed since the last time it was evaluated, it will not be re-evaluated.
 
 @end itemize
 
 @end itemize
 
@@ -13793,7 +13746,7 @@ changed since it was last run.
 
  runif(1)
 
  runif(1)
 
  #+END_SRC
 
  #+END_SRC
 
 
 
- #+RESULTS[a2a72cd647ad44515fab62e144796432793d68e1]: random
 
+ #+results[a2a72cd647ad44515fab62e144796432793d68e1]: random
 
  0.4659510825295
 
  0.4659510825295
 
 
 
  #+NAME: caller
 
  #+NAME: caller
 
@@ -13801,7 +13754,7 @@ changed since it was last run.
 
  x
 
  x
 
  #+END_SRC
 
  #+END_SRC
 
 
 
- #+RESULTS[bec9c8724e397d5df3b696502df3ed7892fc4f5f]: caller
 
+ #+results[bec9c8724e397d5df3b696502df3ed7892fc4f5f]: caller
 
  0.254227238707244
 
  0.254227238707244
 
 @end example
 
 @end example
 
 
 
@@ -13845,7 +13798,7 @@ default value yields the following results.
 
   return tab
 
   return tab
 
 #+END_SRC
 
 #+END_SRC
 
 
 
-#+RESULTS: echo-table
 
+#+results: echo-table
 
 | a | b | c |
 
 | a | b | c |
 
 | d | e | f |
 
 | d | e | f |
 
 | g | h | i |
 
 | g | h | i |
 
@@ -13867,7 +13820,7 @@ Leaves hlines in the table.  Setting @code{:hlines yes} has this effect.
 
   return tab
 
   return tab
 
 #+END_SRC
 
 #+END_SRC
 
 
 
-#+RESULTS: echo-table
 
+#+results: echo-table
 
 | a | b | c |
 
 | a | b | c |
 
 |---+---+---|
 
 |---+---+---|
 
 | d | e | f |
 
 | d | e | f |
 
@@ -13905,7 +13858,7 @@ processing, then reapplied to the results.
 
   return [[val + '*' for val in row] for row in tab]
 
   return [[val + '*' for val in row] for row in tab]
 
 #+END_SRC
 
 #+END_SRC
 
 
 
-#+RESULTS: echo-table-again
 
+#+results: echo-table-again
 
 | a  |
 
 | a  |
 
 |----|
 
 |----|
 
 | b* |
 
 | b* |
 
@@ -13948,7 +13901,7 @@ and is then reapplied to the results.
 
   return [[val + 10 for val in row] for row in tab]
 
   return [[val + 10 for val in row] for row in tab]
 
 #+END_SRC
 
 #+END_SRC
 
 
 
-#+RESULTS: echo-table-once-again
 
+#+results: echo-table-once-again
 
 | one | 11 | 12 | 13 | 14 | 15 |
 
 | one | 11 | 12 | 13 | 14 | 15 |
 
 | two | 16 | 17 | 18 | 19 | 20 |
 
 | two | 16 | 17 | 18 | 19 | 20 |
 
 @end example
 
 @end example
 
@@ -13966,7 +13919,7 @@ Setting the @code{:shebang} header argument to a string value
 
 first line of any tangled file holding the code block, and the file
 
 first line of any tangled file holding the code block, and the file
 
 permissions of the tangled file are set to make it executable.
 
 permissions of the tangled file are set to make it executable.
 
 
 
-@node eval, wrap, shebang, Specific header arguments
 
+@node eval,  , shebang, Specific header arguments
 
 @subsubsection @code{:eval}
 
 @subsubsection @code{:eval}
 
 The @code{:eval} header argument can be used to limit the evaluation of
 
 The @code{:eval} header argument can be used to limit the evaluation of
 
 specific code blocks.  The @code{:eval} header argument can be useful for
 
 specific code blocks.  The @code{:eval} header argument can be useful for
 
@@ -13991,14 +13944,6 @@ If this header argument is not set then evaluation is determined by the value
 
 of the @code{org-confirm-babel-evaluate} variable see @ref{Code evaluation
 
 of the @code{org-confirm-babel-evaluate} variable see @ref{Code evaluation
 
 security}.
 
 security}.
 
 
 
-@node wrap,  , eval, Specific header arguments
 
-@subsubsection @code{:wrap}
 
-The @code{:wrap} header argument is used to mark the results of source block
 
-evaluation.  The header argument can be passed a string that will be appended
 
-to @code{#+BEGIN_} and @code{#+END_}, which will then be used to wrap the
 
-results.  If not string is specified then the results will be wrapped in a
 
-@code{#+BEGIN/END_RESULTS} block.
 
-
 
 @node Results of evaluation, Noweb reference syntax, Header arguments, Working With Source Code
 
 @node Results of evaluation, Noweb reference syntax, Header arguments, Working With Source Code
 
 @section Results of evaluation
 
 @section Results of evaluation
 
 @cindex code block, results of evaluation
 
 @cindex code block, results of evaluation
 
@@ -14068,7 +14013,7 @@ process.  For example, compare the following two blocks:
 
  print "bye"
 
  print "bye"
 
 #+END_SRC
 
 #+END_SRC
 
 
 
-#+RESULTS:
 
+#+results:
 
 : hello
 
 : hello
 
 : bye
 
 : bye
 
 @end example
 
 @end example
 
@@ -14081,7 +14026,7 @@ In non-session mode, the `2' is not printed and does not appear.
 
  print "bye"
 
  print "bye"
 
 #+END_SRC
 
 #+END_SRC
 
 
 
-#+RESULTS:
 
+#+results:
 
 : hello
 
 : hello
 
 : 2
 
 : 2
 
 : bye
 
 : bye
 
@@ -14372,19 +14317,19 @@ keystrokes are typed on a line by itself.
 
 The following template selectors are currently supported.
 
 The following template selectors are currently supported.
 
 
 
 @multitable @columnfractions 0.1 0.9
 
 @multitable @columnfractions 0.1 0.9
 
-@item @kbd{s} @tab @code{#+BEGIN_SRC     ... #+END_SRC}
 
-@item @kbd{e} @tab @code{#+BEGIN_EXAMPLE ... #+END_EXAMPLE}
 
-@item @kbd{q} @tab @code{#+BEGIN_QUOTE   ... #+END_QUOTE}
 
-@item @kbd{v} @tab @code{#+BEGIN_VERSE   ... #+END_VERSE}
 
-@item @kbd{c} @tab @code{#+BEGIN_CENTER  ... #+END_CENTER}
 
-@item @kbd{l} @tab @code{#+BEGIN_LaTeX   ... #+END_LaTeX}
 
-@item @kbd{L} @tab @code{#+LaTeX:}
 
-@item @kbd{h} @tab @code{#+BEGIN_HTML    ... #+END_HTML}
 
-@item @kbd{H} @tab @code{#+HTML:}
 
-@item @kbd{a} @tab @code{#+BEGIN_ASCII   ... #+END_ASCII}
 
-@item @kbd{A} @tab @code{#+ASCII:}
 
-@item @kbd{i} @tab @code{#+INDEX:} line
 
-@item @kbd{I} @tab @code{#+INCLUDE:} line
 
+@item @kbd{s} @tab @code{#+begin_src     ... #+end_src}
 
+@item @kbd{e} @tab @code{#+begin_example ... #+end_example}
 
+@item @kbd{q} @tab @code{#+begin_quote   ... #+end_quote}
 
+@item @kbd{v} @tab @code{#+begin_verse   ... #+end_verse}
 
+@item @kbd{c} @tab @code{#+begin_center  ... #+end_center}
 
+@item @kbd{l} @tab @code{#+begin_latex   ... #+end_latex}
 
+@item @kbd{L} @tab @code{#+latex:}
 
+@item @kbd{h} @tab @code{#+begin_html    ... #+end_html}
 
+@item @kbd{H} @tab @code{#+html:}
 
+@item @kbd{a} @tab @code{#+begin_ascii   ... #+end_ascii}
 
+@item @kbd{A} @tab @code{#+ascii:}
 
+@item @kbd{i} @tab @code{#+index:} line
 
+@item @kbd{I} @tab @code{#+include:} line
 
 @end multitable
 
 @end multitable
 
 
 
 For example, on an empty line, typing "<e" and then pressing TAB, will expand
 
 For example, on an empty line, typing "<e" and then pressing TAB, will expand
 
@@ -14478,7 +14423,7 @@ either by the @i{calc} interpreter, or by the @i{Emacs Lisp} interpreter.
 
 @cindex options, for customization
 
 @cindex options, for customization
 
 @cindex variables, for customization
 
 @cindex variables, for customization
 
 
 
-There are more than 500 variables that can be used to customize
 
+There are more than 180 variables that can be used to customize
 
 Org.  For the sake of compactness of the manual, I am not
 
 Org.  For the sake of compactness of the manual, I am not
 
 describing the variables here.  A structured overview of customization
 
 describing the variables here.  A structured overview of customization
 
 variables is available with @kbd{M-x org-customize}.  Or select
 
 variables is available with @kbd{M-x org-customize}.  Or select
 
@@ -14529,8 +14474,8 @@ Set tags that can be inherited by any entry in the file, including the
 
 top-level entries.
 
 top-level entries.
 
 @item #+DRAWERS: NAME1 .....
 
 @item #+DRAWERS: NAME1 .....
 
 @vindex org-drawers
 
 @vindex org-drawers
 
-Set the file-local set of additional drawers.  The corresponding global
 
-variable is @code{org-drawers}.
 
+Set the file-local set of drawers.  The corresponding global variable is
 
+@code{org-drawers}.
 
 @item #+LINK:  linkword replace
 
 @item #+LINK:  linkword replace
 
 @vindex org-link-abbrev-alist
 
 @vindex org-link-abbrev-alist
 
 These lines (several are allowed) specify link abbreviations.
 
 These lines (several are allowed) specify link abbreviations.
 
@@ -14741,7 +14686,7 @@ This line contains the formulas for the table directly above the line.
 
 @item #+TITLE:, #+AUTHOR:, #+EMAIL:, #+LANGUAGE:, #+TEXT:, #+DATE:,
 
 @item #+TITLE:, #+AUTHOR:, #+EMAIL:, #+LANGUAGE:, #+TEXT:, #+DATE:,
 
 @itemx #+OPTIONS:, #+BIND:, #+XSLT:,
 
 @itemx #+OPTIONS:, #+BIND:, #+XSLT:,
 
 @itemx #+DESCRIPTION:, #+KEYWORDS:,
 
 @itemx #+DESCRIPTION:, #+KEYWORDS:,
 
-@itemx #+LaTeX_HEADER:, #+STYLE:, #+LINK_UP:, #+LINK_HOME:,
 
+@itemx #+LATEX_HEADER:, #+STYLE:, #+LINK_UP:, #+LINK_HOME:,
 
 @itemx #+EXPORT_SELECT_TAGS:, #+EXPORT_EXCLUDE_TAGS:
 
 @itemx #+EXPORT_SELECT_TAGS:, #+EXPORT_EXCLUDE_TAGS:
 
 These lines provide settings for exporting files.  For more details see
 
 These lines provide settings for exporting files.  For more details see
 
 @ref{Export options}.
 
 @ref{Export options}.
 
@@ -16017,7 +15962,6 @@ If WHICH is nil or `all', get all properties.  If WHICH is
 
 `special' or `standard', only get that subclass.
 
 `special' or `standard', only get that subclass.
 
 @end defun
 
 @end defun
 
 @vindex org-use-property-inheritance
 
 @vindex org-use-property-inheritance
 
-@findex org-insert-property-drawer
 
 @defun org-entry-get pom property &optional inherit
 
 @defun org-entry-get pom property &optional inherit
 
 Get value of PROPERTY for entry at point-or-marker POM.  By default,
 
 Get value of PROPERTY for entry at point-or-marker POM.  By default,
 
 this only looks at properties defined locally in the entry.  If INHERIT
 
 this only looks at properties defined locally in the entry.  If INHERIT
 
@@ -16040,7 +15984,7 @@ Get all property keys in the current buffer.
 
 @end defun
 
 @end defun
 
 
 
 @defun org-insert-property-drawer
 
 @defun org-insert-property-drawer
 
-Insert a property drawer for the current entry.  Also
 
+Insert a property drawer at point.
 
 @end defun
 
 @end defun
 
 
 
 @defun org-entry-put-multivalued-property pom property &rest values
 
 @defun org-entry-put-multivalued-property pom property &rest values
 
@@ -16193,16 +16137,13 @@ The following example counts the number of entries with TODO keyword
 
 @cindex iPhone
 
 @cindex iPhone
 
 @cindex MobileOrg
 
 @cindex MobileOrg
 
 
 
-@i{MobileOrg} is the name of the mobile companion app for Org mode, currently
 
-available for iOS and for Android.  @i{MobileOrg} offers offline viewing and
 
-capture support for an Org mode system rooted on a ``real'' computer.  It
 
-does also allow you to record changes to existing entries.
 
-The @uref{http://mobileorg.ncogni.to/, iOS implementation} for the
 
-@i{iPhone/iPod Touch/iPad} series of devices, was developed by Richard
 
-Moreland.  Android users should check out
 
+@uref{http://mobileorg.ncogni.to/, MobileOrg} is an application for the
 
+@i{iPhone/iPod Touch} series of devices, developed by Richard Moreland.
 
+@i{MobileOrg} offers offline viewing and capture support for an Org mode
 
+system rooted on a ``real'' computer.  It does also allow you to record
 
+changes to existing entries.  Android users should check out
 
 @uref{http://wiki.github.com/matburt/mobileorg-android/, MobileOrg Android}
 
 @uref{http://wiki.github.com/matburt/mobileorg-android/, MobileOrg Android}
 
-by Matt Jones.  The two implementations are not identical but offer similar
 
-features.
 
+by Matt Jones.
 
 
 
 This appendix describes the support Org has for creating agenda views in a
 
 This appendix describes the support Org has for creating agenda views in a
 
 format that can be displayed by @i{MobileOrg}, and for integrating notes
 
 format that can be displayed by @i{MobileOrg}, and for integrating notes
 
@@ -16367,7 +16308,7 @@ Bastien has written a large number of extensions to Org (most of them
 
 integrated into the core by now), including the @LaTeX{} exporter and the plain
 
 integrated into the core by now), including the @LaTeX{} exporter and the plain
 
 list parser.  His support during the early days, when he basically acted as
 
 list parser.  His support during the early days, when he basically acted as
 
 co-maintainer, was central to the success of this project.  Bastien also
 
 co-maintainer, was central to the success of this project.  Bastien also
 
-invented Worg, helped establishing the Web presence of Org, and sponsored
 
+invented Worg, helped establishing the Web presence of Org, and sponsors
 
 hosting costs for the orgmode.org website.
 
 hosting costs for the orgmode.org website.
 
 @item Eric Schulte and Dan Davison
 
 @item Eric Schulte and Dan Davison
 
 Eric and Dan are jointly responsible for the Org-babel system, which turns
 
 Eric and Dan are jointly responsible for the Org-babel system, which turns

+ 1 - 1
doc/orgcard.tex
View File 

@@ -17,7 +17,7 @@
 
 \pdflayout=(0l)
 
 \pdflayout=(0l)
 
 
 
 % Nothing else needs to be changed below this line.
 
 % Nothing else needs to be changed below this line.
 
-% Copyright (C) 1987, 1993, 1996-1997, 2001-2012
 
+% Copyright (C) 1987, 1993, 1996-1997, 2001-2011
 
 %   Free Software Foundation, Inc.
 
 %   Free Software Foundation, Inc.
 
 
 
 % This file is part of GNU Emacs.
 
 % This file is part of GNU Emacs.

+ 14 - 21
doc/orgguide.texi
View File 

@@ -40,7 +40,7 @@
 
 @end macro
 
 @end macro
 
 @copying
 
 @copying
 
 
 
-Copyright @copyright{} 2010-2012 Free Software Foundation
 
+Copyright @copyright{} 2010 Free Software Foundation
 
 
 
 @quotation
 
 @quotation
 
 Permission is granted to copy, distribute and/or modify this document
 
 Permission is granted to copy, distribute and/or modify this document
 
@@ -1906,7 +1906,7 @@ outline, not only the heading.
 
 @c
 
 @c
 
 @itemx @key{TAB}
 
 @itemx @key{TAB}
 
 Go to the original location of the item in another window.  Under Emacs
 
 Go to the original location of the item in another window.  Under Emacs
 
-22, @kbd{mouse-1} will also work for this.
 
+22, @kbd{mouse-1} will also works for this.
 
 @c
 
 @c
 
 @itemx @key{RET}
 
 @itemx @key{RET}
 
 Go to the original location of the item and delete other windows.
 
 Go to the original location of the item and delete other windows.
 
@@ -2409,8 +2409,8 @@ verbatim @LaTeX{} code.
 
 Export as DocBook file.
 
 Export as DocBook file.
 
 @end table
 
 @end table
 
 
 
-Similarly to the HTML exporter, you can use @code{#+DOCBOOK:} and
 
-@code{#+BEGIN_DOCBOOK ... #+END_DOCBOOK} construct to add verbatim @LaTeX{}
 
+Similarly to the HTML exporter, you can use @code{#+DocBook:} and
 
+@code{#+BEGIN_DocBook ... #+END_DocBook} construct to add verbatim @LaTeX{}
 
 code.
 
 code.
 
 
 
 @node iCalendar export,  , DocBook export, Exporting
 
 @node iCalendar export,  , DocBook export, Exporting
 
@@ -2492,10 +2492,10 @@ results in several formats.
 
 The structure of code blocks is as follows:
 
 The structure of code blocks is as follows:
 
 
 
 @example
 
 @example
 
-#+NAME: <name>
 
-#+BEGIN_SRC <language> <switches> <header arguments>
 
+#+srcname: <name>
 
+#+begin_src <language> <switches> <header arguments>
 
   <body>
 
   <body>
 
-#+END_SRC
 
+#+end_src
 
 @end example
 
 @end example
 
 
 
 Where @code{<name>} is a string used to name the code block,
 
 Where @code{<name>} is a string used to name the code block,
 
@@ -2520,11 +2520,11 @@ in many languages.  For a complete list of supported languages see the
 
 manual.  The following shows a code block and its results.
 
 manual.  The following shows a code block and its results.
 
 
 
 @example
 
 @example
 
-#+BEGIN_SRC emacs-lisp
 
+#+begin_src emacs-lisp
 
   (+ 1 2 3 4)
 
   (+ 1 2 3 4)
 
-#+END_SRC
 
+#+end_src
 
 
 
-#+RESULTS:
 
+#+results:
 
 : 10
 
 : 10
 
 @end example
 
 @end example
 
 
 
@@ -2663,17 +2663,10 @@ indentation for each level.  To get this support in a file, use
 
 @node MobileOrg,  , Clean view, Miscellaneous
 
 @node MobileOrg,  , Clean view, Miscellaneous
 
 @section MobileOrg
 
 @section MobileOrg
 
 
 
-@i{MobileOrg} is the name of the mobile companion app for Org mode, currently
 
-available for iOS and for Android.  @i{MobileOrg} offers offline viewing and
 
-capture support for an Org mode system rooted on a ``real'' computer.  It
 
-does also allow you to record changes to existing entries.
 
-
 
-The @uref{http://mobileorg.ncogni.to/, iOS implementation} for the
 
-@i{iPhone/iPod Touch/iPad} series of devices, was developed by Richard
 
-Moreland. Android users should check out
 
-@uref{http://wiki.github.com/matburt/mobileorg-android/, MobileOrg Android}
 
-by Matt Jones.  The two implementations are not identical but offer similar
 
-features.
 
+@i{MobileOrg} is an application originally developed for the @i{iPhone/iPod
 
+Touch} series of devices, developed by Richard Moreland.  There is also an
 
+independent implementation for Android devices, by Matt Jones.
 
+For details, see the Org-mode manual.
 
 
 
 @seealso{
 
 @seealso{
 
 @uref{http://orgmode.org/manual/Miscellaneous.html#Miscellaneous, Chapter 15
 
 @uref{http://orgmode.org/manual/Miscellaneous.html#Miscellaneous, Chapter 15

+ 1 - 1
doc/pdflayout.sty
View File 

@@ -1,4 +1,4 @@
 
-% Copyright (C) 2007-2012  Free Software Foundation, Inc.
 
+% Copyright (C) 2007, 2008, 2009  Free Software Foundation, Inc.
 
 
 
 % This file is part of GNU Emacs.
 
 % This file is part of GNU Emacs.

+ 2 - 2
doc/texinfo.tex
View File 

@@ -3,11 +3,11 @@
 
 % Load plain if necessary, i.e., if running under initex.
 
 % Load plain if necessary, i.e., if running under initex.
 
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 
 %
 
 %
 
-\def\texinfoversion{2012-01-03.18}
 
+\def\texinfoversion{2011-08-15.20}
 
 %
 
 %
 
 % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 
 % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
 
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
 
-% 2007, 2008-2012 Free Software Foundation, Inc.
 
+% 2007, 2008 Free Software Foundation, Inc.
 
 %
 
 %
 
 % This texinfo.tex file is free software: you can redistribute it and/or
 
 % This texinfo.tex file is free software: you can redistribute it and/or
 
 % modify it under the terms of the GNU General Public License as
 
 % modify it under the terms of the GNU General Public License as

+ 1 - 1
lisp/ob-R.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; ob-R.el --- org-babel functions for R code evaluation
 
 ;;; ob-R.el --- org-babel functions for R code evaluation
 
 
 
-;; Copyright (C) 2009-2012  Free Software Foundation, Inc.
 
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 
 
 ;; Author: Eric Schulte
 
 ;; Author: Eric Schulte
 
 ;;	Dan Davison
 
 ;;	Dan Davison

+ 1 - 1
lisp/ob-asymptote.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; ob-asymptote.el --- org-babel functions for asymptote evaluation
 
 ;;; ob-asymptote.el --- org-babel functions for asymptote evaluation
 
 
 
-;; Copyright (C) 2009-2012 Free Software Foundation, Inc.
 
+;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
 
 
 
 ;; Author: Eric Schulte
 
 ;; Author: Eric Schulte
 
 ;; Keywords: literate programming, reproducible research
 
 ;; Keywords: literate programming, reproducible research

+ 2 - 2
lisp/ob-awk.el
View File 

@@ -24,9 +24,9 @@
 
 ;;; Commentary:
 
 ;;; Commentary:
 
 
 
 ;; Babel's awk can use special header argument:
 
 ;; Babel's awk can use special header argument:
 
-;;
 
+;; 
 ;; - :in-file takes a path to a file of data to be processed by awk
 
 ;; - :in-file takes a path to a file of data to be processed by awk
 
-;;
 
+;;   
 ;; - :stdin takes an Org-mode data or code block reference, the value
 
 ;; - :stdin takes an Org-mode data or code block reference, the value
 
 ;;          of which will be passed to the awk process through STDIN
 
 ;;          of which will be passed to the awk process through STDIN

+ 1 - 1
lisp/ob-clojure.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; ob-clojure.el --- org-babel functions for clojure evaluation
 
 ;;; ob-clojure.el --- org-babel functions for clojure evaluation
 
 
 
-;; Copyright (C) 2009-2012  Free Software Foundation, Inc.
 
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 
 
 ;; Author: Joel Boehland
 
 ;; Author: Joel Boehland
 
 ;;	Eric Schulte
 
 ;;	Eric Schulte

+ 1 - 1
lisp/ob-comint.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; ob-comint.el --- org-babel functions for interaction with comint buffers
 
 ;;; ob-comint.el --- org-babel functions for interaction with comint buffers
 
 
 
-;; Copyright (C) 2009-2012  Free Software Foundation, Inc.
 
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 
 
 ;; Author: Eric Schulte
 
 ;; Author: Eric Schulte
 
 ;; Keywords: literate programming, reproducible research, comint
 
 ;; Keywords: literate programming, reproducible research, comint

+ 1 - 1
lisp/ob-css.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; ob-css.el --- org-babel functions for css evaluation
 
 ;;; ob-css.el --- org-babel functions for css evaluation
 
 
 
-;; Copyright (C) 2009-2012  Free Software Foundation, Inc.
 
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 
 
 ;; Author: Eric Schulte
 
 ;; Author: Eric Schulte
 
 ;; Keywords: literate programming, reproducible research
 
 ;; Keywords: literate programming, reproducible research

+ 4 - 17
lisp/ob-ditaa.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; ob-ditaa.el --- org-babel functions for ditaa evaluation
 
 ;;; ob-ditaa.el --- org-babel functions for ditaa evaluation
 
 
 
-;; Copyright (C) 2009-2012  Free Software Foundation, Inc.
 
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 
 
 ;; Author: Eric Schulte
 
 ;; Author: Eric Schulte
 
 ;; Keywords: literate programming, reproducible research
 
 ;; Keywords: literate programming, reproducible research
 
@@ -34,28 +34,15 @@
 
 ;; 3) we are adding the "file" and "cmdline" header arguments
 
 ;; 3) we are adding the "file" and "cmdline" header arguments
 
 ;;
 
 ;;
 
 ;; 4) there are no variables (at least for now)
 
 ;; 4) there are no variables (at least for now)
 
-;;
 
-;; 5) it depends on a variable defined in org-exp-blocks (namely
 
-;;    `org-ditaa-jar-path') so be sure you have org-exp-blocks loaded
 
 
 
 ;;; Code:
 
 ;;; Code:
 
 (require 'ob)
 
 (require 'ob)
 
 
 
-(defvar org-ditaa-jar-path) ;; provided by org-exp-blocks
 
-
 
 (defvar org-babel-default-header-args:ditaa
 
 (defvar org-babel-default-header-args:ditaa
 
-  '((:results . "file")
 
-    (:exports . "results")
 
-    (:java . "-Dfile.encoding=UTF-8"))
 
+  '((:results . "file") (:exports . "results") (:java . "-Dfile.encoding=UTF-8"))
 
   "Default arguments for evaluating a ditaa source block.")
 
   "Default arguments for evaluating a ditaa source block.")
 
 
 
-(defcustom org-ditaa-jar-option "-jar"
 
-  "Option for the ditaa jar file.
 
-Do not leave leading or trailing spaces in this string."
 
-  :group 'org-babel
 
-  :version "24.1"
 
-  :type 'string)
 
-
 
+(defvar org-ditaa-jar-path)
 
 (defun org-babel-execute:ditaa (body params)
 
 (defun org-babel-execute:ditaa (body params)
 
   "Execute a block of Ditaa code with org-babel.
 
   "Execute a block of Ditaa code with org-babel.
 
 This function is called by `org-babel-execute-src-block'."
 
 This function is called by `org-babel-execute-src-block'."
 
@@ -68,7 +55,7 @@ This function is called by `org-babel-execute-src-block'."
 
 	 (cmdline (cdr (assoc :cmdline params)))
 
 	 (cmdline (cdr (assoc :cmdline params)))
 
 	 (java (cdr (assoc :java params)))
 
 	 (java (cdr (assoc :java params)))
 
 	 (in-file (org-babel-temp-file "ditaa-"))
 
 	 (in-file (org-babel-temp-file "ditaa-"))
 
-	 (cmd (concat "java " java " " org-ditaa-jar-option " "
 
+	 (cmd (concat "java " java " -jar "
 
 		      (shell-quote-argument
 
 		      (shell-quote-argument
 
 		       (expand-file-name org-ditaa-jar-path))
 
 		       (expand-file-name org-ditaa-jar-path))
 
 		      " " cmdline
 
 		      " " cmdline

+ 1 - 1
lisp/ob-dot.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; ob-dot.el --- org-babel functions for dot evaluation
 
 ;;; ob-dot.el --- org-babel functions for dot evaluation
 
 
 
-;; Copyright (C) 2009-2012  Free Software Foundation, Inc.
 
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 
 
 ;; Author: Eric Schulte
 
 ;; Author: Eric Schulte
 
 ;; Keywords: literate programming, reproducible research
 
 ;; Keywords: literate programming, reproducible research

+ 1 - 1
lisp/ob-eval.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; ob-eval.el --- org-babel functions for external code evaluation
 
 ;;; ob-eval.el --- org-babel functions for external code evaluation
 
 
 
-;; Copyright (C) 2009-2012  Free Software Foundation, Inc.
 
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 
 
 ;; Author: Eric Schulte
 
 ;; Author: Eric Schulte
 
 ;; Keywords: literate programming, reproducible research, comint
 
 ;; Keywords: literate programming, reproducible research, comint

+ 40 - 92
lisp/ob-exp.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; ob-exp.el --- Exportation of org-babel source blocks
 
 ;;; ob-exp.el --- Exportation of org-babel source blocks
 
 
 
-;; Copyright (C) 2009-2012  Free Software Foundation, Inc.
 
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 
 
 ;; Author: Eric Schulte
 
 ;; Author: Eric Schulte
 
 ;;	Dan Davison
 
 ;;	Dan Davison
 
@@ -43,37 +43,31 @@
 
 When set to nil no code will be evaluated as part of the export
 
 When set to nil no code will be evaluated as part of the export
 
 process."
 
 process."
 
   :group 'org-babel
 
   :group 'org-babel
 
-  :version "24.1"
 
   :type 'boolean)
 
   :type 'boolean)
 
 (put 'org-export-babel-evaluate 'safe-local-variable (lambda (x) (eq x nil)))
 
 (put 'org-export-babel-evaluate 'safe-local-variable (lambda (x) (eq x nil)))
 
 
 
-(defun org-babel-exp-get-export-buffer ()
 
-  "Return the current export buffer if possible."
 
-  (cond
 
-   ((bufferp org-current-export-file) org-current-export-file)
 
-   (org-current-export-file (get-file-buffer org-current-export-file))
 
-   ('otherwise
 
-    (error "Requested export buffer when `org-current-export-file' is nil"))))
 
-
 
 (defmacro org-babel-exp-in-export-file (lang &rest body)
 
 (defmacro org-babel-exp-in-export-file (lang &rest body)
 
   (declare (indent 1))
 
   (declare (indent 1))
 
   `(let* ((lang-headers (intern (concat "org-babel-default-header-args:" ,lang)))
 
   `(let* ((lang-headers (intern (concat "org-babel-default-header-args:" ,lang)))
 
 	  (heading (nth 4 (ignore-errors (org-heading-components))))
 
 	  (heading (nth 4 (ignore-errors (org-heading-components))))
 
-	  (export-buffer (current-buffer))
 
-	  (original-buffer (org-babel-exp-get-export-buffer)) results)
 
-     (when original-buffer
 
+	  (link (when org-current-export-file
 
+		  (org-make-link-string
 
+		   (if heading
 
+		       (concat org-current-export-file "::" heading)
 
+		     org-current-export-file))))
 
+	  (export-buffer (current-buffer)) results)
 
+     (when link
 
        ;; resolve parameters in the original file so that
 
        ;; resolve parameters in the original file so that
 
        ;; headline and file-wide parameters are included, attempt
 
        ;; headline and file-wide parameters are included, attempt
 
        ;; to go to the same heading in the original file
 
        ;; to go to the same heading in the original file
 
-       (set-buffer original-buffer)
 
+       (set-buffer (get-file-buffer org-current-export-file))
 
        (save-restriction
 
        (save-restriction
 
-	 (when heading
 
-	   (condition-case nil
 
-	       (let ((org-link-search-inhibit-query t))
 
-		 (org-link-search heading))
 
-	     (error (when heading
 
-		      (goto-char (point-min))
 
-		      (re-search-forward (regexp-quote heading) nil t)))))
 
+	 (condition-case nil
 
+	     (let ((org-link-search-inhibit-query t))
 
+	       (org-open-link-from-string link))
 
+	   (error (when heading
 
+		    (goto-char (point-min))
 
+		    (re-search-forward (regexp-quote heading) nil t))))
 
 	 (setq results ,@body))
 
 	 (setq results ,@body))
 
        (set-buffer export-buffer)
 
        (set-buffer export-buffer)
 
        results)))
 
        results)))
 
@@ -115,32 +109,13 @@ none ----- do not display either code or results upon export"
 
 	  (setf hash (org-babel-sha1-hash info)))
 
 	  (setf hash (org-babel-sha1-hash info)))
 
 	;; expand noweb references in the original file
 
 	;; expand noweb references in the original file
 
 	(setf (nth 1 info)
 
 	(setf (nth 1 info)
 
-	      (if (string= "strip-export" (cdr (assoc :noweb (nth 2 info))))
 
-		  (replace-regexp-in-string
 
-		   (org-babel-noweb-wrap) "" (nth 1 info))
 
-		(if (org-babel-noweb-p (nth 2 info) :export)
 
-		    (org-babel-expand-noweb-references
 
-                     info (org-babel-exp-get-export-buffer))  
-		  (nth 1 info))))
 
+	      (if (and (cdr (assoc :noweb (nth 2 info)))
 
+		       (string= "yes" (cdr (assoc :noweb (nth 2 info)))))
 
+		  (org-babel-expand-noweb-references
 
+		   info (get-file-buffer org-current-export-file))
 
+		(nth 1 info)))
 
 	(org-babel-exp-do-export info 'block hash)))))
 
 	(org-babel-exp-do-export info 'block hash)))))
 
 
 
-(defcustom org-babel-exp-call-line-template
 
-  ""
 
-  "Template used to export call lines.
 
-This template may be customized to include the call line name
 
-with any export markup.  The template is filled out using
 
-`org-fill-template', and the following %keys may be used.
 
-
 
- line --- call line
 
-
 
-An example value would be \"\\n: call: %line\" to export the call line
 
-wrapped in a verbatim environment.
 
-
 
-Note: the results are inserted separately after the contents of
 
-this template."
 
-  :group 'org-babel
 
-  :type 'string)
 
-
 
 (defvar org-babel-default-lob-header-args)
 
 (defvar org-babel-default-lob-header-args)
 
 (defun org-babel-exp-non-block-elements (start end)
 
 (defun org-babel-exp-non-block-elements (start end)
 
   "Process inline source and call lines between START and END for export."
 
   "Process inline source and call lines between START and END for export."
 
@@ -171,7 +146,7 @@ this template."
 
 			  (if (and (cdr (assoc :noweb params))
 
 			  (if (and (cdr (assoc :noweb params))
 
 				   (string= "yes" (cdr (assoc :noweb params))))
 
 				   (string= "yes" (cdr (assoc :noweb params))))
 
 			      (org-babel-expand-noweb-references
 
 			      (org-babel-expand-noweb-references
 
-			       info (org-babel-exp-get-export-buffer))
 
+			       info (get-file-buffer org-current-export-file))
 
 			    (nth 1 info)))
 
 			    (nth 1 info)))
 
 		    (let ((code-replacement (save-match-data
 
 		    (let ((code-replacement (save-match-data
 
 					      (org-babel-exp-do-export
 
 					      (org-babel-exp-do-export
 
@@ -187,24 +162,22 @@ this template."
 
 		   (inlinep (match-string 11))
 
 		   (inlinep (match-string 11))
 
 		   (inline-start (match-end 11))
 
 		   (inline-start (match-end 11))
 
 		   (inline-end (match-end 0))
 
 		   (inline-end (match-end 0))
 
-		   (results (save-match-data
 
-			      (org-babel-exp-do-export
 
-			       (list "emacs-lisp" "results"
 
-				     (org-babel-merge-params
 
-				      org-babel-default-header-args
 
-				      org-babel-default-lob-header-args
 
-				      (org-babel-params-from-properties)
 
-				      (org-babel-parse-header-arguments
 
-				       (org-babel-clean-text-properties
 
-					(concat ":var results="
 
-						(mapconcat #'identity
 
-							   (butlast lob-info)
 
-							   " ")))))
 
-				     "" nil (car (last lob-info)))
 
-			       'lob)))
 
-		   (rep (org-fill-template
 
-			 org-babel-exp-call-line-template
 
-			 `(("line"  . ,(nth 0 lob-info))))))
 
+		   (rep (let ((lob-info (org-babel-lob-get-info)))
 
+			  (save-match-data
 
+			    (org-babel-exp-do-export
 
+			     (list "emacs-lisp" "results"
 
+				   (org-babel-merge-params
 
+				    org-babel-default-header-args
 
+				    org-babel-default-lob-header-args
 
+				    (org-babel-params-from-properties)
 
+				    (org-babel-parse-header-arguments
 
+				     (org-babel-clean-text-properties
 
+				      (concat ":var results="
 
+					      (mapconcat #'identity
 
+							 (butlast lob-info)
 
+							 " ")))))
 
+				   "" nil (car (last lob-info)))
 
+			     'lob)))))
 
 	      (if inlinep
 
 	      (if inlinep
 
 		  (save-excursion
 
 		  (save-excursion
 
 		    (goto-char inline-start)
 
 		    (goto-char inline-start)
 
@@ -239,37 +212,13 @@ The function respects the value of the :exports header argument."
 
       ('both (org-babel-exp-results info type nil hash)
 
       ('both (org-babel-exp-results info type nil hash)
 
 	     (org-babel-exp-code info)))))
 
 	     (org-babel-exp-code info)))))
 
 
 
-(defcustom org-babel-exp-code-template
 
-  "#+BEGIN_SRC %lang%flags\n%body\n#+END_SRC"
 
-  "Template used to export the body of code blocks.
 
-This template may be customized to include additional information
 
-such as the code block name, or the values of particular header
 
-arguments.  The template is filled out using `org-fill-template',
 
-and the following %keys may be used.
 
-
 
- lang ------ the language of the code block
 
- name ------ the name of the code block
 
- body ------ the body of the code block
 
- flags ----- the flags passed to the code block
 
-
 
-In addition to the keys mentioned above, every header argument
 
-defined for the code block may be used as a key and will be
 
-replaced with its value."
 
-  :group 'org-babel
 
-  :type 'string)
 
-
 
 (defun org-babel-exp-code (info)
 
 (defun org-babel-exp-code (info)
 
   "Return the original code block formatted for export."
 
   "Return the original code block formatted for export."
 
   (org-fill-template
 
   (org-fill-template
 
-   org-babel-exp-code-template
 
+   "#+BEGIN_SRC %lang%flags\n%body\n#+END_SRC"
 
    `(("lang"  . ,(nth 0 info))
 
    `(("lang"  . ,(nth 0 info))
 
-     ("body"  . ,(nth 1 info))
 
-     ,@(mapcar (lambda (pair)
 
-		 (cons (substring (symbol-name (car pair)) 1)
 
-		       (format "%S" (cdr pair))))
 
-	       (nth 2 info))
 
      ("flags" . ,((lambda (f) (when f (concat " " f))) (nth 3 info)))
 
      ("flags" . ,((lambda (f) (when f (concat " " f))) (nth 3 info)))
 
-     ("name"  . ,(or (nth 4 info) "")))))
 
+     ("body"  . ,(nth 1 info)))))
 
 
 
 (defun org-babel-exp-results (info type &optional silent hash)
 
 (defun org-babel-exp-results (info type &optional silent hash)
 
   "Evaluate and return the results of the current code block for export.
 
   "Evaluate and return the results of the current code block for export.
 
@@ -280,8 +229,7 @@ inhibit insertion of results into the buffer."
 
   (when (and org-export-babel-evaluate
 
   (when (and org-export-babel-evaluate
 
 	     (not (and hash (equal hash (org-babel-current-result-hash)))))
 
 	     (not (and hash (equal hash (org-babel-current-result-hash)))))
 
     (let ((lang (nth 0 info))
 
     (let ((lang (nth 0 info))
 
-	  (body (nth 1 info))
 
-	  (info (copy-sequence info)))
 
+	  (body (nth 1 info)))
 
       ;; skip code blocks which we can't evaluate
 
       ;; skip code blocks which we can't evaluate
 
       (when (fboundp (intern (concat "org-babel-execute:" lang)))
 
       (when (fboundp (intern (concat "org-babel-execute:" lang)))
 
 	(org-babel-eval-wipe-error-buffer)
 
 	(org-babel-eval-wipe-error-buffer)

+ 1 - 1
lisp/ob-fortran.el
View File 

@@ -5,7 +5,7 @@
 
 ;; Authors: Sergey Litvinov (based on ob-C.el by Eric Schulte), Eric Schulte
 
 ;; Authors: Sergey Litvinov (based on ob-C.el by Eric Schulte), Eric Schulte
 
 ;; Keywords: literate programming, reproducible research, fortran
 
 ;; Keywords: literate programming, reproducible research, fortran
 
 ;; Homepage: http://orgmode.org
 
 ;; Homepage: http://orgmode.org
 
-;; Version: 7.8.02
 
+;; Version: 7.8.03
 
 
 
 ;; This program is free software; you can redistribute it and/or modify
 
 ;; 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
 
 ;; it under the terms of the GNU General Public License as published by

+ 2 - 2
lisp/ob-gnuplot.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; ob-gnuplot.el --- org-babel functions for gnuplot evaluation
 
 ;;; ob-gnuplot.el --- org-babel functions for gnuplot evaluation
 
 
 
-;; Copyright (C) 2009-2012  Free Software Foundation, Inc.
 
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 
 
 ;; Author: Eric Schulte
 
 ;; Author: Eric Schulte
 
 ;; Keywords: literate programming, reproducible research
 
 ;; Keywords: literate programming, reproducible research
 
@@ -34,7 +34,7 @@
 
 ;;; Requirements:
 
 ;;; Requirements:
 
 
 
 ;; - gnuplot :: http://www.gnuplot.info/
 
 ;; - gnuplot :: http://www.gnuplot.info/
 
-;;
 
+;; 
 ;; - gnuplot-mode :: http://cars9.uchicago.edu/~ravel/software/gnuplot-mode.html
 
 ;; - gnuplot-mode :: http://cars9.uchicago.edu/~ravel/software/gnuplot-mode.html
 
 
 
 ;;; Code:
 
 ;;; Code:

+ 2 - 2
lisp/ob-haskell.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; ob-haskell.el --- org-babel functions for haskell evaluation
 
 ;;; ob-haskell.el --- org-babel functions for haskell evaluation
 
 
 
-;; Copyright (C) 2009-2012  Free Software Foundation, Inc.
 
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 
 
 ;; Author: Eric Schulte
 
 ;; Author: Eric Schulte
 
 ;; Keywords: literate programming, reproducible research
 
 ;; Keywords: literate programming, reproducible research
 
@@ -79,7 +79,7 @@
 
                    (cdr (member org-babel-haskell-eoe
 
                    (cdr (member org-babel-haskell-eoe
 
                                 (reverse (mapcar #'org-babel-trim raw)))))))
 
                                 (reverse (mapcar #'org-babel-trim raw)))))))
 
     (org-babel-reassemble-table
 
     (org-babel-reassemble-table
 
-     (cond
 
+     (cond 
       ((equal result-type 'output)
 
       ((equal result-type 'output)
 
        (mapconcat #'identity (reverse (cdr results)) "\n"))
 
        (mapconcat #'identity (reverse (cdr results)) "\n"))
 
       ((equal result-type 'value)
 
       ((equal result-type 'value)

+ 0 - 1
lisp/ob-js.el
View File 

@@ -55,7 +55,6 @@
 
 (defcustom org-babel-js-cmd "node"
 
 (defcustom org-babel-js-cmd "node"
 
   "Name of command used to evaluate js blocks."
 
   "Name of command used to evaluate js blocks."
 
   :group 'org-babel
 
   :group 'org-babel
 
-  :version "24.1"
 
   :type 'string)
 
   :type 'string)
 
 
 
 (defvar org-babel-js-function-wrapper
 
 (defvar org-babel-js-function-wrapper

+ 1 - 1
lisp/ob-keys.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; ob-keys.el --- key bindings for org-babel
 
 ;;; ob-keys.el --- key bindings for org-babel
 
 
 
-;; Copyright (C) 2009-2012  Free Software Foundation, Inc.
 
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 
 
 ;; Author: Eric Schulte
 
 ;; Author: Eric Schulte
 
 ;; Keywords: literate programming, reproducible research
 
 ;; Keywords: literate programming, reproducible research

+ 1 - 1
lisp/ob-latex.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; ob-latex.el --- org-babel functions for latex "evaluation"
 
 ;;; ob-latex.el --- org-babel functions for latex "evaluation"
 
 
 
-;; Copyright (C) 2009-2012  Free Software Foundation, Inc.
 
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 
 
 ;; Author: Eric Schulte
 
 ;; Author: Eric Schulte
 
 ;; Keywords: literate programming, reproducible research
 
 ;; Keywords: literate programming, reproducible research

+ 34 - 62
lisp/ob-lilypond.el
View File 

@@ -3,7 +3,7 @@
 
 ;; Copyright (C) 2010-2012  Free Software Foundation, Inc.
 
 ;; Copyright (C) 2010-2012  Free Software Foundation, Inc.
 
 
 
 ;; Author: Martyn Jago
 
 ;; Author: Martyn Jago
 
-;; Keywords: babel language, literate programming, music score
 
+;; Keywords: babel language, literate programming
 
 ;; Homepage: https://github.com/mjago/ob-lilypond
 
 ;; Homepage: https://github.com/mjago/ob-lilypond
 
 
 
 ;; This file is part of GNU Emacs.
 
 ;; This file is part of GNU Emacs.
 
@@ -23,14 +23,10 @@
 
 
 
 ;;; Commentary:
 
 ;;; Commentary:
 
 
 
-;; Installation, ob-lilypond documentation, and examples are available at
 
-;; http://orgmode.org/worg/org-contrib/babel/languages/ob-doc-lilypond.html
 
-;;
 
-;; Lilypond documentation can be found at
 
-;; http://lilypond.org/manuals.html
 
+;; Installation / usage info, and examples are available at
 
+;; https://github.com/mjago/ob-lilypond
 
 
 
 ;;; Code:
 
 ;;; Code:
 
-
 
 (require 'ob)
 
 (require 'ob)
 
 (require 'ob-eval)
 
 (require 'ob-eval)
 
 (require 'ob-tangle)
 
 (require 'ob-tangle)
 
@@ -41,11 +37,9 @@
 
 (add-to-list 'org-babel-tangle-lang-exts '("LilyPond" . "ly"))
 
 (add-to-list 'org-babel-tangle-lang-exts '("LilyPond" . "ly"))
 
 
 
 (defvar org-babel-default-header-args:lilypond '()
 
 (defvar org-babel-default-header-args:lilypond '()
 
-  "Default header arguments for lilypond code blocks.
 
-NOTE: The arguments are determined at lilypond compile time.
 
-See (ly-set-header-args)")
 
+  "Default header arguments for js code blocks.")
 
 
 
-(defconst ly-version "7.6"
 
+(defconst ly-version "0.3"
 
   "The version number of the file ob-lilypond.el.")
 
   "The version number of the file ob-lilypond.el.")
 
 
 
 (defvar ly-compile-post-tangle t
 
 (defvar ly-compile-post-tangle t
 
@@ -92,10 +86,6 @@ LY-GEN-SVG to t")
 
 "HTML generation can be turned on by default by setting
 
 "HTML generation can be turned on by default by setting
 
 LY-GEN-HTML to t")
 
 LY-GEN-HTML to t")
 
 
 
-(defvar ly-gen-pdf nil
 
-"PDF generation can be turned on by default by setting
 
-LY-GEN-PDF to t")
 
-
 
 (defvar ly-use-eps nil
 
 (defvar ly-use-eps nil
 
 "You can force the compiler to use the EPS backend by setting
 
 "You can force the compiler to use the EPS backend by setting
 
 LY-USE-EPS to t")
 
 LY-USE-EPS to t")
 
@@ -124,7 +114,7 @@ blocks")
 
 		body))))
 
 		body))))
 
      vars)
 
      vars)
 
     body))
 
     body))
 
-
 
+ 
 (defun org-babel-execute:lilypond (body params)
 
 (defun org-babel-execute:lilypond (body params)
 
   "This function is called by `org-babel-execute-src-block'.
 
   "This function is called by `org-babel-execute-src-block'.
 
 Depending on whether we are in arrange mode either:
 
 Depending on whether we are in arrange mode either:
 
@@ -148,7 +138,7 @@ specific arguments to =org-babel-tangle="
 
 
 
 (defun ly-process-basic (body params)
 
 (defun ly-process-basic (body params)
 
   "Execute a lilypond block in basic mode"
 
   "Execute a lilypond block in basic mode"
 
-
 
+  
   (let* ((result-params (cdr (assoc :result-params params)))
 
   (let* ((result-params (cdr (assoc :result-params params)))
 
 	 (out-file (cdr (assoc :file params)))
 
 	 (out-file (cdr (assoc :file params)))
 
 	 (cmdline (or (cdr (assoc :cmdline params))
 
 	 (cmdline (or (cdr (assoc :cmdline params))
 
@@ -157,7 +147,7 @@ specific arguments to =org-babel-tangle="
 
 
 
     (with-temp-file in-file
 
     (with-temp-file in-file
 
       (insert (org-babel-expand-body:generic body params)))
 
       (insert (org-babel-expand-body:generic body params)))
 
-
 
+    
     (org-babel-eval
 
     (org-babel-eval
 
      (concat
 
      (concat
 
       (ly-determine-ly-path)
 
       (ly-determine-ly-path)
 
@@ -187,7 +177,7 @@ If error in compilation, attempt to mark the error in lilypond org file"
 
           (ly-temp-file (ly-switch-extension
 
           (ly-temp-file (ly-switch-extension
 
                          (buffer-file-name) ".ly")))
 
                          (buffer-file-name) ".ly")))
 
       (if (file-exists-p ly-tangled-file)
 
       (if (file-exists-p ly-tangled-file)
 
-          (progn
 
+          (progn 
             (when (file-exists-p ly-temp-file)
 
             (when (file-exists-p ly-temp-file)
 
               (delete-file ly-temp-file))
 
               (delete-file ly-temp-file))
 
             (rename-file ly-tangled-file
 
             (rename-file ly-tangled-file
 
@@ -213,20 +203,18 @@ FILE-NAME is full path to lilypond (.ly) file"
 
         (arg-2 nil)                    ;infile
 
         (arg-2 nil)                    ;infile
 
         (arg-3 "*lilypond*")           ;buffer
 
         (arg-3 "*lilypond*")           ;buffer
 
         (arg-4 t)                      ;display
 
         (arg-4 t)                      ;display
 
-	(arg-4 t)                      ;display
 
-	(arg-5 (if ly-gen-png  "--png"  "")) ;&rest...
 
-	(arg-6 (if ly-gen-html "--html" ""))
 
-        (arg-7 (if ly-gen-pdf "--pdf" ""))
 
-        (arg-8 (if ly-use-eps  "-dbackend=eps" ""))
 
-        (arg-9 (if ly-gen-svg  "-dbackend=svg" ""))
 
-        (arg-10 (concat "--output=" (file-name-sans-extension file-name)))
 
-        (arg-11 file-name))
 
+        (arg-5 (if ly-gen-png  "--png"  "")) ;&rest...
 
+  (arg-6 (if ly-gen-html "--html" ""))
 
+        (arg-7 (if ly-use-eps  "-dbackend=eps" ""))
 
+        (arg-8 (if ly-gen-svg  "-dbackend=svg" ""))
 
+        (arg-9 (concat "--output=" (file-name-sans-extension file-name)))
 
+        (arg-10 file-name))
 
     (if test
 
     (if test
 
-        `(,arg-1 ,arg-2 ,arg-3 ,arg-4 ,arg-5 ,arg-6
 
-                 ,arg-7 ,arg-8 ,arg-9 ,arg-10 ,arg-11)
 
+        `(,arg-1 ,arg-2 ,arg-3 ,arg-4 ,arg-5
 
+                 ,arg-6 ,arg-7 ,arg-8 ,arg-9 ,arg-10)
 
       (call-process
 
       (call-process
 
-       arg-1 arg-2 arg-3 arg-4 arg-5 arg-6
 
-       arg-7 arg-8 arg-9 arg-10 arg-11))))
 
+       arg-1 arg-2 arg-3 arg-4 arg-5
 
+       arg-6 arg-7 arg-8 arg-9 arg-10))))
 
 
 
 (defun ly-check-for-compile-error (file-name &optional test)
 
 (defun ly-check-for-compile-error (file-name &optional test)
 
   "Check for compile error.
 
   "Check for compile error.
 
@@ -255,7 +243,7 @@ FILE-NAME is full path to lilypond file"
 
   "Mark the erroneous lines in the lilypond org buffer.
 
   "Mark the erroneous lines in the lilypond org buffer.
 
 FILE-NAME is full path to lilypond file.
 
 FILE-NAME is full path to lilypond file.
 
 LINE is the erroneous line"
 
 LINE is the erroneous line"
 
-
 
+ 
   (switch-to-buffer-other-window
 
   (switch-to-buffer-other-window
 
    (concat (file-name-nondirectory
 
    (concat (file-name-nondirectory
 
             (ly-switch-extension file-name ".org"))))
 
             (ly-switch-extension file-name ".org"))))
 
@@ -268,7 +256,7 @@ LINE is the erroneous line"
 
           (set-mark (point))
 
           (set-mark (point))
 
           (goto-char (- (point) (length line))))
 
           (goto-char (- (point) (length line))))
 
       (goto-char temp))))
 
       (goto-char temp))))
 
-
 
+  
 (defun ly-parse-line-num (&optional buffer)
 
 (defun ly-parse-line-num (&optional buffer)
 
   "Extract error line number."
 
   "Extract error line number."
 
 
 
@@ -296,7 +284,7 @@ LINE is the erroneous line"
 
   "Extract the erroneous line from the tangled .ly file
 
   "Extract the erroneous line from the tangled .ly file
 
 FILE-NAME is full path to lilypond file.
 
 FILE-NAME is full path to lilypond file.
 
 LINENO is the number of the erroneous line"
 
 LINENO is the number of the erroneous line"
 
-
 
+ 
   (with-temp-buffer
 
   (with-temp-buffer
 
     (insert-file-contents (ly-switch-extension file-name ".ly")
 
     (insert-file-contents (ly-switch-extension file-name ".ly")
 
 			  nil nil nil t)
 
 			  nil nil nil t)
 
@@ -306,12 +294,12 @@ LINENO is the number of the erroneous line"
 
 	  (forward-line (- lineNo 1))
 
 	  (forward-line (- lineNo 1))
 
 	  (buffer-substring (point) (point-at-eol)))
 
 	  (buffer-substring (point) (point-at-eol)))
 
       nil)))
 
       nil)))
 
-
 
+    
 (defun ly-attempt-to-open-pdf (file-name &optional test)
 
 (defun ly-attempt-to-open-pdf (file-name &optional test)
 
   "Attempt to display the generated pdf file
 
   "Attempt to display the generated pdf file
 
 FILE-NAME is full path to lilypond file
 
 FILE-NAME is full path to lilypond file
 
 If TEST is non-nil, the shell command is returned and is not run"
 
 If TEST is non-nil, the shell command is returned and is not run"
 
-
 
+  
   (when ly-display-pdf-post-tangle
 
   (when ly-display-pdf-post-tangle
 
     (let ((pdf-file (ly-switch-extension file-name ".pdf")))
 
     (let ((pdf-file (ly-switch-extension file-name ".pdf")))
 
       (if (file-exists-p pdf-file)
 
       (if (file-exists-p pdf-file)
 
@@ -319,12 +307,8 @@ If TEST is non-nil, the shell command is returned and is not run"
 
                  (concat (ly-determine-pdf-path) " " pdf-file)))
 
                  (concat (ly-determine-pdf-path) " " pdf-file)))
 
             (if test
 
             (if test
 
                 cmd-string
 
                 cmd-string
 
-	      (start-process
 
-	       "\"Audition pdf\""
 
-	       "*lilypond*"
 
-	       (ly-determine-pdf-path)
 
-	       pdf-file)))
 
-	(message  "No pdf file generated so can't display!")))))
 
+              (shell-command cmd-string)))
 
+        (message  "No pdf file generated so can't display!")))))
 
 
 
 (defun ly-attempt-to-play-midi (file-name &optional test)
 
 (defun ly-attempt-to-play-midi (file-name &optional test)
 
   "Attempt to play the generated MIDI file
 
   "Attempt to play the generated MIDI file
 
@@ -338,11 +322,7 @@ If TEST is non-nil, the shell command is returned and is not run"
 
                  (concat (ly-determine-midi-path) " " midi-file)))
 
                  (concat (ly-determine-midi-path) " " midi-file)))
 
             (if test
 
             (if test
 
                 cmd-string
 
                 cmd-string
 
-              (start-process
 
-               "\"Audition midi\""
 
-               "*lilypond*"
 
-               (ly-determine-midi-path)
 
-               midi-file)))
 
+              (shell-command cmd-string)))
 
         (message "No midi file generated so can't play!")))))
 
         (message "No midi file generated so can't play!")))))
 
 
 
 (defun ly-determine-ly-path (&optional test)
 
 (defun ly-determine-ly-path (&optional test)
 
@@ -360,7 +340,7 @@ If TEST is non-nil, it contains a simulation of the OS for test purposes"
 
 (defun ly-determine-pdf-path (&optional test)
 
 (defun ly-determine-pdf-path (&optional test)
 
   "Return correct path to pdf viewer depending on OS
 
   "Return correct path to pdf viewer depending on OS
 
 If TEST is non-nil, it contains a simulation of the OS for test purposes"
 
 If TEST is non-nil, it contains a simulation of the OS for test purposes"
 
-
 
+  
   (let ((sys-type
 
   (let ((sys-type
 
          (or test system-type)))
 
          (or test system-type)))
 
     (cond ((string= sys-type  "darwin")
 
     (cond ((string= sys-type  "darwin")
 
@@ -372,7 +352,7 @@ If TEST is non-nil, it contains a simulation of the OS for test purposes"
 
 (defun ly-determine-midi-path (&optional test)
 
 (defun ly-determine-midi-path (&optional test)
 
   "Return correct path to midi player depending on OS
 
   "Return correct path to midi player depending on OS
 
 If TEST is non-nil, it contains a simulation of the OS for test purposes"
 
 If TEST is non-nil, it contains a simulation of the OS for test purposes"
 
-
 
+   
   (let ((sys-type
 
   (let ((sys-type
 
          (or test test system-type)))
 
          (or test test system-type)))
 
     (cond ((string= sys-type  "darwin")
 
     (cond ((string= sys-type  "darwin")
 
@@ -380,10 +360,10 @@ If TEST is non-nil, it contains a simulation of the OS for test purposes"
 
           ((string= sys-type "win32")
 
           ((string= sys-type "win32")
 
            ly-win32-midi-path)
 
            ly-win32-midi-path)
 
           (t ly-nix-midi-path))))
 
           (t ly-nix-midi-path))))
 
-
 
+ 
 (defun ly-toggle-midi-play ()
 
 (defun ly-toggle-midi-play ()
 
   "Toggle whether midi will be played following a successful compilation"
 
   "Toggle whether midi will be played following a successful compilation"
 
-
 
+  
   (interactive)
 
   (interactive)
 
   (setq ly-play-midi-post-tangle
 
   (setq ly-play-midi-post-tangle
 
         (not ly-play-midi-post-tangle))
 
         (not ly-play-midi-post-tangle))
 
@@ -393,7 +373,7 @@ If TEST is non-nil, it contains a simulation of the OS for test purposes"
 
 
 
 (defun ly-toggle-pdf-display ()
 
 (defun ly-toggle-pdf-display ()
 
   "Toggle whether pdf will be displayed following a successful compilation"
 
   "Toggle whether pdf will be displayed following a successful compilation"
 
-
 
+   
   (interactive)
 
   (interactive)
 
   (setq ly-display-pdf-post-tangle
 
   (setq ly-display-pdf-post-tangle
 
         (not ly-display-pdf-post-tangle))
 
         (not ly-display-pdf-post-tangle))
 
@@ -419,15 +399,6 @@ If TEST is non-nil, it contains a simulation of the OS for test purposes"
 
   (message (concat "HTML generation has been "
 
   (message (concat "HTML generation has been "
 
                    (if ly-gen-html "ENABLED." "DISABLED."))))
 
                    (if ly-gen-html "ENABLED." "DISABLED."))))
 
 
 
-(defun ly-toggle-pdf-generation ()
 
-  "Toggle whether pdf will be generated by compilation"
 
-
 
-  (interactive)
 
-  (setq ly-gen-pdf
 
-        (not ly-gen-pdf))
 
-  (message (concat "PDF generation has been "
 
-                   (if ly-gen-pdf "ENABLED." "DISABLED."))))
 
-
 
 (defun ly-toggle-arrange-mode ()
 
 (defun ly-toggle-arrange-mode ()
 
   "Toggle whether in Arrange mode or Basic mode"
 
   "Toggle whether in Arrange mode or Basic mode"
 
 
 
@@ -457,7 +428,6 @@ mode i.e. ARRANGE-MODE is t"
 
          '((:tangle . "yes")
 
          '((:tangle . "yes")
 
            (:noweb . "yes")
 
            (:noweb . "yes")
 
            (:results . "silent")
 
            (:results . "silent")
 
-           (:cache . "yes")
 
            (:comments . "yes")))
 
            (:comments . "yes")))
 
         (t
 
         (t
 
          '((:results . "file")
 
          '((:results . "file")
 
@@ -471,4 +441,6 @@ dependent on LY-ARRANGE-MODE"
 
 
 
 (provide 'ob-lilypond)
 
 (provide 'ob-lilypond)
 
 
 
+
 
+
 
 ;;; ob-lilypond.el ends here
 
 ;;; ob-lilypond.el ends here

+ 1 - 2
lisp/ob-lisp.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; ob-lisp.el --- org-babel functions for common lisp evaluation
 
 ;;; ob-lisp.el --- org-babel functions for common lisp evaluation
 
 
 
-;; Copyright (C) 2009-2012  Free Software Foundation, Inc.
 
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 
 
 ;; Author: Joel Boehland
 
 ;; Author: Joel Boehland
 
 ;;	Eric Schulte
 
 ;;	Eric Schulte
 
@@ -49,7 +49,6 @@
 
 For example a value of \"(progn ;; %s\\n   %%s)\" would ignore the
 
 For example a value of \"(progn ;; %s\\n   %%s)\" would ignore the
 
 current directory string."
 
 current directory string."
 
   :group 'org-babel
 
   :group 'org-babel
 
-  :version "24.1"
 
   :type 'string)
 
   :type 'string)
 
 
 
 (defun org-babel-expand-body:lisp (body params)
 
 (defun org-babel-expand-body:lisp (body params)

+ 3 - 4
lisp/ob-lob.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; ob-lob.el --- functions supporting the Library of Babel
 
 ;;; ob-lob.el --- functions supporting the Library of Babel
 
 
 
-;; Copyright (C) 2009-2012  Free Software Foundation, Inc.
 
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 
 
 ;; Author: Eric Schulte
 
 ;; Author: Eric Schulte
 
 ;;	Dan Davison
 
 ;;	Dan Davison
 
@@ -39,7 +39,6 @@ files to `org-babel-lob-files'.")
 
   "Files used to populate the `org-babel-library-of-babel'.
 
   "Files used to populate the `org-babel-library-of-babel'.
 
 To add files to this list use the `org-babel-lob-ingest' command."
 
 To add files to this list use the `org-babel-lob-ingest' command."
 
   :group 'org-babel
 
   :group 'org-babel
 
-  :version "24.1"
 
   :type 'list)
 
   :type 'list)
 
 
 
 (defvar org-babel-default-lob-header-args '((:exports . "results"))
 
 (defvar org-babel-default-lob-header-args '((:exports . "results"))
 
@@ -105,7 +104,7 @@ if so then run the appropriate source block from the Library."
 
 	(beginning-of-line 1)
 
 	(beginning-of-line 1)
 
 	(when (looking-at org-babel-lob-one-liner-regexp)
 
 	(when (looking-at org-babel-lob-one-liner-regexp)
 
 	  (append
 
 	  (append
 
-	   (mapcar #'org-babel-clean-text-properties
 
+	   (mapcar #'org-babel-clean-text-properties 
 		   (list
 
 		   (list
 
 		    (format "%s%s(%s)%s"
 
 		    (format "%s%s(%s)%s"
 
 			    (nonempty 3 12)
 
 			    (nonempty 3 12)
 
@@ -116,7 +115,7 @@ if so then run the appropriate source block from the Library."
 
 		    (nonempty 9 18)))
 
 		    (nonempty 9 18)))
 
 	   (list (length (if (= (length (match-string 12)) 0)
 
 	   (list (length (if (= (length (match-string 12)) 0)
 
 			     (match-string 2) (match-string 11))))))))))
 
 			     (match-string 2) (match-string 11))))))))))
 
-
 
+  
 (defun org-babel-lob-execute (info)
 
 (defun org-babel-lob-execute (info)
 
   "Execute the lob call specified by INFO."
 
   "Execute the lob call specified by INFO."
 
   (let ((params (org-babel-process-params
 
   (let ((params (org-babel-process-params

+ 1 - 1
lisp/ob-maxima.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; ob-maxima.el --- org-babel functions for maxima evaluation
 
 ;;; ob-maxima.el --- org-babel functions for maxima evaluation
 
 
 
-;; Copyright (C) 2009-2012  Free Software Foundation, Inc.
 
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 
 
 ;; Author: Eric S Fraga
 
 ;; Author: Eric S Fraga
 
 ;;	   Eric Schulte
 
 ;;	   Eric Schulte

+ 2 - 2
lisp/ob-ocaml.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; ob-ocaml.el --- org-babel functions for ocaml evaluation
 
 ;;; ob-ocaml.el --- org-babel functions for ocaml evaluation
 
 
 
-;; Copyright (C) 2009-2012  Free Software Foundation, Inc.
 
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 
 
 ;; Author: Eric Schulte
 
 ;; Author: Eric Schulte
 
 ;; Keywords: literate programming, reproducible research
 
 ;; Keywords: literate programming, reproducible research
 
@@ -98,7 +98,7 @@
 
    (lambda (pair) (format "let %s = %s;;" (car pair)
 
    (lambda (pair) (format "let %s = %s;;" (car pair)
 
 			  (org-babel-ocaml-elisp-to-ocaml (cdr pair))))
 
 			  (org-babel-ocaml-elisp-to-ocaml (cdr pair))))
 
    (mapcar #'cdr (org-babel-get-header params :var))))
 
    (mapcar #'cdr (org-babel-get-header params :var))))
 
-
 
+  
 (defun org-babel-ocaml-elisp-to-ocaml (val)
 
 (defun org-babel-ocaml-elisp-to-ocaml (val)
 
   "Return a string of ocaml code which evaluates to VAL."
 
   "Return a string of ocaml code which evaluates to VAL."
 
   (if (listp val)
 
   (if (listp val)

+ 4 - 5
lisp/ob-picolisp.el
View File 

@@ -45,10 +45,10 @@
 
 
 
 ;; PicoLisp _is_ an object-oriented database with a Prolog-based query
 
 ;; PicoLisp _is_ an object-oriented database with a Prolog-based query
 
 ;; language implemented in PicoLisp (Pilog). Database objects are
 
 ;; language implemented in PicoLisp (Pilog). Database objects are
 
-;; first-class members of the language.
 
+;; first-class members of the language. 
 
 
 ;; PicoLisp is an extremely productive framework for the development
 
 ;; PicoLisp is an extremely productive framework for the development
 
-;; of interactive web-applications (on top of a database).
 
+;; of interactive web-applications (on top of a database). 
 
 
 ;;; Requirements:
 
 ;;; Requirements:
 
 
 
@@ -76,7 +76,6 @@
 
 (defcustom org-babel-picolisp-cmd "pil"
 
 (defcustom org-babel-picolisp-cmd "pil"
 
   "Name of command used to evaluate picolisp blocks."
 
   "Name of command used to evaluate picolisp blocks."
 
   :group 'org-babel
 
   :group 'org-babel
 
-  :version "24.1"
 
   :type 'string)
 
   :type 'string)
 
 
 
 (defun org-babel-expand-body:picolisp (body params &optional processed-params)
 
 (defun org-babel-expand-body:picolisp (body params &optional processed-params)
 
@@ -97,7 +96,7 @@
 
 
 
 (defun org-babel-execute:picolisp (body params)
 
 (defun org-babel-execute:picolisp (body params)
 
   "Execute a block of Picolisp code with org-babel.  This function is
 
   "Execute a block of Picolisp code with org-babel.  This function is
 
- called by `org-babel-execute-src-block'"
 
+ called by `org-babel-execute-src-block'"           
   (message "executing Picolisp source code block")
 
   (message "executing Picolisp source code block")
 
   (let* (
 
   (let* (
 
 	 ;; name of the session or "none"
 
 	 ;; name of the session or "none"
 
@@ -120,7 +119,7 @@
 
            ((member "value" result-params)
 
            ((member "value" result-params)
 
             (format "(out \"/dev/null\" %s)" full-body))
 
             (format "(out \"/dev/null\" %s)" full-body))
 
            (t full-body))))
 
            (t full-body))))
 
-
 
+    
     ((lambda (result)
 
     ((lambda (result)
 
        (if (or (member "verbatim" result-params)
 
        (if (or (member "verbatim" result-params)
 
                (member "scalar" result-params)
 
                (member "scalar" result-params)

+ 0 - 1
lisp/ob-plantuml.el
View File 

@@ -44,7 +44,6 @@
 
 (defcustom org-plantuml-jar-path nil
 
 (defcustom org-plantuml-jar-path nil
 
   "Path to the plantuml.jar file."
 
   "Path to the plantuml.jar file."
 
   :group 'org-babel
 
   :group 'org-babel
 
-  :version "24.1"
 
   :type 'string)
 
   :type 'string)
 
 
 
 (defun org-babel-execute:plantuml (body params)
 
 (defun org-babel-execute:plantuml (body params)

+ 2 - 2
lisp/ob-ref.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; ob-ref.el --- org-babel functions for referencing external data
 
 ;;; ob-ref.el --- org-babel functions for referencing external data
 
 
 
-;; Copyright (C) 2009-2012  Free Software Foundation, Inc.
 
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 
 
 ;; Author: Eric Schulte
 
 ;; Author: Eric Schulte
 
 ;;	Dan Davison
 
 ;;	Dan Davison
 
@@ -60,7 +60,7 @@
 
 (declare-function org-narrow-to-subtree "org" ())
 
 (declare-function org-narrow-to-subtree "org" ())
 
 (declare-function org-id-find-id-in-file "org-id" (id file &optional markerp))
 
 (declare-function org-id-find-id-in-file "org-id" (id file &optional markerp))
 
 (declare-function org-show-context "org" (&optional key))
 
 (declare-function org-show-context "org" (&optional key))
 
-(declare-function org-pop-to-buffer-same-window
 
+(declare-function org-pop-to-buffer-same-window 
 		  "org-compat" (&optional buffer-or-name norecord label))
 
 		  "org-compat" (&optional buffer-or-name norecord label))
 
 
 
 (defvar org-babel-ref-split-regexp
 
 (defvar org-babel-ref-split-regexp

+ 2 - 2
lisp/ob-ruby.el
View File 

@@ -28,10 +28,10 @@
 
 ;;; Requirements:
 
 ;;; Requirements:
 
 
 
 ;; - ruby and irb executables :: http://www.ruby-lang.org/
 
 ;; - ruby and irb executables :: http://www.ruby-lang.org/
 
-;;
 
+;; 
 ;; - ruby-mode :: Can be installed through ELPA, or from
 
 ;; - ruby-mode :: Can be installed through ELPA, or from
 
 ;;   http://github.com/eschulte/rinari/raw/master/util/ruby-mode.el
 
 ;;   http://github.com/eschulte/rinari/raw/master/util/ruby-mode.el
 
-;;
 
+;;   
 ;; - inf-ruby mode :: Can be installed through ELPA, or from
 
 ;; - inf-ruby mode :: Can be installed through ELPA, or from
 
 ;;   http://github.com/eschulte/rinari/raw/master/util/inf-ruby.el
 
 ;;   http://github.com/eschulte/rinari/raw/master/util/inf-ruby.el

+ 1 - 1
lisp/ob-sass.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; ob-sass.el --- org-babel functions for the sass css generation language
 
 ;;; ob-sass.el --- org-babel functions for the sass css generation language
 
 
 
-;; Copyright (C) 2009-2012  Free Software Foundation, Inc.
 
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 
 
 ;; Author: Eric Schulte
 
 ;; Author: Eric Schulte
 
 ;; Keywords: literate programming, reproducible research
 
 ;; Keywords: literate programming, reproducible research

+ 0 - 1
lisp/ob-scheme.el
View File 

@@ -54,7 +54,6 @@
 
 (defcustom org-babel-scheme-cmd "guile"
 
 (defcustom org-babel-scheme-cmd "guile"
 
   "Name of command used to evaluate scheme blocks."
 
   "Name of command used to evaluate scheme blocks."
 
   :group 'org-babel
 
   :group 'org-babel
 
-  :version "24.1"
 
   :type 'string)
 
   :type 'string)
 
 
 
 (defun org-babel-expand-body:scheme (body params)
 
 (defun org-babel-expand-body:scheme (body params)

+ 15 - 33
lisp/ob-sh.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; ob-sh.el --- org-babel functions for shell evaluation
 
 ;;; ob-sh.el --- org-babel functions for shell evaluation
 
 
 
-;; Copyright (C) 2009-2012  Free Software Foundation, Inc.
 
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 
 
 ;; Author: Eric Schulte
 
 ;; Author: Eric Schulte
 
 ;; Keywords: literate programming, reproducible research
 
 ;; Keywords: literate programming, reproducible research
 
@@ -56,13 +56,14 @@ This will be passed to  `shell-command-on-region'")
 
 This function is called by `org-babel-execute-src-block'."
 
 This function is called by `org-babel-execute-src-block'."
 
   (let* ((session (org-babel-sh-initiate-session
 
   (let* ((session (org-babel-sh-initiate-session
 
 		   (cdr (assoc :session params))))
 
 		   (cdr (assoc :session params))))
 
+         (result-params (cdr (assoc :result-params params)))
 
 	 (stdin ((lambda (stdin) (when stdin (org-babel-sh-var-to-string
 
 	 (stdin ((lambda (stdin) (when stdin (org-babel-sh-var-to-string
 
 					 (org-babel-ref-resolve stdin))))
 
 					 (org-babel-ref-resolve stdin))))
 
 		 (cdr (assoc :stdin params))))
 
 		 (cdr (assoc :stdin params))))
 
          (full-body (org-babel-expand-body:generic
 
          (full-body (org-babel-expand-body:generic
 
 		     body params (org-babel-variable-assignments:sh params))))
 
 		     body params (org-babel-variable-assignments:sh params))))
 
     (org-babel-reassemble-table
 
     (org-babel-reassemble-table
 
-     (org-babel-sh-evaluate session full-body params stdin)
 
+     (org-babel-sh-evaluate session full-body result-params stdin)
 
      (org-babel-pick-name
 
      (org-babel-pick-name
 
       (cdr (assoc :colname-names params)) (cdr (assoc :colnames params)))
 
       (cdr (assoc :colname-names params)) (cdr (assoc :colnames params)))
 
      (org-babel-pick-name
 
      (org-babel-pick-name
 
@@ -133,38 +134,29 @@ Emacs-lisp table, otherwise return the results as a string."
 
 (defvar org-babel-sh-eoe-output "org_babel_sh_eoe"
 
 (defvar org-babel-sh-eoe-output "org_babel_sh_eoe"
 
   "String to indicate that evaluation has completed.")
 
   "String to indicate that evaluation has completed.")
 
 
 
-(defun org-babel-sh-evaluate (session body &optional params stdin)
 
+(defun org-babel-sh-evaluate (session body &optional result-params stdin)
 
   "Pass BODY to the Shell process in BUFFER.
 
   "Pass BODY to the Shell process in BUFFER.
 
 If RESULT-TYPE equals 'output then return a list of the outputs
 
 If RESULT-TYPE equals 'output then return a list of the outputs
 
 of the statements in BODY, if RESULT-TYPE equals 'value then
 
 of the statements in BODY, if RESULT-TYPE equals 'value then
 
 return the value of the last statement in BODY."
 
 return the value of the last statement in BODY."
 
   ((lambda (results)
 
   ((lambda (results)
 
      (when results
 
      (when results
 
-       (let ((result-params (cdr (assoc :result-params params))))
 
-	 (if (or (member "scalar" result-params)
 
-		 (member "verbatim" result-params)
 
-		 (member "output" result-params))
 
-	     results
 
-	   (let ((tmp-file (org-babel-temp-file "sh-")))
 
-	     (with-temp-file tmp-file (insert results))
 
-	     (org-babel-import-elisp-from-file tmp-file))))))
 
+       (if (or (member "scalar" result-params)
 
+	       (member "verbatim" result-params)
 
+	       (member "output" result-params))
 
+	   results
 
+	 (let ((tmp-file (org-babel-temp-file "sh-")))
 
+	   (with-temp-file tmp-file (insert results))
 
+	   (org-babel-import-elisp-from-file tmp-file)))))
 
    (cond
 
    (cond
 
     (stdin				; external shell script w/STDIN
 
     (stdin				; external shell script w/STDIN
 
      (let ((script-file (org-babel-temp-file "sh-script-"))
 
      (let ((script-file (org-babel-temp-file "sh-script-"))
 
-	   (stdin-file (org-babel-temp-file "sh-stdin-"))
 
-	   (shebang (cdr (assoc :shebang params)))
 
-	   (padline (not (string= "no" (cdr (assoc :padline params))))))
 
-       (with-temp-file script-file
 
-	 (when shebang (insert (concat shebang "\n")))
 
-	 (when padline (insert "\n"))
 
-	 (insert body))
 
-       (set-file-modes script-file #o755)
 
+	   (stdin-file (org-babel-temp-file "sh-stdin-")))
 
+       (with-temp-file script-file (insert body))
 
        (with-temp-file stdin-file (insert stdin))
 
        (with-temp-file stdin-file (insert stdin))
 
        (with-temp-buffer
 
        (with-temp-buffer
 
 	 (call-process-shell-command
 
 	 (call-process-shell-command
 
-	  (if shebang
 
-	      script-file
 
-	    (format "%s %s" org-babel-sh-command script-file))
 
+	  (format "%s %s" org-babel-sh-command script-file)
 
 	  stdin-file
 
 	  stdin-file
 
 	  (current-buffer))
 
 	  (current-buffer))
 
 	 (buffer-string))))
 
 	 (buffer-string))))
 
@@ -190,17 +182,7 @@ return the value of the last statement in BODY."
 
 	    (list org-babel-sh-eoe-indicator))))
 
 	    (list org-babel-sh-eoe-indicator))))
 
 	2)) "\n"))
 
 	2)) "\n"))
 
     ('otherwise				; external shell script
 
     ('otherwise				; external shell script
 
-     (if (cdr (assoc :shebang params))
 
-	 (let ((script-file (org-babel-temp-file "sh-script-"))
 
-	       (shebang (cdr (assoc :shebang params)))
 
-	       (padline (not (string= "no" (cdr (assoc :padline params))))))
 
-	   (with-temp-file script-file
 
-	     (when shebang (insert (concat shebang "\n")))
 
-	     (when padline (insert "\n"))
 
-	     (insert body))
 
-	   (set-file-modes script-file #o755)
 
-	   (org-babel-eval script-file ""))
 
-       (org-babel-eval org-babel-sh-command (org-babel-trim body)))))))
 
+     (org-babel-eval org-babel-sh-command (org-babel-trim body))))))
 
 
 
 (defun org-babel-sh-strip-weird-long-prompt (string)
 
 (defun org-babel-sh-strip-weird-long-prompt (string)
 
   "Remove prompt cruft from a string of shell output."
 
   "Remove prompt cruft from a string of shell output."

+ 2 - 6
lisp/ob-sql.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; ob-sql.el --- org-babel functions for sql evaluation
 
 ;;; ob-sql.el --- org-babel functions for sql evaluation
 
 
 
-;; Copyright (C) 2009-2012  Free Software Foundation, Inc.
 
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 
 
 ;; Author: Eric Schulte
 
 ;; Author: Eric Schulte
 
 ;; Keywords: literate programming, reproducible research
 
 ;; Keywords: literate programming, reproducible research
 
@@ -40,7 +40,7 @@
 
 ;; - add more useful header arguments (user, passwd, database, etc...)
 
 ;; - add more useful header arguments (user, passwd, database, etc...)
 
 ;; - support for more engines (currently only supports mysql)
 
 ;; - support for more engines (currently only supports mysql)
 
 ;; - what's a reasonable way to drop table data into SQL?
 
 ;; - what's a reasonable way to drop table data into SQL?
 
-;;
 
+;; 
 
 
 ;;; Code:
 
 ;;; Code:
 
 (require 'ob)
 
 (require 'ob)
 
@@ -70,10 +70,6 @@ This function is called by `org-babel-execute-src-block'."
 
                        (org-babel-temp-file "sql-out-")))
 
                        (org-babel-temp-file "sql-out-")))
 
 	 (header-delim "")
 
 	 (header-delim "")
 
          (command (case (intern engine)
 
          (command (case (intern engine)
 
-                    ('monetdb (format "mclient -f tab %s < %s > %s"
 
-                                      (or cmdline "")
 
-                                      (org-babel-process-file-name in-file)
 
-                                      (org-babel-process-file-name out-file)))
 
                     ('msosql (format "osql %s -s \"\t\" -i %s -o %s"
 
                     ('msosql (format "osql %s -s \"\t\" -i %s -o %s"
 
                                      (or cmdline "")
 
                                      (or cmdline "")
 
                                      (org-babel-process-file-name in-file)
 
                                      (org-babel-process-file-name in-file)

+ 1 - 1
lisp/ob-table.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; ob-table.el --- support for calling org-babel functions from tables
 
 ;;; ob-table.el --- support for calling org-babel functions from tables
 
 
 
-;; Copyright (C) 2009-2012  Free Software Foundation, Inc.
 
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 
 
 ;; Author: Eric Schulte
 
 ;; Author: Eric Schulte
 
 ;; Keywords: literate programming, reproducible research
 
 ;; Keywords: literate programming, reproducible research

+ 7 - 10
lisp/ob-tangle.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; ob-tangle.el --- extract source code from org-mode files
 
 ;;; ob-tangle.el --- extract source code from org-mode files
 
 
 
-;; Copyright (C) 2009-2012  Free Software Foundation, Inc.
 
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 
 
 ;; Author: Eric Schulte
 
 ;; Author: Eric Schulte
 
 ;; Keywords: literate programming, reproducible research
 
 ;; Keywords: literate programming, reproducible research
 
@@ -47,7 +47,6 @@ be inserted as the extension commonly used to identify files
 
 written in this language.  If no entry is found in this list,
 
 written in this language.  If no entry is found in this list,
 
 then the name of the language is used."
 
 then the name of the language is used."
 
   :group 'org-babel-tangle
 
   :group 'org-babel-tangle
 
-  :version "24.1"
 
   :type '(repeat
 
   :type '(repeat
 
 	  (cons
 
 	  (cons
 
 	   (string "Language name")
 
 	   (string "Language name")
 
@@ -56,19 +55,16 @@ then the name of the language is used."
 
 (defcustom org-babel-post-tangle-hook nil
 
 (defcustom org-babel-post-tangle-hook nil
 
   "Hook run in code files tangled by `org-babel-tangle'."
 
   "Hook run in code files tangled by `org-babel-tangle'."
 
   :group 'org-babel
 
   :group 'org-babel
 
-  :version "24.1"
 
   :type 'hook)
 
   :type 'hook)
 
 
 
 (defcustom org-babel-pre-tangle-hook '(save-buffer)
 
 (defcustom org-babel-pre-tangle-hook '(save-buffer)
 
   "Hook run at the beginning of `org-babel-tangle'."
 
   "Hook run at the beginning of `org-babel-tangle'."
 
   :group 'org-babel
 
   :group 'org-babel
 
-  :version "24.1"
 
   :type 'hook)
 
   :type 'hook)
 
 
 
 (defcustom org-babel-tangle-body-hook nil
 
 (defcustom org-babel-tangle-body-hook nil
 
   "Hook run over the contents of each code block body."
 
   "Hook run over the contents of each code block body."
 
   :group 'org-babel
 
   :group 'org-babel
 
-  :version "24.1"
 
   :type 'hook)
 
   :type 'hook)
 
 
 
 (defcustom org-babel-tangle-comment-format-beg "[[%link][%source-name]]"
 
 (defcustom org-babel-tangle-comment-format-beg "[[%link][%source-name]]"
 
@@ -83,7 +79,6 @@ information into the output using `org-fill-template'.
 
 Whether or not comments are inserted during tangling is
 
 Whether or not comments are inserted during tangling is
 
 controlled by the :comments header argument."
 
 controlled by the :comments header argument."
 
   :group 'org-babel
 
   :group 'org-babel
 
-  :version "24.1"
 
   :type 'string)
 
   :type 'string)
 
 
 
 (defcustom org-babel-tangle-comment-format-end "%source-name ends here"
 
 (defcustom org-babel-tangle-comment-format-end "%source-name ends here"
 
@@ -98,7 +93,6 @@ information into the output using `org-fill-template'.
 
 Whether or not comments are inserted during tangling is
 
 Whether or not comments are inserted during tangling is
 
 controlled by the :comments header argument."
 
 controlled by the :comments header argument."
 
   :group 'org-babel
 
   :group 'org-babel
 
-  :version "24.1"
 
   :type 'string)
 
   :type 'string)
 
 
 
 (defcustom org-babel-process-comment-text #'org-babel-trim
 
 (defcustom org-babel-process-comment-text #'org-babel-trim
 
@@ -107,7 +101,6 @@ inserted as comments in tangled source-code files.  The function
 
 should take a single string argument and return a string
 
 should take a single string argument and return a string
 
 result.  The default value is `org-babel-trim'."
 
 result.  The default value is `org-babel-trim'."
 
   :group 'org-babel
 
   :group 'org-babel
 
-  :version "24.1"
 
   :type 'function)
 
   :type 'function)
 
 
 
 (defun org-babel-find-file-noselect-refresh (file)
 
 (defun org-babel-find-file-noselect-refresh (file)
 
@@ -290,7 +283,7 @@ references."
 
   (interactive)
 
   (interactive)
 
   (goto-char (point-min))
 
   (goto-char (point-min))
 
   (while (or (re-search-forward "\\[\\[file:.*\\]\\[.*\\]\\]" nil t)
 
   (while (or (re-search-forward "\\[\\[file:.*\\]\\[.*\\]\\]" nil t)
 
-             (re-search-forward (org-babel-noweb-wrap) nil t))
 
+             (re-search-forward "<<[^[:space:]]*>>" nil t))
 
     (delete-region (save-excursion (beginning-of-line 1) (point))
 
     (delete-region (save-excursion (beginning-of-line 1) (point))
 
                    (save-excursion (end-of-line 1) (forward-char 1) (point)))))
 
                    (save-excursion (end-of-line 1) (forward-char 1) (point)))))
 
 
 
@@ -351,7 +344,11 @@ code blocks by language."
 
 			     body params
 
 			     body params
 
 			     (and (fboundp assignments-cmd)
 
 			     (and (fboundp assignments-cmd)
 
 				  (funcall assignments-cmd params))))))
 
 				  (funcall assignments-cmd params))))))
 
-		      (if (org-babel-noweb-p params :tangle)
 
+		      (if (and (cdr (assoc :noweb params)) ;; expand noweb refs
 
+			       (let ((nowebs (split-string
 
+					      (cdr (assoc :noweb params)))))
 
+				 (or (member "yes" nowebs)
 
+				     (member "tangle" nowebs))))
 
 			  (org-babel-expand-noweb-references info)
 
 			  (org-babel-expand-noweb-references info)
 
 			(nth 1 info)))))
 
 			(nth 1 info)))))
 
 		   (comment
 
 		   (comment

+ 27 - 85
lisp/ob.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; ob.el --- working with code blocks in org-mode
 
 ;;; ob.el --- working with code blocks in org-mode
 
 
 
-;; Copyright (C) 2009-2012  Free Software Foundation, Inc.
 
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 
 
 ;; Author: Eric Schulte
 
 ;; Author: Eric Schulte
 
 ;;	Dan Davison
 
 ;;	Dan Davison
 
@@ -33,8 +33,6 @@
 
 (defvar org-babel-library-of-babel)
 
 (defvar org-babel-library-of-babel)
 
 (declare-function show-all "outline" ())
 
 (declare-function show-all "outline" ())
 
 (declare-function org-reduce "org" (CL-FUNC CL-SEQ &rest CL-KEYS))
 
 (declare-function org-reduce "org" (CL-FUNC CL-SEQ &rest CL-KEYS))
 
-(declare-function org-mark-ring-push "org" (&optional pos buffer))
 
-(declare-function org-strip-protective-commas "org" (beg end))
 
 (declare-function tramp-compat-make-temp-file "tramp-compat"
 
 (declare-function tramp-compat-make-temp-file "tramp-compat"
 
                   (filename &optional dir-flag))
 
                   (filename &optional dir-flag))
 
 (declare-function tramp-dissect-file-name "tramp" (name &optional nodefault))
 
 (declare-function tramp-dissect-file-name "tramp" (name &optional nodefault))
 
@@ -59,7 +57,6 @@
 
 (declare-function org-cycle "org" (&optional arg))
 
 (declare-function org-cycle "org" (&optional arg))
 
 (declare-function org-uniquify "org" (list))
 
 (declare-function org-uniquify "org" (list))
 
 (declare-function org-current-level "org" ())
 
 (declare-function org-current-level "org" ())
 
-(declare-function org-strip-protective-commas "org" (beg end))
 
 (declare-function org-table-import "org-table" (file arg))
 
 (declare-function org-table-import "org-table" (file arg))
 
 (declare-function org-add-hook "org-compat"
 
 (declare-function org-add-hook "org-compat"
 
 		  (hook function &optional append local))
 
 		  (hook function &optional append local))
 
@@ -107,7 +104,6 @@ against accidental code block evaluation.  The
 
 `org-babel-no-eval-on-ctrl-c-ctrl-c' variable can be used to
 
 `org-babel-no-eval-on-ctrl-c-ctrl-c' variable can be used to
 
 remove code block execution from the C-c C-c keybinding."
 
 remove code block execution from the C-c C-c keybinding."
 
     :group 'org-babel
 
     :group 'org-babel
 
-    :version "24.1"
 
     :type '(choice boolean function))
 
     :type '(choice boolean function))
 
 ;; don't allow this variable to be changed through file settings
 
 ;; don't allow this variable to be changed through file settings
 
 (put 'org-confirm-babel-evaluate 'safe-local-variable (lambda (x) (eq x t)))
 
 (put 'org-confirm-babel-evaluate 'safe-local-variable (lambda (x) (eq x t)))
 
@@ -115,7 +111,6 @@ remove code block execution from the C-c C-c keybinding."
 
 (defcustom org-babel-no-eval-on-ctrl-c-ctrl-c nil
 
 (defcustom org-babel-no-eval-on-ctrl-c-ctrl-c nil
 
   "Remove code block evaluation from the C-c C-c key binding."
 
   "Remove code block evaluation from the C-c C-c key binding."
 
   :group 'org-babel
 
   :group 'org-babel
 
-  :version "24.1"
 
   :type 'boolean)
 
   :type 'boolean)
 
 
 
 (defcustom org-babel-results-keyword "RESULTS"
 
 (defcustom org-babel-results-keyword "RESULTS"
 
@@ -125,23 +120,6 @@ be used."
 
   :group 'org-babel
 
   :group 'org-babel
 
   :type 'string)
 
   :type 'string)
 
 
 
-(defcustom org-babel-noweb-wrap-start "<<"
 
-  "String used to begin a noweb reference in a code block.
 
-See also `org-babel-noweb-wrap-end'."
 
-  :group 'org-babel
 
-  :type 'string)
 
-
 
-(defcustom org-babel-noweb-wrap-end ">>"
 
-  "String used to end a noweb reference in a code block.
 
-See also `org-babel-noweb-wrap-start'."
 
-  :group 'org-babel
 
-  :type 'string)
 
-
 
-(defun org-babel-noweb-wrap (&optional regexp)
 
-  (concat org-babel-noweb-wrap-start
 
-	  (or regexp "\\([^ \t\n].+?[^ \t]\\|[^ \t\n]\\)")
 
-	  org-babel-noweb-wrap-end))
 
-
 
 (defvar org-babel-src-name-regexp
 
 (defvar org-babel-src-name-regexp
 
   "^[ \t]*#\\+name:[ \t]*"
 
   "^[ \t]*#\\+name:[ \t]*"
 
   "Regular expression used to match a source name line.")
 
   "Regular expression used to match a source name line.")
 
@@ -403,7 +381,7 @@ then run `org-babel-pop-to-session'."
 
     (mkdirp	. ((yes no)))
 
     (mkdirp	. ((yes no)))
 
     (no-expand)
 
     (no-expand)
 
     (noeval)
 
     (noeval)
 
-    (noweb	. ((yes no tangle no-export strip-export)))
 
+    (noweb	. ((yes no tangle)))
 
     (noweb-ref	. :any)
 
     (noweb-ref	. :any)
 
     (noweb-sep  . :any)
 
     (noweb-sep  . :any)
 
     (padline	. ((yes no)))
 
     (padline	. ((yes no)))
 
@@ -416,8 +394,7 @@ then run `org-babel-pop-to-session'."
 
     (session	. :any)
 
     (session	. :any)
 
     (shebang	. :any)
 
     (shebang	. :any)
 
     (tangle	. ((tangle yes no :any)))
 
     (tangle	. ((tangle yes no :any)))
 
-    (var	. :any)
 
-    (wrap       . :any)))
 
+    (var	. :any)))
 
 
 
 (defconst org-babel-header-arg-names
 
 (defconst org-babel-header-arg-names
 
   (mapcar #'car org-babel-common-header-args-w-values)
 
   (mapcar #'car org-babel-common-header-args-w-values)
 
@@ -515,9 +492,12 @@ block."
 
 	     (new-hash (when cache? (org-babel-sha1-hash info)))
 
 	     (new-hash (when cache? (org-babel-sha1-hash info)))
 
 	     (old-hash (when cache? (org-babel-current-result-hash)))
 
 	     (old-hash (when cache? (org-babel-current-result-hash)))
 
 	     (body (setf (nth 1 info)
 
 	     (body (setf (nth 1 info)
 
-			 (if (org-babel-noweb-p params :eval)
 
-			     (org-babel-expand-noweb-references info)
 
-			   (nth 1 info))))
 
+			 (let ((noweb (cdr (assoc :noweb params))))
 
+			   (if (and noweb
 
+				    (or (string= "yes" noweb)
 
+					(string= "tangle" noweb)))
 
+			       (org-babel-expand-noweb-references info)
 
+			     (nth 1 info)))))
 
 	     (dir (cdr (assoc :dir params)))
 
 	     (dir (cdr (assoc :dir params)))
 
 	     (default-directory
 
 	     (default-directory
 
 	       (or (and dir (file-name-as-directory dir)) default-directory))
 
 	       (or (and dir (file-name-as-directory dir)) default-directory))
 
@@ -591,7 +571,8 @@ arguments and pop open the results in a preview buffer."
 
                              (lambda (el1 el2) (string< (symbol-name (car el1))
 
                              (lambda (el1 el2) (string< (symbol-name (car el1))
 
 						   (symbol-name (car el2)))))))
 
 						   (symbol-name (car el2)))))))
 
          (body (setf (nth 1 info)
 
          (body (setf (nth 1 info)
 
-		     (if (org-babel-noweb-p params :eval)
 
+		     (if (and (cdr (assoc :noweb params))
 
+                              (string= "yes" (cdr (assoc :noweb params))))
 
 			 (org-babel-expand-noweb-references info) (nth 1 info))))
 
 			 (org-babel-expand-noweb-references info) (nth 1 info))))
 
          (expand-cmd (intern (concat "org-babel-expand-body:" lang)))
 
          (expand-cmd (intern (concat "org-babel-expand-body:" lang)))
 
 	 (assignments-cmd (intern (concat "org-babel-variable-assignments:"
 
 	 (assignments-cmd (intern (concat "org-babel-variable-assignments:"
 
@@ -688,7 +669,8 @@ session."
 
          (lang (nth 0 info))
 
          (lang (nth 0 info))
 
          (params (nth 2 info))
 
          (params (nth 2 info))
 
          (body (setf (nth 1 info)
 
          (body (setf (nth 1 info)
 
-		     (if (org-babel-noweb-p params :eval)
 
+		     (if (and (cdr (assoc :noweb params))
 
+                              (string= "yes" (cdr (assoc :noweb params))))
 
                          (org-babel-expand-noweb-references info)
 
                          (org-babel-expand-noweb-references info)
 
 		       (nth 1 info))))
 
 		       (nth 1 info))))
 
          (session (cdr (assoc :session params)))
 
          (session (cdr (assoc :session params)))
 
@@ -1460,35 +1442,13 @@ If the point is not on a source block then return nil."
 
 (defun org-babel-goto-named-src-block (name)
 
 (defun org-babel-goto-named-src-block (name)
 
   "Go to a named source-code block."
 
   "Go to a named source-code block."
 
   (interactive
 
   (interactive
 
-   (let ((completion-ignore-case t)
 
-	 (under-point (thing-at-point 'line)))
 
-     (list (org-icompleting-read
 
-	    "source-block name: " (org-babel-src-block-names) nil t
 
-	    (cond
 
-	     ;; noweb
 
-	     ((string-match (org-babel-noweb-wrap) under-point)
 
-	      (let ((block-name (match-string 1 under-point)))
 
-		(string-match "[^(]*" block-name)
 
-		(match-string 0 block-name)))
 
-	     ;; #+call:
 
-	     ((string-match org-babel-lob-one-liner-regexp under-point)
 
-	      (let ((source-info (car (org-babel-lob-get-info))))
 
-		(if (string-match "^\\([^\\[]+?\\)\\(\\[.*\\]\\)?(" source-info)
 
-		    (let ((source-name (match-string 1 source-info)))
 
-		      source-name))))
 
-	     ;; #+results:
 
-	     ((string-match (concat "#\\+" org-babel-results-keyword
 
-				    "\\:\s+\\([^\\(]*\\)") under-point)
 
-	      (match-string 1 under-point))
 
-	     ;; symbol-at-point
 
-	     ((and (thing-at-point 'symbol))
 
-	      (org-babel-find-named-block (thing-at-point 'symbol))
 
-	      (thing-at-point 'symbol))
 
-	     (""))))))
 
+   (let ((completion-ignore-case t))
 
+     (list (org-icompleting-read "source-block name: "
 
+				 (org-babel-src-block-names) nil t))))
 
   (let ((point (org-babel-find-named-block name)))
 
   (let ((point (org-babel-find-named-block name)))
 
     (if point
 
     (if point
 
         ;; taken from `org-open-at-point'
 
         ;; taken from `org-open-at-point'
 
-        (progn (org-mark-ring-push) (goto-char point) (org-show-context))
 
+        (progn (goto-char point) (org-show-context))
 
       (message "source-code block '%s' not found in this buffer" name))))
 
       (message "source-code block '%s' not found in this buffer" name))))
 
 
 
 (defun org-babel-find-named-block (name)
 
 (defun org-babel-find-named-block (name)
 
@@ -1914,9 +1874,6 @@ code ---- the results are extracted in the syntax of the source
 
 	  (setq end (point-marker))
 
 	  (setq end (point-marker))
 
 	  ;; possibly wrap result
 
 	  ;; possibly wrap result
 
 	  (cond
 
 	  (cond
 
-	   ((assoc :wrap (nth 2 info))
 
-	    (let ((name (or (cdr (assoc :wrap (nth 2 info))) "RESULTS")))
 
-	      (wrap (concat "#+BEGIN_" name) (concat "#+END_" name))))
 
 	   ((member "html" result-params)
 
 	   ((member "html" result-params)
 
 	    (wrap "#+BEGIN_HTML" "#+END_HTML"))
 
 	    (wrap "#+BEGIN_HTML" "#+END_HTML"))
 
 	   ((member "latex" result-params)
 
 	   ((member "latex" result-params)
 
@@ -1968,10 +1925,11 @@ code ---- the results are extracted in the syntax of the source
 
       (progn (re-search-forward (concat "^" (match-string 1) ":END:"))
 
       (progn (re-search-forward (concat "^" (match-string 1) ":END:"))
 
 	     (forward-char 1) (point)))
 
 	     (forward-char 1) (point)))
 
      (t
 
      (t
 
-      (let ((case-fold-search t))
 
-	(if (looking-at (concat "[ \t]*#\\+begin_\\([^ \t\n\r]+\\)"))
 
-	    (progn (re-search-forward (concat "[ \t]*#\\+end_" (match-string 1))
 
-				      nil t)
 
+      (let ((case-fold-search t)
 
+	    (blocks-re (regexp-opt
 
+			(list "latex" "html" "example" "src" "result" "org"))))
 
+	(if (looking-at (concat "[ \t]*#\\+begin_" blocks-re))
 
+	    (progn (re-search-forward (concat "[ \t]*#\\+end_" blocks-re) nil t)
 
 		   (forward-char 1))
 
 		   (forward-char 1))
 
 	  (while (looking-at "[ \t]*\\(: \\|\\[\\[\\)")
 
 	  (while (looking-at "[ \t]*\\(: \\|\\[\\[\\)")
 
 	    (forward-line 1))))
 
 	    (forward-line 1))))
 
@@ -2115,11 +2073,8 @@ parameters when merging lists."
 
 	      (:tangle ;; take the latest -- always overwrite
 
 	      (:tangle ;; take the latest -- always overwrite
 
 	       (setq tangle (or (list (cdr pair)) tangle)))
 
 	       (setq tangle (or (list (cdr pair)) tangle)))
 
 	      (:noweb
 
 	      (:noweb
 
-	       (setq noweb (e-merge
 
-			    '(("yes" "no" "tangle" "no-export"
 
-			       "strip-export" "eval"))
 
-			    noweb
 
-			    (split-string (or (cdr pair) "")))))
 
+	       (setq noweb (e-merge '(("yes" "no" "tangle")) noweb
 
+				    (split-string (or (cdr pair) "")))))
 
 	      (:cache
 
 	      (:cache
 
 	       (setq cache (e-merge '(("yes" "no")) cache
 
 	       (setq cache (e-merge '(("yes" "no")) cache
 
 				    (split-string (or (cdr pair) "")))))
 
 				    (split-string (or (cdr pair) "")))))
 
@@ -2151,20 +2106,6 @@ This results in much faster noweb reference expansion but does
 
 not properly allow code blocks to inherit the \":noweb-ref\"
 
 not properly allow code blocks to inherit the \":noweb-ref\"
 
 header argument from buffer or subtree wide properties.")
 
 header argument from buffer or subtree wide properties.")
 
 
 
-(defun org-babel-noweb-p (params context)
 
-  "Check if PARAMS require expansion in CONTEXT.
 
-CONTEXT may be one of :tangle, :export or :eval."
 
-  (flet ((intersect (as bs)
 
-		       (when as
 
-			 (if (member (car as) bs)
 
-			     (car as)
 
-			   (intersect (cdr as) bs)))))
 
-    (intersect (case context
 
-                    (:tangle '("yes" "tangle" "no-export" "strip-export"))
 
-                    (:eval   '("yes" "no-export" "strip-export" "eval"))
 
-                    (:export '("yes")))
 
-                  (split-string (or (cdr (assoc :noweb params)) "")))))
 
-
 
 (defun org-babel-expand-noweb-references (&optional info parent-buffer)
 
 (defun org-babel-expand-noweb-references (&optional info parent-buffer)
 
   "Expand Noweb references in the body of the current source code block.
 
   "Expand Noweb references in the body of the current source code block.
 
 
 
@@ -2212,7 +2153,8 @@ block but are passed literally to the \"example-block\"."
 
       (with-temp-buffer
 
       (with-temp-buffer
 
         (insert body) (goto-char (point-min))
 
         (insert body) (goto-char (point-min))
 
         (setq index (point))
 
         (setq index (point))
 
-        (while (and (re-search-forward (org-babel-noweb-wrap) nil t))
 
+        (while (and (re-search-forward "<<\\([^ \t\n].+?[^ \t\n]\\|[^ \t\n]\\)>>"
 
+				       nil t))
 
           (save-match-data (setf source-name (match-string 1)))
 
           (save-match-data (setf source-name (match-string 1)))
 
           (save-match-data (setq evaluate (string-match "\(.*\)" source-name)))
 
           (save-match-data (setq evaluate (string-match "\(.*\)" source-name)))
 
           (save-match-data
 
           (save-match-data
 
@@ -2284,7 +2226,7 @@ block but are passed literally to the \"example-block\"."
 
 		  ;; possibly raise an error if named block doesn't exist
 
 		  ;; possibly raise an error if named block doesn't exist
 
 		  (if (member lang org-babel-noweb-error-langs)
 
 		  (if (member lang org-babel-noweb-error-langs)
 
 		      (error "%s" (concat
 
 		      (error "%s" (concat
 
-				   (org-babel-noweb-wrap source-name)
 
+				   "<<" source-name ">> "
 
 				   "could not be resolved (see "
 
 				   "could not be resolved (see "
 
 				   "`org-babel-noweb-error-langs')"))
 
 				   "`org-babel-noweb-error-langs')"))
 
 		    "")))
 
 		    "")))

+ 13 - 38
lisp/org-agenda.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; org-agenda.el --- Dynamic task and appointment lists for Org
 
 ;;; org-agenda.el --- Dynamic task and appointment lists for Org
 
 
 
-;; Copyright (C) 2004-2012 Free Software Foundation, Inc.
 
+;; Copyright (C) 2004-2011 Free Software Foundation, Inc.
 
 
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 
 ;; Keywords: outlines, hypermedia, calendar, wp
 
 ;; Keywords: outlines, hypermedia, calendar, wp
 
@@ -247,9 +247,7 @@ you can \"misuse\" it to also add other text to the header.  However,
 
 
 
 ;; Keep custom values for `org-agenda-filter-preset' compatible with
 
 ;; Keep custom values for `org-agenda-filter-preset' compatible with
 
 ;; the new variable `org-agenda-tag-filter-preset'.
 
 ;; the new variable `org-agenda-tag-filter-preset'.
 
-(if (fboundp 'defvaralias)
 
-    (defvaralias 'org-agenda-filter-preset 'org-agenda-tag-filter-preset)
 
-    (defvaralias 'org-agenda-filter 'org-agenda-tag-filter))
 
+(defvaralias 'org-agenda-filter-preset 'org-agenda-tag-filter-preset)
 
 
 
 (defconst org-agenda-custom-commands-local-options
 
 (defconst org-agenda-custom-commands-local-options
 
   `(repeat :tag "Local settings for this command. Remember to quote values"
 
   `(repeat :tag "Local settings for this command. Remember to quote values"
 
@@ -649,7 +647,6 @@ See also the variable `org-agenda-tags-todo-honor-ignore-options' if you want
 
 to make his option also apply to the tags-todo list."
 
 to make his option also apply to the tags-todo list."
 
   :group 'org-agenda-skip
 
   :group 'org-agenda-skip
 
   :group 'org-agenda-todo-list
 
   :group 'org-agenda-todo-list
 
-  :version "24.1"
 
   :type '(choice
 
   :type '(choice
 
 	  (const :tag "Ignore future timestamp todos" future)
 
 	  (const :tag "Ignore future timestamp todos" future)
 
 	  (const :tag "Ignore past or present timestamp todos" past)
 
 	  (const :tag "Ignore past or present timestamp todos" past)
 
@@ -797,7 +794,6 @@ trigger you to schedule it, and then you don't want to be reminded of it
 
 because you will take care of it on the day when scheduled."
 
 because you will take care of it on the day when scheduled."
 
   :group 'org-agenda-skip
 
   :group 'org-agenda-skip
 
   :group 'org-agenda-daily/weekly
 
   :group 'org-agenda-daily/weekly
 
-  :version "24.1"
 
   :type '(choice
 
   :type '(choice
 
 	  (const :tag "Alwas show prewarning" nil)
 
 	  (const :tag "Alwas show prewarning" nil)
 
 	  (const :tag "Remove prewarning if entry is scheduled" t)
 
 	  (const :tag "Remove prewarning if entry is scheduled" t)
 
@@ -862,7 +858,6 @@ property so than moving the mouse over the command shows it.
 
 Setting it to nil is good if matcher strings are very long and/or if
 
 Setting it to nil is good if matcher strings are very long and/or if
 
 you want to use two-column display (see `org-agenda-menu-two-column')."
 
 you want to use two-column display (see `org-agenda-menu-two-column')."
 
   :group 'org-agenda
 
   :group 'org-agenda
 
-  :version "24.1"
 
   :type 'boolean)
 
   :type 'boolean)
 
 
 
 (defcustom org-agenda-menu-two-column nil
 
 (defcustom org-agenda-menu-two-column nil
 
@@ -870,7 +865,6 @@ you want to use two-column display (see `org-agenda-menu-two-column')."
 
 If you use this, you probably want to set `org-agenda-menu-show-matcher'
 
 If you use this, you probably want to set `org-agenda-menu-show-matcher'
 
 to nil."
 
 to nil."
 
   :group 'org-agenda
 
   :group 'org-agenda
 
-  :version "24.1"
 
   :type 'boolean)
 
   :type 'boolean)
 
 
 
 (defcustom org-finalize-agenda-hook nil
 
 (defcustom org-finalize-agenda-hook nil
 
@@ -894,7 +888,6 @@ Needs to be set before org.el is loaded."
 
   "Non-nil means `org-agenda-follow-mode' displays only the
 
   "Non-nil means `org-agenda-follow-mode' displays only the
 
 current item's tree, in an indirect buffer."
 
 current item's tree, in an indirect buffer."
 
   :group 'org-agenda
 
   :group 'org-agenda
 
-  :version "24.1"
 
   :type 'boolean)
 
   :type 'boolean)
 
 
 
 (defcustom org-agenda-show-outline-path t
 
 (defcustom org-agenda-show-outline-path t
 
@@ -1047,13 +1040,11 @@ This function makes sure that dates are aligned for easy reading."
 
   "Non-nil means use leading zero for military times in agenda.
 
   "Non-nil means use leading zero for military times in agenda.
 
 For example, 9:30am would become 09:30 rather than  9:30."
 
 For example, 9:30am would become 09:30 rather than  9:30."
 
   :group 'org-agenda-daily/weekly
 
   :group 'org-agenda-daily/weekly
 
-  :version "24.1"
 
   :type 'boolean)
 
   :type 'boolean)
 
 
 
 (defcustom org-agenda-timegrid-use-ampm nil
 
 (defcustom org-agenda-timegrid-use-ampm nil
 
   "When set, show AM/PM style timestamps on the timegrid."
 
   "When set, show AM/PM style timestamps on the timegrid."
 
   :group 'org-agenda
 
   :group 'org-agenda
 
-  :version "24.1"
 
   :type 'boolean)
 
   :type 'boolean)
 
 
 
 (defun org-agenda-time-of-day-to-ampm (time)
 
 (defun org-agenda-time-of-day-to-ampm (time)
 
@@ -1101,7 +1092,6 @@ stamp currently points to the past, the first key press will move it
 
 to today.  WHen nil, just move one day forward even if the date stays
 
 to today.  WHen nil, just move one day forward even if the date stays
 
 in the past."
 
 in the past."
 
   :group 'org-agenda-daily/weekly
 
   :group 'org-agenda-daily/weekly
 
-  :version "24.1"
 
   :type 'boolean)
 
   :type 'boolean)
 
 
 
 (defcustom org-agenda-include-diary nil
 
 (defcustom org-agenda-include-diary nil
 
@@ -1114,7 +1104,6 @@ Custom commands can set this variable in the options section."
 
   "If non-nil, include entries within their deadline warning period.
 
   "If non-nil, include entries within their deadline warning period.
 
 Custom commands can set this variable in the options section."
 
 Custom commands can set this variable in the options section."
 
   :group 'org-agenda-daily/weekly
 
   :group 'org-agenda-daily/weekly
 
-  :version "24.1"
 
   :type 'boolean)
 
   :type 'boolean)
 
 
 
 (defcustom org-agenda-repeating-timestamp-show-all t
 
 (defcustom org-agenda-repeating-timestamp-show-all t
 
@@ -1190,7 +1179,6 @@ issue display.
 
 :short-face           face for clock intervals that are too short"
 
 :short-face           face for clock intervals that are too short"
 
   :group 'org-agenda-daily/weekly
 
   :group 'org-agenda-daily/weekly
 
   :group 'org-clock
 
   :group 'org-clock
 
-  :version "24.1"
 
   :type 'plist)
 
   :type 'plist)
 
 
 
 (defcustom org-agenda-log-mode-add-notes t
 
 (defcustom org-agenda-log-mode-add-notes t
 
@@ -1249,7 +1237,6 @@ by preceding the first snippet with \"+\" or \"-\".  If the first snippet
 
 is a regexp marked with braces like \"{abc}\", this will also switch to
 
 is a regexp marked with braces like \"{abc}\", this will also switch to
 
 boolean search."
 
 boolean search."
 
   :group 'org-agenda-search-view
 
   :group 'org-agenda-search-view
 
-  :version "24.1"
 
   :type 'boolean)
 
   :type 'boolean)
 
 
 
 (if (fboundp 'defvaralias)
 
 (if (fboundp 'defvaralias)
 
@@ -1260,7 +1247,6 @@ boolean search."
 
   "Non-nil means, search words must be matches as complete words.
 
   "Non-nil means, search words must be matches as complete words.
 
 When nil, they may also match part of a word."
 
 When nil, they may also match part of a word."
 
   :group 'org-agenda-search-view
 
   :group 'org-agenda-search-view
 
-  :version "24.1"
 
   :type 'boolean)
 
   :type 'boolean)
 
 
 
 (defgroup org-agenda-time-grid nil
 
 (defgroup org-agenda-time-grid nil
 
@@ -1324,14 +1310,12 @@ a grid line."
 
 (defcustom org-agenda-show-current-time-in-grid t
 
 (defcustom org-agenda-show-current-time-in-grid t
 
   "Non-nil means show the current time in the time grid."
 
   "Non-nil means show the current time in the time grid."
 
   :group 'org-agenda-time-grid
 
   :group 'org-agenda-time-grid
 
-  :version "24.1"
 
   :type 'boolean)
 
   :type 'boolean)
 
 
 
 (defcustom org-agenda-current-time-string
 
 (defcustom org-agenda-current-time-string
 
   "now - - - - - - - - - - - - - - - - - - - - - - - - -"
 
   "now - - - - - - - - - - - - - - - - - - - - - - - - -"
 
   "The string for the current time marker in the agenda."
 
   "The string for the current time marker in the agenda."
 
   :group 'org-agenda-time-grid
 
   :group 'org-agenda-time-grid
 
-  :version "24.1"
 
   :type 'string)
 
   :type 'string)
 
 
 
 (defgroup org-agenda-sorting nil
 
 (defgroup org-agenda-sorting nil
 
@@ -1542,7 +1526,6 @@ that passed since this item was scheduled first."
 
   "Text preceding item pulled into the agenda by inactive time stamps.
 
   "Text preceding item pulled into the agenda by inactive time stamps.
 
 These entries are added to the agenda when pressing \"[\"."
 
 These entries are added to the agenda when pressing \"[\"."
 
   :group 'org-agenda-line-format
 
   :group 'org-agenda-line-format
 
-  :version "24.1"
 
   :type '(list
 
   :type '(list
 
 	  (string :tag "Scheduled today     ")
 
 	  (string :tag "Scheduled today     ")
 
 	  (string :tag "Scheduled previously")))
 
 	  (string :tag "Scheduled previously")))
 
@@ -1581,7 +1564,6 @@ the headline/diary entry."
 
   "Non-nil means remove time ranges specifications in agenda
 
   "Non-nil means remove time ranges specifications in agenda
 
 items that span on several days."
 
 items that span on several days."
 
   :group 'org-agenda-line-format
 
   :group 'org-agenda-line-format
 
-  :version "24.1"
 
   :type 'boolean)
 
   :type 'boolean)
 
 
 
 (defcustom org-agenda-default-appointment-duration nil
 
 (defcustom org-agenda-default-appointment-duration nil
 
@@ -1663,7 +1645,6 @@ The only argument passed to that function is the day. It should
 
 returns a face, or nil if does not want to specify a face and let
 
 returns a face, or nil if does not want to specify a face and let
 
 the normal rules apply."
 
 the normal rules apply."
 
   :group 'org-agenda-line-format
 
   :group 'org-agenda-line-format
 
-  :version "24.1"
 
   :type 'function)
 
   :type 'function)
 
 
 
 (defcustom org-agenda-category-icon-alist nil
 
 (defcustom org-agenda-category-icon-alist nil
 
@@ -1696,7 +1677,6 @@ category, you can use:
 
 
 
   (\"Emacs\" '(space . (:width (16))))"
 
   (\"Emacs\" '(space . (:width (16))))"
 
   :group 'org-agenda-line-format
 
   :group 'org-agenda-line-format
 
-  :version "24.1"
 
   :type '(alist :key-type (string :tag "Regexp matching category")
 
   :type '(alist :key-type (string :tag "Regexp matching category")
 
 		:value-type (choice (list :tag "Icon"
 
 		:value-type (choice (list :tag "Icon"
 
 					  (string :tag "File or data")
 
 					  (string :tag "File or data")
 
@@ -1759,7 +1739,6 @@ With selected entries in an agenda buffer, `B R' will call
 
 the custom function `set-category' on the selected entries.
 
 the custom function `set-category' on the selected entries.
 
 Note that functions in this alist don't need to be quoted."
 
 Note that functions in this alist don't need to be quoted."
 
   :type 'alist
 
   :type 'alist
 
-  :version "24.1"
 
   :group 'org-agenda)
 
   :group 'org-agenda)
 
 
 
 (eval-when-compile
 
 (eval-when-compile
 
@@ -1789,7 +1768,7 @@ works you probably want to add it to `org-agenda-custom-commands' for good."
 
 	(setcdr ass (cdr entry))
 
 	(setcdr ass (cdr entry))
 
       (push entry org-agenda-custom-commands))))
 
       (push entry org-agenda-custom-commands))))
 
 
 
-;;; Define the org-agenda-mode
 
+;;; Define the Org-agenda-mode
 
 
 
 (defvar org-agenda-mode-map (make-sparse-keymap)
 
 (defvar org-agenda-mode-map (make-sparse-keymap)
 
   "Keymap for `org-agenda-mode'.")
 
   "Keymap for `org-agenda-mode'.")
 
@@ -4396,7 +4375,7 @@ of what a project is and how to check if it stuck, customize the variable
 
 ;;; Diary integration
 
 ;;; Diary integration
 
 
 
 (defvar org-disable-agenda-to-diary nil)          ;Dynamically-scoped param.
 
 (defvar org-disable-agenda-to-diary nil)          ;Dynamically-scoped param.
 
-(defvar diary-list-entries-hook)
 
+(defvar list-diary-entries-hook)
 
 (defvar diary-time-regexp)
 
 (defvar diary-time-regexp)
 
 (defun org-get-entries-from-diary (date)
 
 (defun org-get-entries-from-diary (date)
 
   "Get the (Emacs Calendar) diary entries for DATE."
 
   "Get the (Emacs Calendar) diary entries for DATE."
 
@@ -4405,8 +4384,8 @@ of what a project is and how to check if it stuck, customize the variable
 
 	 (diary-display-hook '(fancy-diary-display))
 
 	 (diary-display-hook '(fancy-diary-display))
 
 	 (diary-display-function 'fancy-diary-display)
 
 	 (diary-display-function 'fancy-diary-display)
 
 	 (pop-up-frames nil)
 
 	 (pop-up-frames nil)
 
-	 (diary-list-entries-hook
 
-	  (cons 'org-diary-default-entry diary-list-entries-hook))
 
+	 (list-diary-entries-hook
 
+	  (cons 'org-diary-default-entry list-diary-entries-hook))
 
 	 (diary-file-name-prefix-function nil) ; turn this feature off
 
 	 (diary-file-name-prefix-function nil) ; turn this feature off
 
 	 (diary-modify-entry-list-string-function 'org-modify-diary-entry-string)
 
 	 (diary-modify-entry-list-string-function 'org-modify-diary-entry-string)
 
 	 entries
 
 	 entries
 
@@ -6211,9 +6190,8 @@ When this is the global TODO list, a prefix argument will be interpreted."
 
     (recenter window-line)))
 
     (recenter window-line)))
 
 
 
 (defvar org-global-tags-completion-table nil)
 
 (defvar org-global-tags-completion-table nil)
 
-(defvar org-agenda-filtered-by-category nil)
 
 (defvar org-agenda-filter-form nil)
 
 (defvar org-agenda-filter-form nil)
 
-(defvar org-agenda-filtered-by-category nil)
 
+
 
 (defun org-agenda-filter-by-category (strip)
 
 (defun org-agenda-filter-by-category (strip)
 
   "Keep only those lines in the agenda buffer that have a specific category.
 
   "Keep only those lines in the agenda buffer that have a specific category.
 
 The category is that of the current line."
 
 The category is that of the current line."
 
@@ -6391,9 +6369,10 @@ If the line does not have an effort defined, return nil."
 
       (funcall op (or eff (if org-sort-agenda-noeffort-is-high 32767 0))
 
       (funcall op (or eff (if org-sort-agenda-noeffort-is-high 32767 0))
 
 	       value))))
 
 	       value))))
 
 
 
+(defvar org-agenda-filtered-by-category nil)
 
 (defun org-agenda-filter-apply (filter type)
 
 (defun org-agenda-filter-apply (filter type)
 
   "Set FILTER as the new agenda filter and apply it."
 
   "Set FILTER as the new agenda filter and apply it."
 
-  (let (tags cat)
 
+  (let (tags)
 
     (if (eq type 'tag)
 
     (if (eq type 'tag)
 
 	(setq org-agenda-tag-filter filter)
 
 	(setq org-agenda-tag-filter filter)
 
       (setq org-agenda-category-filter filter
 
       (setq org-agenda-category-filter filter
 
@@ -7171,13 +7150,10 @@ if it was hidden in the outline."
 
     (select-window win)))
 
     (select-window win)))
 
 
 
 (defvar org-agenda-show-window nil)
 
 (defvar org-agenda-show-window nil)
 
-(defun org-agenda-show-and-scroll-up (&optional arg)
 
+(defun org-agenda-show-and-scroll-up ()
 
   "Display the Org-mode file which contains the item at point.
 
   "Display the Org-mode file which contains the item at point.
 
-When called repeatedly, scroll the window that is displaying the buffer.
 
-With a \\[universal-argument] prefix, use `org-show-entry' instead of
 
-`show-subtree' to display the item, so that drawers and logbooks stay
 
-folded."
 
-  (interactive "P")
 
+When called repeatedly, scroll the window that is displaying the buffer."
 
+  (interactive)
 
   (let ((win (selected-window)))
 
   (let ((win (selected-window)))
 
     (if (and (window-live-p org-agenda-show-window)
 
     (if (and (window-live-p org-agenda-show-window)
 
 	     (eq this-command last-command))
 
 	     (eq this-command last-command))
 
@@ -7185,7 +7161,7 @@ folded."
 
 	  (select-window org-agenda-show-window)
 
 	  (select-window org-agenda-show-window)
 
 	  (ignore-errors (scroll-up)))
 
 	  (ignore-errors (scroll-up)))
 
       (org-agenda-goto t)
 
       (org-agenda-goto t)
 
-      (if arg (org-show-entry) (show-subtree))
 
+      (show-subtree)
 
       (setq org-agenda-show-window (selected-window)))
 
       (setq org-agenda-show-window (selected-window)))
 
     (select-window win)))
 
     (select-window win)))
 
 
 
@@ -8020,7 +7996,6 @@ top-level    as top-level entries at the end of the file."
 
 (defcustom org-agenda-insert-diary-extract-time nil
 
 (defcustom org-agenda-insert-diary-extract-time nil
 
   "Non-nil means extract any time specification from the diary entry."
 
   "Non-nil means extract any time specification from the diary entry."
 
   :group 'org-agenda
 
   :group 'org-agenda
 
-  :version "24.1"
 
   :type 'boolean)
 
   :type 'boolean)
 
 
 
 (defun org-agenda-add-entry-to-org-agenda-diary-file (type text &optional d1 d2)
 
 (defun org-agenda-add-entry-to-org-agenda-diary-file (type text &optional d1 d2)

+ 1 - 3
lisp/org-archive.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; org-archive.el --- Archiving for Org-mode
 
 ;;; org-archive.el --- Archiving for Org-mode
 
 
 
-;; Copyright (C) 2004-2012 Free Software Foundation, Inc.
 
+;; Copyright (C) 2004-2011 Free Software Foundation, Inc.
 
 
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 
 ;; Keywords: outlines, hypermedia, calendar, wp
 
 ;; Keywords: outlines, hypermedia, calendar, wp
 
@@ -43,7 +43,6 @@
 
 (defcustom org-archive-reversed-order nil
 
 (defcustom org-archive-reversed-order nil
 
   "Non-nil means make the tree first child under the archive heading, not last."
 
   "Non-nil means make the tree first child under the archive heading, not last."
 
   :group 'org-archive
 
   :group 'org-archive
 
-  :version "24.1"
 
   :type 'boolean)
 
   :type 'boolean)
 
 
 
 (defcustom org-archive-sibling-heading "Archive"
 
 (defcustom org-archive-sibling-heading "Archive"
 
@@ -73,7 +72,6 @@ This variable is obsolete and has no effect anymore, instead add or remove
 
 (defcustom org-archive-subtree-add-inherited-tags 'infile
 
 (defcustom org-archive-subtree-add-inherited-tags 'infile
 
   "Non-nil means append inherited tags when archiving a subtree."
 
   "Non-nil means append inherited tags when archiving a subtree."
 
   :group 'org-archive
 
   :group 'org-archive
 
-  :version "24.1"
 
   :type '(choice
 
   :type '(choice
 
 	  (const :tag "Never" nil)
 
 	  (const :tag "Never" nil)
 
 	  (const :tag "When archiving a subtree to the same file" infile)
 
 	  (const :tag "When archiving a subtree to the same file" infile)

+ 2 - 2
lisp/org-ascii.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; org-ascii.el --- ASCII export for Org-mode
 
 ;;; org-ascii.el --- ASCII export for Org-mode
 
 
 
-;; Copyright (C) 2004-2012 Free Software Foundation, Inc.
 
+;; Copyright (C) 2004-2011 Free Software Foundation, Inc.
 
 
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 
 ;; Keywords: outlines, hypermedia, calendar, wp
 
 ;; Keywords: outlines, hypermedia, calendar, wp
 
@@ -108,7 +108,7 @@ utf8      Use all UTF-8 characters")
 
 (defun org-export-as-utf8 (&rest args)
 
 (defun org-export-as-utf8 (&rest args)
 
   "Like `org-export-as-ascii', use encoding for special symbols."
 
   "Like `org-export-as-ascii', use encoding for special symbols."
 
   (interactive)
 
   (interactive)
 
-  (org-export-as-encoding 'org-export-as-ascii
 
+  (org-export-as-encoding 'org-export-as-ascii 
 			  (org-called-interactively-p 'any)
 
 			  (org-called-interactively-p 'any)
 
 			  'utf8 args))
 
 			  'utf8 args))

+ 1 - 2
lisp/org-attach.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; org-attach.el --- Manage file attachments to org-mode tasks
 
 ;;; org-attach.el --- Manage file attachments to org-mode tasks
 
 
 
-;; Copyright (C) 2008-2012 Free Software Foundation, Inc.
 
+;; Copyright (C) 2008-2011 Free Software Foundation, Inc.
 
 
 
 ;; Author: John Wiegley <johnw@newartisans.com>
 
 ;; Author: John Wiegley <johnw@newartisans.com>
 
 ;; Keywords: org data task
 
 ;; Keywords: org data task
 
@@ -101,7 +101,6 @@ ln    create a hard link.  Note that this is not supported
 
 (defcustom org-attach-store-link-p nil
 
 (defcustom org-attach-store-link-p nil
 
   "Non-nil means store a link to a file when attaching it."
 
   "Non-nil means store a link to a file when attaching it."
 
   :group 'org-attach
 
   :group 'org-attach
 
-  :version "24.1"
 
   :type '(choice
 
   :type '(choice
 
 	  (const :tag "Don't store link" nil)
 
 	  (const :tag "Don't store link" nil)
 
 	  (const :tag "Link to origin location" t)
 
 	  (const :tag "Link to origin location" t)

+ 1 - 2
lisp/org-bbdb.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; org-bbdb.el --- Support for links to BBDB entries from within Org-mode
 
 ;;; org-bbdb.el --- Support for links to BBDB entries from within Org-mode
 
 
 
-;; Copyright (C) 2004-2012 Free Software Foundation, Inc.
 
+;; Copyright (C) 2004-2011 Free Software Foundation, Inc.
 
 
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>,
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>,
 
 ;;         Thomas Baumann <thomas dot baumann at ch dot tum dot de>
 
 ;;         Thomas Baumann <thomas dot baumann at ch dot tum dot de>
 
@@ -120,7 +120,6 @@
 
 (declare-function diary-ordinal-suffix "diary-lib" (n))
 
 (declare-function diary-ordinal-suffix "diary-lib" (n))
 
 
 
 (defvar date)   ;; dynamically scoped from Org
 
 (defvar date)   ;; dynamically scoped from Org
 
-(defvar name)   ;; dynamically scoped from Org
 
 
 
 ;; Customization
 
 ;; Customization

+ 1 - 11
lisp/org-beamer.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; org-beamer.el --- Beamer-specific LaTeX export for org-mode
 
 ;;; org-beamer.el --- Beamer-specific LaTeX export for org-mode
 
 ;;
 
 ;;
 
-;; Copyright (C) 2007-2012 Free Software Foundation, Inc.
 
+;; Copyright (C) 2007-2011 Free Software Foundation, Inc.
 
 ;;
 
 ;;
 
 ;; Author: Carsten Dominik <carsten.dominik AT gmail DOT com>
 
 ;; Author: Carsten Dominik <carsten.dominik AT gmail DOT com>
 
 ;; Maintainer: Carsten Dominik <carsten.dominik AT gmail DOT com>
 
 ;; Maintainer: Carsten Dominik <carsten.dominik AT gmail DOT com>
 
@@ -43,7 +43,6 @@
 
 (defcustom org-beamer-use-parts nil
 
 (defcustom org-beamer-use-parts nil
 
   ""
 
   ""
 
   :group 'org-beamer
 
   :group 'org-beamer
 
-  :version "24.1"
 
   :type 'boolean)
 
   :type 'boolean)
 
 
 
 (defcustom org-beamer-frame-level 1
 
 (defcustom org-beamer-frame-level 1
 
@@ -53,7 +52,6 @@ Setting this to 2 will allow sections, 3 will allow subsections as well.
 
 You can set this to 4 as well, if you at the same time set
 
 You can set this to 4 as well, if you at the same time set
 
 `org-beamer-use-parts' to make the top levels `\part'."
 
 `org-beamer-use-parts' to make the top levels `\part'."
 
   :group 'org-beamer
 
   :group 'org-beamer
 
-  :version "24.1"
 
   :type '(choice
 
   :type '(choice
 
 	  (const :tag "Frames need a BEAMER_env property" nil)
 
 	  (const :tag "Frames need a BEAMER_env property" nil)
 
 	  (integer :tag "Specific level makes a frame")))
 
 	  (integer :tag "Specific level makes a frame")))
 
@@ -62,14 +60,12 @@ You can set this to 4 as well, if you at the same time set
 
   "Default options string to use for frames, should contains the [brackets].
 
   "Default options string to use for frames, should contains the [brackets].
 
 And example for this is \"[allowframebreaks]\"."
 
 And example for this is \"[allowframebreaks]\"."
 
   :group 'org-beamer
 
   :group 'org-beamer
 
-  :version "24.1"
 
   :type '(string :tag "[options]"))
 
   :type '(string :tag "[options]"))
 
 
 
 (defcustom org-beamer-column-view-format
 
 (defcustom org-beamer-column-view-format
 
   "%45ITEM %10BEAMER_env(Env) %10BEAMER_envargs(Env Args) %4BEAMER_col(Col) %8BEAMER_extra(Extra)"
 
   "%45ITEM %10BEAMER_env(Env) %10BEAMER_envargs(Env Args) %4BEAMER_col(Col) %8BEAMER_extra(Extra)"
 
   "Default column view format that should be used to fill the template."
 
   "Default column view format that should be used to fill the template."
 
   :group 'org-beamer
 
   :group 'org-beamer
 
-  :version "24.1"
 
   :type '(choice
 
   :type '(choice
 
 	  (const  :tag "Do not insert Beamer column view format" nil)
 
 	  (const  :tag "Do not insert Beamer column view format" nil)
 
 	  (string :tag "Beamer column view format")))
 
 	  (string :tag "Beamer column view format")))
 
@@ -80,7 +76,6 @@ And example for this is \"[allowframebreaks]\"."
 
 When a beamer template is filled, this will be the default for
 
 When a beamer template is filled, this will be the default for
 
 BEAMER_HEADER_EXTRA, which will be inserted just before \\begin{document}."
 
 BEAMER_HEADER_EXTRA, which will be inserted just before \\begin{document}."
 
   :group 'org-beamer
 
   :group 'org-beamer
 
-  :version "24.1"
 
   :type '(choice
 
   :type '(choice
 
 	  (const  :tag "Do not insert Beamer themes" nil)
 
 	  (const  :tag "Do not insert Beamer themes" nil)
 
 	  (string :tag "Beamer themes")))
 
 	  (string :tag "Beamer themes")))
 
@@ -107,7 +102,6 @@ These are just a completion help.")
 
     ("theorem"        "t" "\\begin{theorem}%a%U%x"             "\\end{theorem}")
 
     ("theorem"        "t" "\\begin{theorem}%a%U%x"             "\\end{theorem}")
 
     ("definition"     "d" "\\begin{definition}%a%U%x"          "\\end{definition}")
 
     ("definition"     "d" "\\begin{definition}%a%U%x"          "\\end{definition}")
 
     ("example"        "e" "\\begin{example}%a%U%x"             "\\end{example}")
 
     ("example"        "e" "\\begin{example}%a%U%x"             "\\end{example}")
 
-    ("exampleblock"   "E" "\\begin{exampleblock}%a{%h}%x"      "\\end{exampleblock}")
 
     ("proof"          "p" "\\begin{proof}%a%U%x"               "\\end{proof}")
 
     ("proof"          "p" "\\begin{proof}%a%U%x"               "\\end{proof}")
 
     ("beamercolorbox" "o" "\\begin{beamercolorbox}%o{%h}%x"    "\\end{beamercolorbox}")
 
     ("beamercolorbox" "o" "\\begin{beamercolorbox}%o{%h}%x"    "\\end{beamercolorbox}")
 
     ("normal"         "h" "%h" "") ; Emit the heading as normal text
 
     ("normal"         "h" "%h" "") ; Emit the heading as normal text
 
@@ -148,7 +142,6 @@ open    The opening template for the environment, with the following escapes
 
 close   The closing string of the environment."
 
 close   The closing string of the environment."
 
 
 
   :group 'org-beamer
 
   :group 'org-beamer
 
-  :version "24.1"
 
   :type '(repeat
 
   :type '(repeat
 
 	  (list
 
 	  (list
 
 	   (string :tag "Environment")
 
 	   (string :tag "Environment")
 
@@ -409,7 +402,6 @@ the value will be inserted right after the documentclass statement."
 
 (defcustom org-beamer-fragile-re "\\\\\\(verb\\|lstinline\\)\\|^[ \t]*\\\\begin{\\(verbatim\\|lstlisting\\|minted\\)}"
 
 (defcustom org-beamer-fragile-re "\\\\\\(verb\\|lstinline\\)\\|^[ \t]*\\\\begin{\\(verbatim\\|lstlisting\\|minted\\)}"
 
   "If this regexp matches in a frame, the frame is marked as fragile."
 
   "If this regexp matches in a frame, the frame is marked as fragile."
 
   :group 'org-beamer
 
   :group 'org-beamer
 
-  :version "24.1"
 
   :type 'regexp)
 
   :type 'regexp)
 
 
 
 (defface org-beamer-tag '((t (:box (:line-width 1 :color grey40))))
 
 (defface org-beamer-tag '((t (:box (:line-width 1 :color grey40))))
 
@@ -519,7 +511,6 @@ This function will run in the final LaTeX document."
 
 (defcustom org-beamer-outline-frame-title "Outline"
 
 (defcustom org-beamer-outline-frame-title "Outline"
 
   "Default title of a frame containing an outline."
 
   "Default title of a frame containing an outline."
 
   :group 'org-beamer
 
   :group 'org-beamer
 
-  :version "24.1"
 
   :type '(string :tag "Outline frame title")
 
   :type '(string :tag "Outline frame title")
 
 )
 
 )
 
 
 
@@ -528,7 +519,6 @@ This function will run in the final LaTeX document."
 
 You might want to put e.g. [allowframebreaks=0.9] here.  Remember to
 
 You might want to put e.g. [allowframebreaks=0.9] here.  Remember to
 
 include square brackets."
 
 include square brackets."
 
   :group 'org-beamer
 
   :group 'org-beamer
 
-  :version "24.1"
 
   :type '(string :tag "Outline frame options")
 
   :type '(string :tag "Outline frame options")
 
 )
 
 )

+ 1 - 10
lisp/org-bibtex.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; org-bibtex.el --- Org links to BibTeX entries
 
 ;;; org-bibtex.el --- Org links to BibTeX entries
 
 ;;
 
 ;;
 
-;; Copyright (C) 2007-2012 Free Software Foundation, Inc.
 
+;; Copyright (C) 2007-2011 Free Software Foundation, Inc.
 
 ;;
 
 ;;
 
 ;; Author: Bastien Guerry <bzg at altern dot org>
 
 ;; Author: Bastien Guerry <bzg at altern dot org>
 
 ;;         Carsten Dominik <carsten dot dominik at gmail dot com>
 
 ;;         Carsten Dominik <carsten dot dominik at gmail dot com>
 
@@ -216,14 +216,12 @@
 
 (defcustom org-bibtex-autogen-keys nil
 
 (defcustom org-bibtex-autogen-keys nil
 
   "Set to a truth value to use `bibtex-generate-autokey' to generate keys."
 
   "Set to a truth value to use `bibtex-generate-autokey' to generate keys."
 
   :group 'org-bibtex
 
   :group 'org-bibtex
 
-  :version "24.1"
 
   :type  'boolean)
 
   :type  'boolean)
 
 
 
 (defcustom org-bibtex-prefix nil
 
 (defcustom org-bibtex-prefix nil
 
   "Optional prefix for all bibtex property names.
 
   "Optional prefix for all bibtex property names.
 
 For example setting to 'BIB_' would allow interoperability with fireforg."
 
 For example setting to 'BIB_' would allow interoperability with fireforg."
 
   :group 'org-bibtex
 
   :group 'org-bibtex
 
-  :version "24.1"
 
   :type  'string)
 
   :type  'string)
 
 
 
 (defcustom org-bibtex-treat-headline-as-title t
 
 (defcustom org-bibtex-treat-headline-as-title t
 
@@ -232,7 +230,6 @@ If an entry is missing a title property, use the headline text as
 
 the property. If this value is t, `org-bibtex-check' will ignore
 
 the property. If this value is t, `org-bibtex-check' will ignore
 
 a missing title field."
 
 a missing title field."
 
   :group 'org-bibtex
 
   :group 'org-bibtex
 
-  :version "24.1"
 
   :type 'boolean)
 
   :type 'boolean)
 
 
 
 (defcustom org-bibtex-export-arbitrary-fields nil
 
 (defcustom org-bibtex-export-arbitrary-fields nil
 
@@ -241,7 +238,6 @@ This only has effect if `org-bibtex-prefix' is defined, so as to
 
 ensure that other org-properties, such as CATEGORY or LOGGING are
 
 ensure that other org-properties, such as CATEGORY or LOGGING are
 
 not placed in the exported bibtex entry."
 
 not placed in the exported bibtex entry."
 
   :group 'org-bibtex
 
   :group 'org-bibtex
 
-  :version "24.1"
 
   :type 'boolean)
 
   :type 'boolean)
 
 
 
 (defcustom org-bibtex-key-property "CUSTOM_ID"
 
 (defcustom org-bibtex-key-property "CUSTOM_ID"
 
@@ -251,13 +247,11 @@ bibtex headlines from within an org file. This can be set to ID
 
 to enable global links, but only with great caution, as global
 
 to enable global links, but only with great caution, as global
 
 IDs must be unique."
 
 IDs must be unique."
 
   :group 'org-bibtex
 
   :group 'org-bibtex
 
-  :version "24.1"
 
   :type 'string)
 
   :type 'string)
 
 
 
 (defcustom org-bibtex-tags nil
 
 (defcustom org-bibtex-tags nil
 
   "List of tag(s) that should be added to new bib entries."
 
   "List of tag(s) that should be added to new bib entries."
 
   :group 'org-bibtex
 
   :group 'org-bibtex
 
-  :version "24.1"
 
   :type '(repeat  :tag "Tag" (string)))
 
   :type '(repeat  :tag "Tag" (string)))
 
 
 
 (defcustom org-bibtex-tags-are-keywords nil
 
 (defcustom org-bibtex-tags-are-keywords nil
 
@@ -272,20 +266,17 @@ comma-separated string of keywords when exported to bibtex. Tags
 
 defined in `org-bibtex-tags' or `org-bibtex-no-export-tags' will
 
 defined in `org-bibtex-tags' or `org-bibtex-no-export-tags' will
 
 not be exported."
 
 not be exported."
 
   :group 'org-bibtex
 
   :group 'org-bibtex
 
-  :version "24.1"
 
   :type 'boolean)
 
   :type 'boolean)
 
 
 
 (defcustom org-bibtex-no-export-tags nil
 
 (defcustom org-bibtex-no-export-tags nil
 
   "List of tag(s) that should not be converted to keywords.
 
   "List of tag(s) that should not be converted to keywords.
 
 This variable is relevant only if `org-bibtex-export-tags-as-keywords` is t."
 
 This variable is relevant only if `org-bibtex-export-tags-as-keywords` is t."
 
   :group 'org-bibtex
 
   :group 'org-bibtex
 
-  :version "24.1"
 
   :type '(repeat :tag "Tag" (string)))
 
   :type '(repeat :tag "Tag" (string)))
 
 
 
 (defcustom org-bibtex-type-property-name "btype"
 
 (defcustom org-bibtex-type-property-name "btype"
 
   "Property in which to store bibtex entry type (e.g., article)."
 
   "Property in which to store bibtex entry type (e.g., article)."
 
   :group 'org-bibtex
 
   :group 'org-bibtex
 
-  :version "24.1"
 
   :type 'string)
 
   :type 'string)

+ 1 - 13
lisp/org-capture.el
View File 

@@ -56,7 +56,7 @@
 
 		  (date &optional keep-restriction))
 
 		  (date &optional keep-restriction))
 
 (declare-function org-table-get-specials "org-table" ())
 
 (declare-function org-table-get-specials "org-table" ())
 
 (declare-function org-table-goto-line "org-table" (N))
 
 (declare-function org-table-goto-line "org-table" (N))
 
-(declare-function org-pop-to-buffer-same-window "org-compat"
 
+(declare-function org-pop-to-buffer-same-window "org-compat" 
 		  (&optional buffer-or-name norecord label))
 
 		  (&optional buffer-or-name norecord label))
 
 
 
 (defvar org-remember-default-headline)
 
 (defvar org-remember-default-headline)
 
@@ -262,7 +262,6 @@ w3, w3m                 |  %:type %:url
 
 info                    |  %:type %:file %:node
 
 info                    |  %:type %:file %:node
 
 calendar                |  %:type %:date"
 
 calendar                |  %:type %:date"
 
   :group 'org-capture
 
   :group 'org-capture
 
-  :version "24.1"
 
   :type
 
   :type
 
   '(repeat
 
   '(repeat
 
     (choice :value ("" "" entry (file "~/org/notes.org") "")
 
     (choice :value ("" "" entry (file "~/org/notes.org") "")
 
@@ -337,21 +336,12 @@ calendar                |  %:type %:date"
 
 The capture buffer is still current when this hook runs and it is
 
 The capture buffer is still current when this hook runs and it is
 
 widened to the entire buffer."
 
 widened to the entire buffer."
 
   :group 'org-capture
 
   :group 'org-capture
 
-  :version "24.1"
 
   :type 'hook)
 
   :type 'hook)
 
 
 
 (defcustom org-capture-after-finalize-hook nil
 
 (defcustom org-capture-after-finalize-hook nil
 
   "Hook that is run right after a capture process is finalized.
 
   "Hook that is run right after a capture process is finalized.
 
   Suitable for window cleanup"
 
   Suitable for window cleanup"
 
   :group 'org-capture
 
   :group 'org-capture
 
-  :version "24.1"
 
-  :type 'hook)
 
-
 
-(defcustom org-capture-prepare-finalize-hook nil
 
-  "Hook that is run before the finalization starts.
 
-The capture buffer is current and still narrowed."
 
-  :group 'org-capture
 
-  :version "24.1"
 
   :type 'hook)
 
   :type 'hook)
 
 
 
 ;;; The property list for keeping information about the capture process
 
 ;;; The property list for keeping information about the capture process
 
@@ -537,8 +527,6 @@ captured item after finalizing."
 
 	       (buffer-base-buffer (current-buffer)))
 
 	       (buffer-base-buffer (current-buffer)))
 
     (error "This does not seem to be a capture buffer for Org-mode"))
 
     (error "This does not seem to be a capture buffer for Org-mode"))
 
 
 
-  (run-hooks 'org-capture-prepare-finalize-hook)
 
-
 
   ;; Did we start the clock in this capture buffer?
 
   ;; Did we start the clock in this capture buffer?
 
   (when (and org-capture-clock-was-started
 
   (when (and org-capture-clock-was-started
 
 	     org-clock-marker (marker-buffer org-clock-marker)
 
 	     org-clock-marker (marker-buffer org-clock-marker)

+ 6 - 14
lisp/org-clock.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; org-clock.el --- The time clocking code for Org-mode
 
 ;;; org-clock.el --- The time clocking code for Org-mode
 
 
 
-;; Copyright (C) 2004-2012 Free Software Foundation, Inc.
 
+;; Copyright (C) 2004-2011 Free Software Foundation, Inc.
 
 
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 
 ;; Keywords: outlines, hypermedia, calendar, wp
 
 ;; Keywords: outlines, hypermedia, calendar, wp
 
@@ -226,7 +226,6 @@ should get a different face (`org-mode-line-clock-overrun').
 
 When this is a string, it is prepended to the clock string as an indication,
 
 When this is a string, it is prepended to the clock string as an indication,
 
 also using the face `org-mode-line-clock-overrun'."
 
 also using the face `org-mode-line-clock-overrun'."
 
   :group 'org-clock
 
   :group 'org-clock
 
-  :version "24.1"
 
   :type '(choice
 
   :type '(choice
 
 	  (const :tag "Just mark the time string" nil)
 
 	  (const :tag "Just mark the time string" nil)
 
 	  (string :tag "Text to prepend")))
 
 	  (string :tag "Text to prepend")))
 
@@ -268,14 +267,12 @@ string as argument."
 
     :formatter nil)
 
     :formatter nil)
 
   "Default properties for clock tables."
 
   "Default properties for clock tables."
 
   :group 'org-clock
 
   :group 'org-clock
 
-  :version "24.1"
 
   :type 'plist)
 
   :type 'plist)
 
 
 
 (defcustom org-clock-clocktable-formatter 'org-clocktable-write-default
 
 (defcustom org-clock-clocktable-formatter 'org-clocktable-write-default
 
   "Function to turn clocking data into a table.
 
   "Function to turn clocking data into a table.
 
 For more information, see `org-clocktable-write-default'."
 
 For more information, see `org-clocktable-write-default'."
 
   :group 'org-clocktable
 
   :group 'org-clocktable
 
-  :version "24.1"
 
   :type 'function)
 
   :type 'function)
 
 
 
 ;; FIXME: translate es and nl last string "Clock summary at"
 
 ;; FIXME: translate es and nl last string "Clock summary at"
 
@@ -286,7 +283,6 @@ For more information, see `org-clocktable-write-default'."
 
     ("nl" "Bestand"  "N"  "Tijdstip"   "Hoofding" "Duur"  "ALLES" "Totale duur"  "Bestandstijd" "Clock summary at"))
 
     ("nl" "Bestand"  "N"  "Tijdstip"   "Hoofding" "Duur"  "ALLES" "Totale duur"  "Bestandstijd" "Clock summary at"))
 
   "Terms used in clocktable, translated to different languages."
 
   "Terms used in clocktable, translated to different languages."
 
   :group 'org-clocktable
 
   :group 'org-clocktable
 
-  :version "24.1"
 
   :type 'alist)
 
   :type 'alist)
 
 
 
 (defcustom org-clock-clocktable-default-properties '(:maxlevel 2 :scope file)
 
 (defcustom org-clock-clocktable-default-properties '(:maxlevel 2 :scope file)
 
@@ -314,13 +310,11 @@ play with them."
 
 (defcustom org-clock-report-include-clocking-task nil
 
 (defcustom org-clock-report-include-clocking-task nil
 
   "When non-nil, include the current clocking task time in clock reports."
 
   "When non-nil, include the current clocking task time in clock reports."
 
   :group 'org-clock
 
   :group 'org-clock
 
-  :version "24.1"
 
   :type 'boolean)
 
   :type 'boolean)
 
 
 
 (defcustom org-clock-resolve-expert nil
 
 (defcustom org-clock-resolve-expert nil
 
   "Non-nil means do not show the splash buffer with the clock resolver."
 
   "Non-nil means do not show the splash buffer with the clock resolver."
 
   :group 'org-clock
 
   :group 'org-clock
 
-  :version "24.1"
 
   :type 'boolean)
 
   :type 'boolean)
 
 
 
 (defvar org-clock-in-prepare-hook nil
 
 (defvar org-clock-in-prepare-hook nil
 
@@ -1393,8 +1387,7 @@ If there is no running clock, throw an error, unless FAIL-QUIETLY is set."
 
 	  (message (concat "Clock stopped at %s after HH:MM = " org-time-clocksum-format "%s") te h m
 
 	  (message (concat "Clock stopped at %s after HH:MM = " org-time-clocksum-format "%s") te h m
 
 		   (if remove " => LINE REMOVED" ""))
 
 		   (if remove " => LINE REMOVED" ""))
 
           (run-hooks 'org-clock-out-hook)
 
           (run-hooks 'org-clock-out-hook)
 
-	  (unless (org-clocking-p)
 
-	    (org-clock-delete-current)))))))
 
+	  (org-clock-delete-current))))))
 
 
 
 (add-hook 'org-clock-out-hook 'org-clock-remove-empty-clock-drawer)
 
 (add-hook 'org-clock-out-hook 'org-clock-remove-empty-clock-drawer)
 
 
 
@@ -1996,7 +1989,7 @@ the currently selected interval size."
 
                         (encode-time 0 0 0 (+ d n) m y))))
 
                         (encode-time 0 0 0 (+ d n) m y))))
 
           ((and wp (string-match "w\\|W" wp) mw (> (length wp) 0))
 
           ((and wp (string-match "w\\|W" wp) mw (> (length wp) 0))
 
            (require 'cal-iso)
 
            (require 'cal-iso)
 
-           (setq date (calendar-gregorian-from-absolute
 
+           (setq date (calendar-gregorian-from-absolute 
 		       (calendar-absolute-from-iso (list (+ mw n) 1 y))))
 
 		       (calendar-absolute-from-iso (list (+ mw n) 1 y))))
 
            (setq ins (format-time-string
 
            (setq ins (format-time-string
 
                       "%G-W%V"
 
                       "%G-W%V"
 
@@ -2013,7 +2006,7 @@ the currently selected interval size."
 
                (setq mw 5
 
                (setq mw 5
 
                      y (- y 1))
 
                      y (- y 1))
 
              ())
 
              ())
 
-           (setq date (calendar-gregorian-from-absolute
 
+           (setq date (calendar-gregorian-from-absolute 
 		       (calendar-absolute-from-iso (org-quarter-to-date (+ mw n) y))))
 
 		       (calendar-absolute-from-iso (org-quarter-to-date (+ mw n) y))))
 
            (setq ins (format-time-string
 
            (setq ins (format-time-string
 
                       (concatenate 'string (number-to-string y) "-Q" (number-to-string (+ mw n)))
 
                       (concatenate 'string (number-to-string y) "-Q" (number-to-string (+ mw n)))
 
@@ -2463,9 +2456,7 @@ TIME:      The sum of all time spend in this tree, in minutes.  This time
 
       (org-clock-sum ts te
 
       (org-clock-sum ts te
 
 		     (unless (null matcher)
 
 		     (unless (null matcher)
 
 		       (lambda ()
 
 		       (lambda ()
 
-			 (let* ((tags-list (org-get-tags-at))
 
-				(org-scanner-tags tags-list)
 
-				(org-trust-scanner-tags t))
 
+			 (let ((tags-list (org-get-tags-at)))
 
 			   (eval matcher)))))
 
 			   (eval matcher)))))
 
       (goto-char (point-min))
 
       (goto-char (point-min))
 
       (setq st t)
 
       (setq st t)
 
@@ -2640,3 +2631,4 @@ The details of what will be saved are regulated by the variable
 
 (provide 'org-clock)
 
 (provide 'org-clock)
 
 
 
 ;;; org-clock.el ends here
 
 ;;; org-clock.el ends here
 
+

+ 1 - 1
lisp/org-colview-xemacs.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; org-colview-xemacs.el --- Column View in Org-mode, XEmacs-specific version
 
 ;;; org-colview-xemacs.el --- Column View in Org-mode, XEmacs-specific version
 
 
 
-;; Copyright (C) 2004-2012
 
+;; Copyright (C) 2004-2011
 
 ;;   Free Software Foundation, Inc.
 
 ;;   Free Software Foundation, Inc.
 
 
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>

+ 1 - 1
lisp/org-colview.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; org-colview.el --- Column View in Org-mode
 
 ;;; org-colview.el --- Column View in Org-mode
 
 
 
-;; Copyright (C) 2004-2012 Free Software Foundation, Inc.
 
+;; Copyright (C) 2004-2011 Free Software Foundation, Inc.
 
 
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 
 ;; Keywords: outlines, hypermedia, calendar, wp
 
 ;; Keywords: outlines, hypermedia, calendar, wp

+ 1 - 1
lisp/org-compat.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; org-compat.el --- Compatibility code for Org-mode
 
 ;;; org-compat.el --- Compatibility code for Org-mode
 
 
 
-;; Copyright (C) 2004-2012 Free Software Foundation, Inc.
 
+;; Copyright (C) 2004-2011 Free Software Foundation, Inc.
 
 
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 
 ;; Keywords: outlines, hypermedia, calendar, wp
 
 ;; Keywords: outlines, hypermedia, calendar, wp

+ 3 - 4
lisp/org-crypt.el
View File 

@@ -76,21 +76,21 @@
 
 
 
 (defgroup org-crypt nil
 
 (defgroup org-crypt nil
 
   "Org Crypt"
 
   "Org Crypt"
 
-  :tag "Org Crypt"
 
+  :tag "Org Crypt" 
   :group 'org)
 
   :group 'org)
 
 
 
 (defcustom org-crypt-tag-matcher "crypt"
 
 (defcustom org-crypt-tag-matcher "crypt"
 
   "The tag matcher used to find headings whose contents should be encrypted.
 
   "The tag matcher used to find headings whose contents should be encrypted.
 
 
 
 See the \"Match syntax\" section of the org manual for more details."
 
 See the \"Match syntax\" section of the org manual for more details."
 
-  :type 'string
 
+  :type 'string 
   :group 'org-crypt)
 
   :group 'org-crypt)
 
 
 
 (defcustom org-crypt-key ""
 
 (defcustom org-crypt-key ""
 
   "The default key to use when encrypting the contents of a heading.
 
   "The default key to use when encrypting the contents of a heading.
 
 
 
 This setting can also be overridden in the CRYPTKEY property."
 
 This setting can also be overridden in the CRYPTKEY property."
 
-  :type 'string
 
+  :type 'string 
   :group 'org-crypt)
 
   :group 'org-crypt)
 
 
 
 (defcustom org-crypt-disable-auto-save 'ask
 
 (defcustom org-crypt-disable-auto-save 'ask
 
@@ -111,7 +111,6 @@ nil      : Leave auto-save-mode enabled.
 
            NOTE: This only works for entries which have a tag
 
            NOTE: This only works for entries which have a tag
 
            that matches `org-crypt-tag-matcher'."
 
            that matches `org-crypt-tag-matcher'."
 
   :group 'org-crypt
 
   :group 'org-crypt
 
-  :version "24.1"
 
   :type '(choice (const :tag "Always"  t)
 
   :type '(choice (const :tag "Always"  t)
 
                  (const :tag "Never"   nil)
 
                  (const :tag "Never"   nil)
 
                  (const :tag "Ask"     ask)
 
                  (const :tag "Ask"     ask)

+ 1 - 4
lisp/org-ctags.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; org-ctags.el - Integrate Emacs "tags" facility with org mode.
 
 ;;; org-ctags.el - Integrate Emacs "tags" facility with org mode.
 
 ;;
 
 ;;
 
-;; Copyright (C) 2007-2012 Free Software Foundation, Inc.
 
+;; Copyright (C) 2007-2011 Free Software Foundation, Inc.
 
 
 
 ;; Author: Paul Sexton <eeeickythump@gmail.com>
 
 ;; Author: Paul Sexton <eeeickythump@gmail.com>
 
 
 
@@ -162,7 +162,6 @@ See the ctags documentation for more information.")
 
     (t "ctags-exuberant"))
 
     (t "ctags-exuberant"))
 
   "Full path to the ctags executable file."
 
   "Full path to the ctags executable file."
 
   :group 'org-ctags
 
   :group 'org-ctags
 
-  :version "24.1"
 
   :type 'file)
 
   :type 'file)
 
 
 
 (defcustom org-ctags-open-link-functions
 
 (defcustom org-ctags-open-link-functions
 
@@ -171,7 +170,6 @@ See the ctags documentation for more information.")
 
     org-ctags-ask-append-topic)
 
     org-ctags-ask-append-topic)
 
   "List of functions to be prepended to ORG-OPEN-LINK-FUNCTIONS when ORG-CTAGS is active."
 
   "List of functions to be prepended to ORG-OPEN-LINK-FUNCTIONS when ORG-CTAGS is active."
 
   :group 'org-ctags
 
   :group 'org-ctags
 
-  :version "24.1"
 
   :type 'hook
 
   :type 'hook
 
   :options '(org-ctags-find-tag
 
   :options '(org-ctags-find-tag
 
              org-ctags-ask-rebuild-tags-file-then-find-tag
 
              org-ctags-ask-rebuild-tags-file-then-find-tag
 
@@ -193,7 +191,6 @@ Created as a local variable in each buffer.")
 
 The following patterns are replaced in the string:
 
 The following patterns are replaced in the string:
 
     `%t' - replaced with the capitalized title of the hyperlink"
 
     `%t' - replaced with the capitalized title of the hyperlink"
 
   :group 'org-ctags
 
   :group 'org-ctags
 
-  :version "24.1"
 
   :type 'string)
 
   :type 'string)

+ 1 - 1
lisp/org-datetree.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; org-datetree.el --- Create date entries in a tree
 
 ;;; org-datetree.el --- Create date entries in a tree
 
 
 
-;; Copyright (C) 2009-2012 Free Software Foundation, Inc.
 
+;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
 
 
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 
 ;; Keywords: outlines, hypermedia, calendar, wp
 
 ;; Keywords: outlines, hypermedia, calendar, wp

+ 1 - 3
lisp/org-docbook.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; org-docbook.el --- DocBook exporter for org-mode
 
 ;;; org-docbook.el --- DocBook exporter for org-mode
 
 ;;
 
 ;;
 
-;; Copyright (C) 2007-2012 Free Software Foundation, Inc.
 
+;; Copyright (C) 2007-2011 Free Software Foundation, Inc.
 
 ;;
 
 ;;
 
 ;; Emacs Lisp Archive Entry
 
 ;; Emacs Lisp Archive Entry
 
 ;; Filename: org-docbook.el
 
 ;; Filename: org-docbook.el
 
@@ -150,7 +150,6 @@ avoid same set of footnote IDs being used multiple times."
 
 (defcustom org-export-docbook-footnote-separator "<superscript>, </superscript>"
 
 (defcustom org-export-docbook-footnote-separator "<superscript>, </superscript>"
 
   "Text used to separate footnotes."
 
   "Text used to separate footnotes."
 
   :group 'org-export-docbook
 
   :group 'org-export-docbook
 
-  :version "24.1"
 
   :type 'string)
 
   :type 'string)
 
 
 
 (defcustom org-export-docbook-emphasis-alist
 
 (defcustom org-export-docbook-emphasis-alist
 
@@ -196,7 +195,6 @@ This XSLT stylesheet is used by
 
 Object (FO) files.  You can use either `fo/docbook.xsl' that
 
 Object (FO) files.  You can use either `fo/docbook.xsl' that
 
 comes with DocBook, or any customization layer you may have."
 
 comes with DocBook, or any customization layer you may have."
 
   :group 'org-export-docbook
 
   :group 'org-export-docbook
 
-  :version "24.1"
 
   :type 'string)
 
   :type 'string)
 
 
 
 (defcustom org-export-docbook-xslt-proc-command nil
 
 (defcustom org-export-docbook-xslt-proc-command nil

+ 1 - 1
lisp/org-docview.el
View File 

@@ -1,6 +1,6 @@
 
 ;;; org-docview.el --- support for links to doc-view-mode buffers
 
 ;;; org-docview.el --- support for links to doc-view-mode buffers
 
 
 
-;; Copyright (C) 2009-2012  Free Software Foundation, Inc.
 
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 
 
 ;; Author: Jan Böcker <jan.boecker at jboecker dot de>
 
 ;; Author: Jan Böcker <jan.boecker at jboecker dot de>
 
 ;; Keywords: outlines, hypermedia, calendar, wp
 
 ;; Keywords: outlines, hypermedia, calendar, wp

+ 0 - 2
lisp/org-entities.el
View File 

@@ -44,7 +44,6 @@
 
 For example, this will replace \"\\nsup\" with \"[not a superset of]\"
 
 For example, this will replace \"\\nsup\" with \"[not a superset of]\"
 
 in backends where the corresponding character is not available."
 
 in backends where the corresponding character is not available."
 
   :group 'org-entities
 
   :group 'org-entities
 
-  :version "24.1"
 
   :type 'boolean)
 
   :type 'boolean)
 
 
 
 (defcustom org-entities-user nil
 
 (defcustom org-entities-user nil
 
@@ -69,7 +68,6 @@ utf-8 replacement    Use the special characters available in utf-8.
 
 If you define new entities here that require specific LaTeX packages to be
 
 If you define new entities here that require specific LaTeX packages to be
 
 loaded, add these packages to `org-export-latex-packages-alist'."
 
 loaded, add these packages to `org-export-latex-packages-alist'."
 
   :group 'org-entities
 
   :group 'org-entities
 
-  :version "24.1"
 
   :type '(repeat
 
   :type '(repeat
 
 	  (list
 
 	  (list
 
 	   (string :tag "name  ")
 
 	   (string :tag "name  ")

Some files were not shown because too many files changed in this diff