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 7 years ago
parent
commit
6e534f9c61
100 changed files with 3431 additions and 5213 deletions
  1. 443 874
      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. 1142 1404
      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. 1324 2096
      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 0
      lisp/org-entities.el

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


+ 1 - 3
Makefile

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

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

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

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

@@ -1,6 +1,6 @@
 ;;; 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 
 ;; Keywords: literate programming, reproducible research

+ 4 - 4
contrib/lisp/htmlize.el

@@ -633,7 +633,7 @@ without modifying their meaning."
   (goto-char (point-min))
   (while (search-forward "Local Variables:" nil t)
     (replace-match "Local Variables:" nil t)))
-
+  
 
 ;;; Color handling.
 
@@ -796,7 +796,7 @@ If no rgb.txt file is found, return nil."
 	  (t
 	   ;; We're getting the RGB components from Emacs.
 	   (let ((rgb
-		  ;; Here I cannot conditionalize on (fboundp ...)
+		  ;; Here I cannot conditionalize on (fboundp ...) 
 		  ;; because ps-print under some versions of GNU Emacs
 		  ;; defines its own dummy version of
 		  ;; `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
 ;; `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
 ;; (htmlize-method-function 'METHOD) and calling (funcall FUNCTION).
 ;; 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\">"
 	    (htmlize-fstruct-foreground fstruct)
 	    (htmlize-fstruct-background fstruct))))
-
+       
 (defun htmlize-font-insert-text (text fstruct-list buffer)
   ;; In `font' mode, we use the traditional HTML means of altering
   ;; presentation: <font> tag for colors, <b> for bold, <u> for

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

@@ -1,6 +1,6 @@
 ;;; 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>
 ;; Version: 0.2

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

@@ -1,5 +1,5 @@
 ;;; 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>
 ;; Version: 1.0
@@ -67,7 +67,7 @@ Otherwise prompt the user for the right bookmark to use."
     (if (not file)
 	(when (eq major-mode 'bookmark-bmenu-mode)
 	  (setq bookmark (bookmark-bmenu-bookmark)))
-      (when (and (setq bmks
+      (when (and (setq bmks 
 		       (mapcar (lambda (name)
 				 (if (equal file
 					    (abbreviate-file-name
@@ -75,7 +75,7 @@ Otherwise prompt the user for the right bookmark to use."
 				     name))
 			       (bookmark-all-names)))
 		 (setq bmks (delete nil bmks)))
-	(setq bookmark
+	(setq bookmark 
 	      (if (or (eq 1 (length bmks)) org-bookmark-use-first-bookmark)
 		  (car bmks)
 		(completing-read "Bookmark: " bmks nil t nil nil (car bmks))))))

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

@@ -1,6 +1,6 @@
 ;;; 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))
 ;; Version: 1.0
@@ -138,3 +138,6 @@ of checkbox items"
 (provide 'org-checklist)
 
 ;;; org-checklist.el ends here
+
+
+

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

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

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

@@ -1,6 +1,6 @@
 ;;; 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>
 ;; Keywords: outlines, hypermedia, calendar, wp, experimentation,
@@ -87,7 +87,7 @@
 ;; | run (50)  |                          0.116446 |
 ;; | run (100) |                          0.118863 |
 ;; #+END:
-;;
+;; 
 
 ;;; Code:
 (require 'org)
@@ -134,7 +134,7 @@ preceeding the dblock, then update the contents of the dblock."
 	  (org-narrow-to-subtree)
 	  (setq stringformat (if noquote "%s" "%S"))
 	  (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))
 	  (widen))
 	(setq pos (point))

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

@@ -1,5 +1,5 @@
 ;;; 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>
 ;; Keywords: outlines, hypermedia, calendar, wp

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

@@ -1,5 +1,5 @@
 ;;; 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>
 ;; Keywords: outlines, hypermedia, calendar, wp

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

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

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


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

@@ -1,6 +1,6 @@
 ;;; 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>,
 ;;         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")
   "Interpreters allows for evaluation tags.
 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
 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
     (insert code)
     (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)
   (if (org-eval-light-inside-snippet)

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

@@ -1,5 +1,5 @@
 ;;; 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>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -105,7 +105,7 @@
 (defcustom org-eval-interpreters '("lisp")
   "Interpreters allows for evaluation tags.
 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
 shell   Pass command to the shell and display the result
@@ -120,7 +120,7 @@ ruby    The ruby interpreter"
 	      (const "python")
 	      (const "ruby")
 	      (const "shell")))
-
+  
 (defun org-eval-handle-snippets (limit &optional replace)
   "Evaluate code snippets and display the results as display property.
 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
     (insert code)
     (shell-command-on-region (point-min) (point-max) cmd nil 'replace)
-    (buffer-string)))
+    (buffer-string)))  
 
 (provide 'org-eval)
 
 ;;; org-eval.el ends here
+

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

@@ -1,6 +1,6 @@
 ;;; 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>
 

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

@@ -25,7 +25,7 @@
 ;;; Commentary:
 ;;
 ;; 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
 ;; 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.
 ;;
 ;; When does an entry expires?
-;;
+;; 
 ;; Consider this entry:
 ;;
 ;; * Stop watching TV
@@ -41,8 +41,8 @@
 ;;   :CREATED:  <2008-01-07 lun 08:01>
 ;;   :EXPIRY:   <2008-01-09 08:01>
 ;;   :END:
-;;
-;; This entry will expire on the 9th, january 2008.
+;; 
+;; This entry will expire on the 9th, january 2008. 
 
 ;; * Stop watching TV
 ;;   :PROPERTIES:
@@ -56,19 +56,19 @@
 ;; What happen when an entry is expired?  Nothing until you explicitely
 ;; M-x org-expiry-process-entries When doing this, org-expiry will check
 ;; for expired entries and request permission to process them.
-;;
+;; 
 ;; Processing an expired entries means calling the function associated
 ;; 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
 ;; 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.
-;;
+;; 
 ;; 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
 ;; property will be automatically added.  Same when you're scheduling or
 ;; 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
 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'."
   (let* ((ex-prop org-expiry-expiry-property-name)
 	 (cr-prop org-expiry-created-property-name)
@@ -292,7 +292,7 @@ update the date."
 	 d-time d-hour timestr)
     (when (or (null d) arg)
       ;; 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)
 		     (current-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
     (if org-expiry-inactive-timestamps
 	(setq timestr (concat "[" (substring timestr 1 -1) "]")))
-
+     
     (save-excursion
       (org-entry-put
        (point) org-expiry-expiry-property-name timestr))))

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

@@ -1,6 +1,6 @@
 ;; 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>
 ;; Keywords: outlines, hypermedia, calendar, wp, export
@@ -35,7 +35,7 @@
 ;; org-set-generic-type function:
 ;;
 ;;    (org-set-generic-type
-;;     "really-basic-text"
+;;     "really-basic-text" 
 ;;     '(:file-suffix  ".txt"
 ;;       :key-binding  ?R
 ;;
@@ -155,10 +155,10 @@ in this way, it will be wrapped."
 
      :toc-section-numbers       t
      :toc-section-number-format "\#(%s) "
-     :toc-format                "--%s--"
+     :toc-format                "--%s--"    
      :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-prefix           "   <tags>"
@@ -217,7 +217,7 @@ in this way, it will be wrapped."
      :body-list-checkbox-half-end  "</checkbox (half)>"
 
 
-
+     
 
 					; other body lines
      :body-line-format             "%s"
@@ -257,10 +257,10 @@ in this way, it will be wrapped."
      :toc-export                t
      :toc-section-numbers       t
      :toc-section-number-format "%s "
-     :toc-format                "%s\n"
+     :toc-format                "%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-section-prefix         "\n"
@@ -310,7 +310,7 @@ in this way, it will be wrapped."
 
      :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")
 
      :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"
 
      )
-    ("trac-wiki"
+    ("trac-wiki" 
      :file-suffix     ".txt"
      :key-binding     ?T
 
@@ -409,7 +409,7 @@ in this way, it will be wrapped."
 
      :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")
 
      :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]
      :body-bullet-list-prefix       ("* " "** " "*** " "**** " "***** ")
      )
-    ("tikiwiki"
+    ("tikiwiki" 
      :file-suffix     ".txt"
      :key-binding     ?U
 
@@ -445,7 +445,7 @@ in this way, it will be wrapped."
 
      :body-section-header-prefix    ("! " "!! " "!!! " "!!!! "
 				     "!!!!! " "!!!!!! " "!!!!!!! ")
-     :body-section-header-suffix    (" \n" " \n" " \n"
+     :body-section-header-suffix    (" \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
-    :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.
   The intention is to handle formats where text is flowed, and
 newlines are interpreted as significant \(e.g., as indicating
 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."
     :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 :verbatim-format)
 
-
-
+    
+  
 
 (defun org-export-generic-remember-section (type suffix &optional prefix)
   (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)
 			    opt-plist)))
 
-	 helpstart
+	 helpstart 
 	 (bogus (mapc (lambda (x)
 			(setq helpstart
 			      (concat helpstart "\["
@@ -611,7 +611,7 @@ underlined headlines.  The default is 3."
 	    (unless (setq ass (cadr (assq r2 cmds)))
 	      (error "No command associated with key %c" r1))
 
-	    (cdr (assoc
+	    (cdr (assoc 
 		  (if (equal ass "default") org-generic-export-type ass)
 		  org-generic-alist))))
 
@@ -732,11 +732,11 @@ underlined headlines.  The default is 3."
          (format-code (plist-get export-plist :code-format))
          (format-verbatim (plist-get export-plist :verbatim-format))
 
-
+         
 
 	 thetoc toctags have-headings first-heading-pos
 	 table-open table-buffer link-buffer link desc desc0 rpl wrap)
-
+    
     (let ((inhibit-read-only t))
       (org-unmodified
        (remove-text-properties (point-min) (point-max)
@@ -841,7 +841,7 @@ underlined headlines.  The default is 3."
 				(org-re "[ \t]+:\\([[:alnum:]_@:]+\\):[ \t]*$")
 				txt)
 			       (progn
-				 (setq
+				 (setq 
 				  toctags
 				  (org-export-generic-header
 				   (match-string 1 txt)
@@ -852,7 +852,7 @@ underlined headlines.  The default is 3."
 				  txt)
 				 (setq txt (replace-match "" t t txt)))
 			     (setq toctags tocnotagsstr)))
-
+			   
 			 (if (string-match quote-re0 txt)
 			     (setq txt (replace-match "" t t txt)))
 
@@ -871,7 +871,7 @@ underlined headlines.  The default is 3."
 				   "")
 
 				 (format
-				  (if todo tocformtodo tocformat)
+				  (if todo tocformtodo tocformat) 
 				  txt)
 
 				 toctags)
@@ -908,7 +908,7 @@ underlined headlines.  The default is 3."
 				      (substring link 8)
 				      org-export-code-refs)))
 			t t line))
-	  (setq rpl (concat "["
+	  (setq rpl (concat "[" 
 			    (or (match-string 3 line) (match-string 1 line))
 			    "]"))
 	  (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)
 
-        (setq line
+        (setq line 
               (org-export-generic-fontify line))
 
 	;; 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 len 0)))
     (concat result indstr line)))
-
+			   
 (defun org-export-generic-push-links (link-buffer)
   "Push out links in the buffer."
   (when link-buffer
@@ -1258,13 +1258,13 @@ REVERSE means to reverse the list if the plist match is a list
 	))
      ;; same level
      ((= level old-level)
-      (insert
+      (insert 
        (org-export-generic-format export-plist :body-section-suffix 0 level))
       )
      )
     (insert
      (org-export-generic-format export-plist :body-section-prefix 0 level))
-
+    
     (if (and org-export-with-section-numbers
 	     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.
 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
-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.
 The third element decides whether to protect converted text from other
 conversions.")

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


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

@@ -1,6 +1,6 @@
 ;;; 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>
 ;; Keywords: files, calendar, hypermedia

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

@@ -6,7 +6,7 @@
 ;; Version: 1.0
 ;; 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
 ;; 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 newgative selection criterion
 ;; =   clear a keyword from the selection string
-;; ;
+;; ;   
 
 (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-or-cmd)
 (org-defkey org-agenda-mode-map "\\" 'org-agenda-query-not-cmd)
-
+ 
 ;;; Agenda interactive query manipulation
 
 (defcustom org-agenda-query-selection-single-key t
@@ -283,7 +283,7 @@ keyword string."
 (defun org-agenda-query-generic-cmd (op)
   "Activate query manipulation with OP as initial operator."
   (let ((q (org-agenda-query-selection org-agenda-query-string op
-                                       org-tag-alist
+                                       org-tag-alist 
                                        (org-agenda-query-global-todo-keys))))
     (when q
       (setq org-agenda-query-string q)

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

@@ -1,6 +1,6 @@
 ;;; 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.
 ;;
@@ -181,7 +181,7 @@ looks like tree2, where the level is 2."
         (when (or (not min) (< level min)) (setq min level))
         (when (> level max) (setq max level))))
     (cons (or min 0) max)))
-
+  
 (defun org-invoice-collapse-list (ls)
   "Reorganize the given list by dates."
   (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)))))
             (nconc bucket (list info))))))
     (nreverse new)))
-
+  
 (defun org-invoice-info-to-table (info)
   "Create a single org table row from the given info alist."
   (let ((title (cdr (assoc 'title info)))
@@ -223,19 +223,19 @@ looks like tree2, where the level is 2."
         (price (cdr (assoc 'price info)))
         (with-price (plist-get org-invoice-table-params :price)))
     (unless total
-      (setq
+      (setq 
        org-invoice-total-time (+ org-invoice-total-time work)
        org-invoice-total-price (+ org-invoice-total-price price)))
     (setq total (and total (org-minutes-to-hh:mm-string total)))
     (setq work  (and work  (org-minutes-to-hh:mm-string work)))
-    (insert-before-markers
+    (insert-before-markers 
      (concat "|" title
              (cond
               (total (concat "|" total))
               (work  (concat "|" work)))
              (and with-price price (concat "|" (format "%.2f" price)))
              "|" "\n"))))
-
+  
 (defun org-invoice-list-to-table (ls)
   "Convert a list of heading info to an org table"
   (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))
         (org-invoice-total-time 0)
         (org-invoice-total-price 0))
-    (insert-before-markers
+    (insert-before-markers 
      (concat "| Task / Date | Time" (and with-price "| Price") "|\n"))
     (dolist (info ls)
       (insert-before-markers "|-\n")
@@ -268,9 +268,9 @@ heading that begins the invoice data, usually using the
       (org-clock-sum)
       (run-hook-with-args 'org-invoice-start-hook)
       (cons org-invoice-current-invoice
-            (org-invoice-collapse-list
+            (org-invoice-collapse-list 
              (org-map-entries 'org-invoice-heading-info t 'tree 'archive))))))
-
+  
 (defun org-dblock-write:invoice (params)
   "Function called by OrgMode to write the invoice dblock.  To
 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)
       (org-create-dblock (list :name "invoice")))
     (org-update-dblock)))
-
+  
 (provide 'org-invoice)

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

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

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

@@ -1,6 +1,6 @@
 ;;; 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>
 ;; Keywords: outlines, hypermedia, calendar, wp

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

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

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

@@ -2,7 +2,7 @@
 ;;; application and insert them as links into org-mode documents
 ;;
 ;; Copyright (c) 2010-2012 Free Software Foundation, Inc.
-;;
+;; 
 ;; Author: Anthony Lander <anthony.lander@gmail.com>
 ;; Version: 1.0.1
 ;; Keywords: org, mac, hyperlink
@@ -52,7 +52,7 @@
 ;; add (require 'org-mac-link-grabber) to your .emacs, and optionally
 ;; 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)))
 ;;
 ;;
@@ -161,7 +161,7 @@ applications and inserting them in org documents"
 			  (when (and active (eq input key))
 				(call-interactively grab-function))))
 		  descriptors)))
-
+  
 (defalias 'omgl-grab-link 'omlg-grab-link
   "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"
 					 "end tell\n"))))
 	(car (split-string result "[\r\n]+" t))))
-
+	
 (defun org-mac-safari-get-frontmost-url ()
   (interactive)
   (message "Applescript: Getting Safari url...")
@@ -361,7 +361,7 @@ applications and inserting them in org documents"
 (defun org-mac-safari-insert-frontmost-url ()
   (interactive)
   (insert (org-mac-safari-get-frontmost-url)))
-
+		
 
 ;;
 ;;

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

@@ -1,6 +1,6 @@
 ;;; 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>
 ;;
 ;; 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)
 
 (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>\"' &"
   "Command to execute to display mairix search results via mutt within
 an xterm.
@@ -244,7 +244,7 @@ along with general mairix configuration."
   :group 'org-mairix-gnus
   :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
   "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
@@ -285,7 +285,7 @@ to do that -- so you're likely to see zombies floating around.
 
 If you can improve this, please do!"
   (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"))
   (setq message-id (substring search 2 nil))
   (require 'gnus)

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

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

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

@@ -1,6 +1,5 @@
 ;;; 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>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -255,3 +254,4 @@ with string values.  In addition, it reutnrs the following properties:
 (provide 'org-mtags)
 
 ;;; org-mtags.el ends here
+

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

@@ -32,7 +32,7 @@
 
 ;; Links have one the following form
 ;; notmuch:<search terms>
-;; notmuch-search:<search terms>.
+;; notmuch-search:<search terms>. 
 
 ;; The first form open the queries in notmuch-show mode, whereas the
 ;; 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))
       (org-add-link-props :link link :description desc)
       link)))
-
+  
 (defun org-notmuch-open (path)
   "Follow a notmuch message link specified by PATH."
   (org-notmuch-follow-link path))
 
 (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."
   (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 ()
   "Store a link to a notmuch search or message."
   (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)))
 	  (desc (concat "Notmuch search: " notmuch-search-query-string)))
-      (org-store-link-props :type "notmuch-search"
+      (org-store-link-props :type "notmuch-search" 
 			    :link link
 			    :description desc)
       link)))

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

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

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

@@ -145,15 +145,15 @@ buffer."
 
 (defun org-registry-assoc-all (link &optional registry)
   "Return all associated entries of LINK in the registry."
-  (org-registry-find-all
+  (org-registry-find-all 
    (lambda (entry) (string= link (car entry)))
    registry))
 
 (defun org-registry-find-all (test &optional 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))))
 
 ;;;###autoload

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

@@ -40,7 +40,7 @@
 ;; associated with that task, go to the end of your item and type:
 ;;
 ;; M-x org-screen
-;;
+;; 
 ;; 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
 ;; location.
@@ -79,10 +79,10 @@ is copied from ansi-term method."
 
   ;; Pick the name of the new buffer.
   (let ((term-ansi-buffer-name
-        (generate-new-buffer-name
+        (generate-new-buffer-name 
          (org-screen-buffer-name 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))
     (set-buffer term-ansi-buffer-name)
     (term-mode)
@@ -104,5 +104,5 @@ is copied from ansi-term method."
 		 '("screen" . "elisp:(org-screen-goto \"%s\")"))
   (setq org-link-abbrev-alist
 	'(("screen" . "elisp:(org-screen-goto \"%s\")"))))
-
+ 
 (provide 'org-screen)

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

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

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

@@ -1,6 +1,5 @@
 ;;; 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>
 ;; 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))
     (if game
 	(progn
-	  (org-table-put i j (number-to-string
+	  (org-table-put i j (number-to-string 
 			      (nth 1 (assoc (cons i j) game)))
 			 'align)
 	  (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.
 A game structure is returned."
   (let (b e g i j game)
-
+    
     (org-table-goto-line 1)
     (org-table-goto-column 1)
     (setq b (point))

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

@@ -278,7 +278,7 @@ specified, then make `org-toc-recenter' use this value."
 ;;; Navigation functions:
 (defun org-toc-goto (&optional jump cycle)
   "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 CYCLE is non-nil, cycle the targeted subtree in the Org window."
   (interactive)
@@ -459,15 +459,15 @@ status."
 (defun org-toc-help ()
   "Display a quick help message in the echo-area for `org-toc-mode'."
   (interactive)
-  (let ((st-start 0)
+  (let ((st-start 0) 
 	(help-message
 	 "\[space\]   show heading                     \[1-4\] hide headlines below this level
 \[TAB\]     jump to heading                  \[f\]   toggle follow 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)
-\[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)
-\[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"))
     (while (string-match "\\[[^]]+\\]" help-message st-start)
       (add-text-properties (match-beginning 0)

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

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

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

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

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

@@ -1,6 +1,6 @@
 ;;; 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>
 ;; Keywords: outlines, hypermedia, calendar, wp

+ 4 - 4
contrib/lisp/org2rem.el

@@ -1,6 +1,6 @@
 ;;; 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
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -402,7 +402,7 @@ REM %s %s MSG EVENT:%s%s %s%s%%
 	      (insert sexp "\n"))))
 	;; (princ (org-diary-to-rem-string sexp-buffer))
 	(kill-buffer sexp-buffer))
-
+      
       (when org-remind-include-todo
 	(setq prefix "TODO-")
 	(goto-char (point-min))
@@ -450,7 +450,7 @@ REM %s %s MSG EVENT:%s%s %s%s%%
                                 (if dos diff-days 0)
                               (if dos 0 diff-days))
                           1000)))
-
+              
               (if (and (numberp org-rem-aw) (> org-rem-aw 0))
                   (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 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)))
-
+               
 	      (if (string-match org-bracket-link-regexp hd)
 		  (setq hd (replace-match (if (match-end 3) (match-string 3 hd)
 					    (match-string 1 hd))

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

@@ -1,6 +1,6 @@
 ;;; 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>
 ;; Keywords: org, tables, sql

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

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

+ 1 - 1
contrib/scripts/StartOzServer.oz

@@ -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
 %%% modify it under the terms of the GNU General Public License
 %%% as published by the Free Software Foundation; either version 2

+ 1 - 1
contrib/scripts/org2hpda

@@ -1,5 +1,5 @@
 # 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
 #

+ 117 - 176
doc/org.texi

@@ -265,7 +265,7 @@
 @copying
 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
 Permission is granted to copy, distribute and/or modify this document
@@ -717,7 +717,6 @@ Specific header arguments
 * rownames::                    Handle row names in tables
 * shebang::                     Make tangled files executable
 * eval::                        Limit evaluation of specific code blocks
-* wrap::                        Mark source block evaluation results
 
 Miscellaneous
 
@@ -1081,7 +1080,7 @@ attach it to your bug report.
 @node Conventions,  , Feedback, Introduction
 @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:
 
 @table @code
@@ -1099,14 +1098,7 @@ User-defined properties are capitalized; built-in properties with
 special meaning are written with all capitals.
 @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,
 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,
@@ -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
 @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},
-@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
 * Top level headline
@@ -1437,7 +1428,7 @@ more details, see the docstring of the command
 @code{org-clone-subtree-with-time-shift}.
 @orgcmd{C-c C-w,org-refile}
 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
 region will be sorted.  Otherwise the children of the current headline are
 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
 
 @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
 normally don't want to see it.  For this, Org mode has @emph{drawers}.
 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:
 
 @example
@@ -1782,13 +1771,6 @@ look like this:
    After the drawer.
 @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
 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
@@ -3243,8 +3225,6 @@ mailto:adent@@galaxy.net                   @r{Mail link}
 vm:folder                                 @r{VM folder link}
 vm:folder#id                              @r{VM message link}
 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#id                              @r{WANDERLUST message 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
 @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}).
-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.
 
 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}
 Set a property.  This prompts for a property name and a value.  If
 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
 inserted early in the entry, but after the lines with planning
 information like deadlines.
@@ -5918,14 +5896,12 @@ created for this purpose, it is described in @ref{Structure editing}.
 @cindex time clocking
 
 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
 @lisp
@@ -6704,21 +6680,21 @@ similar way.}:
 
 @vindex org-from-is-user-regexp
 @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
 
 @noindent
@@ -9041,7 +9017,7 @@ the object with @code{\ref@{tab:basic-data@}}:
 
 @example
 #+CAPTION: This is the caption for the next table (or link)
-#+LABEL:   tab:basic-data
+#+LABEL:   tbl:basic-data
    | ... | ...|
    |-----|----|
 @end example
@@ -9655,7 +9631,7 @@ Insert template with export options, see example below.
 @cindex #+EXPORT_SELECT_TAGS
 @cindex #+EXPORT_EXCLUDE_TAGS
 @cindex #+XSLT
-@cindex #+LaTeX_HEADER
+@cindex #+LATEX_HEADER
 @vindex user-full-name
 @vindex user-mail-address
 @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}}
 #+LINK_UP:     the ``up'' 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_EXCLUDE_TAGS:  Tags that exclude a tree from export
 #+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-default-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
 @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:}
@@ -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-packages-alist} are spliced.}, and allows you to
 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
 @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
 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
-@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}
 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
 source code that uses the verbatim environment.  Special @file{beamer}
 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
 in the presentation as well.
 
@@ -12310,7 +12277,7 @@ publish it as @file{theindex.html}.
 @end multitable
 
 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
 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
 and/or the name of the evaluated code block.  The default value of
 @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
-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
 languages and @ref{Structure of code blocks} for information on the syntax
 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.
 @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})
 can be executed.  Named code blocks can be executed with a separate
 @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)
  #+END_SRC
 
- #+RESULTS:
+ #+results:
  : data1:1, data2:2
 @end example
 
@@ -13022,7 +12989,7 @@ Multi-line header arguments on a named code block:
      (message "data:%S" data)
    #+END_SRC
 
-   #+RESULTS: named-block
+   #+results: named-block
    : data:2
 @end example
 
@@ -13080,7 +13047,6 @@ argument in lowercase letters.  The following header arguments are defined:
 * rownames::                    Handle row names in tables
 * shebang::                     Make tangled files executable
 * eval::                        Limit evaluation of specific code blocks
-* wrap::                        Mark source block evaluation results
 @end menu
 
 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.
 
 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:},
 @code{#+TBLNAME:}, or @code{#+RESULTS:} line.  This includes tables, lists,
 @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)
 #+END_SRC
 
-#+RESULTS: table-length
+#+results: table-length
 : 4
 @end example
 
@@ -13153,7 +13119,7 @@ carried through to the source code block)
   (print x)
 #+END_SRC
 
-#+RESULTS:
+#+results:
 | simple | list |
 @end example
 
@@ -13166,7 +13132,7 @@ optionally followed by parentheses
 (* 2 length)
 #+END_SRC
 
-#+RESULTS:
+#+results:
 : 8
 @end example
 
@@ -13181,7 +13147,7 @@ code block name using standard function call syntax
 (* 2 input)
 #+END_SRC
 
-#+RESULTS: double
+#+results: double
 : 16
 
 #+NAME: squared
@@ -13189,7 +13155,7 @@ code block name using standard function call syntax
 (* input input)
 #+END_SRC
 
-#+RESULTS: squared
+#+results: squared
 : 4
 @end example
 
@@ -13208,7 +13174,7 @@ on two lines
   (concatenate 'string x " for you.")
 #+END_SRC
 
-#+RESULTS: read-literal-example
+#+results: read-literal-example
 : A literal example
 : on two lines for you.
 
@@ -13250,7 +13216,7 @@ following example assigns the last cell of the first row the table
   data
 #+END_SRC
 
-#+RESULTS:
+#+results:
 : a
 @end example
 
@@ -13271,7 +13237,7 @@ to @code{data}.
   data
 #+END_SRC
 
-#+RESULTS:
+#+results:
 | 2 | b |
 | 3 | c |
 | 4 | d |
@@ -13293,7 +13259,7 @@ column is referenced.
   data
 #+END_SRC
 
-#+RESULTS:
+#+results:
 | 1 | 2 | 3 | 4 |
 @end example
 
@@ -13313,7 +13279,7 @@ another by commas, as shown in the following example.
   data
 #+END_SRC
 
-#+RESULTS:
+#+results:
 | 11 | 14 | 17 |
 @end example
 
@@ -13346,7 +13312,7 @@ Emacs Lisp, as shown in the following example.
   $data
 #+END_SRC
 
-#+RESULTS:
+#+results:
 : (a b c)
 @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
 such by Org mode.  E.g., @code{:results value raw}.
 @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}.
 @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}.
 @item @code{code}
 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
 @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
-@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}
-``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}
-``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
 
 @subsubheading Noweb prefix lines
@@ -13776,7 +13729,7 @@ every time it is called.
 @item @code{yes}
 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
-@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
 changed since the last time it was evaluated, it will not be re-evaluated.
 @end itemize
@@ -13793,7 +13746,7 @@ changed since it was last run.
  runif(1)
  #+END_SRC
 
- #+RESULTS[a2a72cd647ad44515fab62e144796432793d68e1]: random
+ #+results[a2a72cd647ad44515fab62e144796432793d68e1]: random
  0.4659510825295
 
  #+NAME: caller
@@ -13801,7 +13754,7 @@ changed since it was last run.
  x
  #+END_SRC
 
- #+RESULTS[bec9c8724e397d5df3b696502df3ed7892fc4f5f]: caller
+ #+results[bec9c8724e397d5df3b696502df3ed7892fc4f5f]: caller
  0.254227238707244
 @end example
 
@@ -13845,7 +13798,7 @@ default value yields the following results.
   return tab
 #+END_SRC
 
-#+RESULTS: echo-table
+#+results: echo-table
 | a | b | c |
 | d | e | f |
 | g | h | i |
@@ -13867,7 +13820,7 @@ Leaves hlines in the table.  Setting @code{:hlines yes} has this effect.
   return tab
 #+END_SRC
 
-#+RESULTS: echo-table
+#+results: echo-table
 | a | b | c |
 |---+---+---|
 | d | e | f |
@@ -13905,7 +13858,7 @@ processing, then reapplied to the results.
   return [[val + '*' for val in row] for row in tab]
 #+END_SRC
 
-#+RESULTS: echo-table-again
+#+results: echo-table-again
 | a  |
 |----|
 | b* |
@@ -13948,7 +13901,7 @@ and is then reapplied to the results.
   return [[val + 10 for val in row] for row in tab]
 #+END_SRC
 
-#+RESULTS: echo-table-once-again
+#+results: echo-table-once-again
 | one | 11 | 12 | 13 | 14 | 15 |
 | two | 16 | 17 | 18 | 19 | 20 |
 @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
 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}
 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
@@ -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
 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
 @section Results of evaluation
 @cindex code block, results of evaluation
@@ -14068,7 +14013,7 @@ process.  For example, compare the following two blocks:
  print "bye"
 #+END_SRC
 
-#+RESULTS:
+#+results:
 : hello
 : bye
 @end example
@@ -14081,7 +14026,7 @@ In non-session mode, the `2' is not printed and does not appear.
  print "bye"
 #+END_SRC
 
-#+RESULTS:
+#+results:
 : hello
 : 2
 : bye
@@ -14372,19 +14317,19 @@ keystrokes are typed on a line by itself.
 The following template selectors are currently supported.
 
 @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
 
 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 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
 describing the variables here.  A structured overview of customization
 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.
 @item #+DRAWERS: NAME1 .....
 @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
 @vindex org-link-abbrev-alist
 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:,
 @itemx #+OPTIONS:, #+BIND:, #+XSLT:,
 @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:
 These lines provide settings for exporting files.  For more details see
 @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.
 @end defun
 @vindex org-use-property-inheritance
-@findex org-insert-property-drawer
 @defun org-entry-get pom property &optional inherit
 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
@@ -16040,7 +15984,7 @@ Get all property keys in the current buffer.
 @end defun
 
 @defun org-insert-property-drawer
-Insert a property drawer for the current entry.  Also
+Insert a property drawer at point.
 @end defun
 
 @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 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}
-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
 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
 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
-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.
 @item Eric Schulte and Dan Davison
 Eric and Dan are jointly responsible for the Org-babel system, which turns

+ 1 - 1
doc/orgcard.tex

@@ -17,7 +17,7 @@
 \pdflayout=(0l)
 
 % 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.
 
 % This file is part of GNU Emacs.

+ 14 - 21
doc/orgguide.texi

@@ -40,7 +40,7 @@
 @end macro
 @copying
 
-Copyright @copyright{} 2010-2012 Free Software Foundation
+Copyright @copyright{} 2010 Free Software Foundation
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -1906,7 +1906,7 @@ outline, not only the heading.
 @c
 @itemx @key{TAB}
 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
 @itemx @key{RET}
 Go to the original location of the item and delete other windows.
@@ -2409,8 +2409,8 @@ verbatim @LaTeX{} code.
 Export as DocBook file.
 @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.
 
 @node iCalendar export,  , DocBook export, Exporting
@@ -2492,10 +2492,10 @@ results in several formats.
 The structure of code blocks is as follows:
 
 @example
-#+NAME: <name>
-#+BEGIN_SRC <language> <switches> <header arguments>
+#+srcname: <name>
+#+begin_src <language> <switches> <header arguments>
   <body>
-#+END_SRC
+#+end_src
 @end example
 
 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.
 
 @example
-#+BEGIN_SRC emacs-lisp
+#+begin_src emacs-lisp
   (+ 1 2 3 4)
-#+END_SRC
+#+end_src
 
-#+RESULTS:
+#+results:
 : 10
 @end example
 
@@ -2663,17 +2663,10 @@ indentation for each level.  To get this support in a file, use
 @node MobileOrg,  , Clean view, Miscellaneous
 @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{
 @uref{http://orgmode.org/manual/Miscellaneous.html#Miscellaneous, Chapter 15

+ 1 - 1
doc/pdflayout.sty

@@ -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.
 

+ 2 - 2
doc/texinfo.tex

@@ -3,11 +3,11 @@
 % Load plain if necessary, i.e., if running under initex.
 \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,
 % 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
 % modify it under the terms of the GNU General Public License as

+ 1 - 1
lisp/ob-R.el

@@ -1,6 +1,6 @@
 ;;; 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
 ;;	Dan Davison

+ 1 - 1
lisp/ob-asymptote.el

@@ -1,6 +1,6 @@
 ;;; 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
 ;; Keywords: literate programming, reproducible research

+ 2 - 2
lisp/ob-awk.el

@@ -24,9 +24,9 @@
 ;;; Commentary:
 
 ;; Babel's awk can use special header argument:
-;;
+;; 
 ;; - :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
 ;;          of which will be passed to the awk process through STDIN
 

+ 1 - 1
lisp/ob-clojure.el

@@ -1,6 +1,6 @@
 ;;; 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
 ;;	Eric Schulte

+ 1 - 1
lisp/ob-comint.el

@@ -1,6 +1,6 @@
 ;;; 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
 ;; Keywords: literate programming, reproducible research, comint

+ 1 - 1
lisp/ob-css.el

@@ -1,6 +1,6 @@
 ;;; 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
 ;; Keywords: literate programming, reproducible research

+ 4 - 17
lisp/ob-ditaa.el

@@ -1,6 +1,6 @@
 ;;; 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
 ;; Keywords: literate programming, reproducible research
@@ -34,28 +34,15 @@
 ;; 3) we are adding the "file" and "cmdline" header arguments
 ;;
 ;; 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:
 (require 'ob)
 
-(defvar org-ditaa-jar-path) ;; provided by org-exp-blocks
-
 (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.")
 
-(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)
   "Execute a block of Ditaa code with org-babel.
 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)))
 	 (java (cdr (assoc :java params)))
 	 (in-file (org-babel-temp-file "ditaa-"))
-	 (cmd (concat "java " java " " org-ditaa-jar-option " "
+	 (cmd (concat "java " java " -jar "
 		      (shell-quote-argument
 		       (expand-file-name org-ditaa-jar-path))
 		      " " cmdline

+ 1 - 1
lisp/ob-dot.el

@@ -1,6 +1,6 @@
 ;;; 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
 ;; Keywords: literate programming, reproducible research

+ 1 - 1
lisp/ob-eval.el

@@ -1,6 +1,6 @@
 ;;; 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
 ;; Keywords: literate programming, reproducible research, comint

+ 40 - 92
lisp/ob-exp.el

@@ -1,6 +1,6 @@
 ;;; 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
 ;;	Dan Davison
@@ -43,37 +43,31 @@
 When set to nil no code will be evaluated as part of the export
 process."
   :group 'org-babel
-  :version "24.1"
   :type 'boolean)
 (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)
   (declare (indent 1))
   `(let* ((lang-headers (intern (concat "org-babel-default-header-args:" ,lang)))
 	  (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
        ;; headline and file-wide parameters are included, attempt
        ;; 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