Merge branch 'changes'

ORGWEBPAGE/Changes.org

@@ -6,9 +6,55 @@
 
 #+STARTUP: indent hidestars
 
-* Version 6.30
+* Version 6.31 (in preparation)
  :PROPERTIES:
  :VISIBILITY: content
+ :CUSTOM_ID: v6.31
+ :END:
+
+** New hook `org-export-latex-final-hook'.
+
+** Indented lines starting with "#+ " are treated as comments
+** New STARTUP keyword `showeverything'
+    
+This will make even drawer contents visible upon startup.
+Requested by Jeff Kowalczyk.
+
+** MobileOrg support
+
+Richard Morelands iPhone/iPod Touch program [[http://mobileorg.ncogni.to/][MobileOrg]] can view
+Org files, mark entries as DONE, flag entries for later
+attention, and capture new entries on the road.  Org-mode has now
+support to produce a staging area where MobileOrg can download
+its files, and to integrate changes done on the phone in a half
+automatic, half interactive way.  See the new appendix B in the
+manual for more information.
+
+** New contributed package org-invoice.el
+
+This package collects clocking information for billing
+customers.
+
+Thanks to Peter Jones for this contribution.
+
+** Encrypting subtrees
+
+/org-crypt.el/ by John Wiegley and Peter Jones allows encryption
+of individual subtrees in Org-mode outlines.  Thanks to John and
+Peter for this contribution.
+
+** Agenda: Support for including a link in the category string
+    
+The category (as specified by an #+CATEGORY line or CATEGORY
+property can contain a bracket link.  While this sort-of worked
+in the past, it now is officially supported and should cause no
+problems in agenda display or update.  The link can be followed
+by clicking on it, or with =C-c C-o 0=.
+
+This was a request by Peter Westlake.
+
+* Version 6.30
+ :PROPERTIES:
  :CUSTOM_ID: v6.30
  :END:
 

lisp/org-ascii.el

@@ -58,6 +58,11 @@ in this way, it will be wrapped."
   :group 'org-export-ascii
   :type 'boolean)
 
+;;; Hooks
+
+(defvar org-export-ascii-final-hook nil
+  "Hook run at the end of ASCII export, in the new buffer.")
+
 ;;; ASCII export
 
 (defvar org-ascii-current-indentation nil) ; For communication
@@ -457,6 +462,7 @@ publishing directory."
 	(setq end (next-single-property-change beg 'org-cwidth))
 	(delete-region beg end)
 	(goto-char beg)))
+    (run-hooks 'org-export-ascii-final-hook)
     (or to-buffer (save-buffer))
     (goto-char (point-min))
     (or (org-export-push-to-kill-ring "ASCII")

lisp/org-docbook.el

@@ -242,6 +242,11 @@ the variable to
   :group 'org-export-docbook
   :type 'string)
 
+;;; Hooks
+
+(defvar org-export-docbook-final-hook nil
+  "Hook run at the end of DocBook export, in the new buffer.")
+
 ;;; Autoload functions:
 
 ;;;###autoload
@@ -1123,6 +1128,7 @@ publishing directory."
       (goto-char (point-max))
       (unless body-only
 	(insert "</article>"))
+      (run-hooks 'org-export-docbook-final-hook)
       (or to-buffer (save-buffer))
       (goto-char (point-min))
       (or (org-export-push-to-kill-ring "DocBook")

lisp/org-html.el

@@ -419,6 +419,9 @@ This may also be a function, building and inserting the postamble.")
 (defvar org-export-html-after-blockquotes-hook nil
   "Hook run during HTML export, after blockquote, verse, center are done.")
 
+(defvar org-export-html-final-hook nil
+  "Hook run during HTML export, after blockquote, verse, center are done.")
+
 ;;; HTML export
 
 (defun org-export-html-preprocess (parameters)
@@ -1461,6 +1464,7 @@ lang=\"%s\" xml:lang=\"%s\">
 	  (delete-region beg end)
 	  (insert (format "<span style=\"visibility:hidden;\">%s</span>"
 			  (make-string n ?x)))))
+      (run-hooks 'org-export-html-final-hook)
       (or to-buffer (save-buffer))
       (goto-char (point-min))
       (or (org-export-push-to-kill-ring "HTML")

lisp/org-xoxo.el

@@ -30,6 +30,9 @@
 
 ;;; XOXO export
 
+(defvar org-export-xoxo-final-hook nil
+  "Hook run after XOXO export, in the new buffer.")
+
 (defun org-export-as-xoxo-insert-into (buffer &rest output)
   (with-current-buffer buffer
     (apply 'insert output)))
@@ -112,6 +115,7 @@ The XOXO buffer is named *xoxo-<source buffer name>*"
       ;; Finish the buffer off and clean it up.
       (switch-to-buffer-other-window out)
       (indent-region (point-min) (point-max) nil)
+      (run-hooks 'org-export-xoxo-final-hook)
       (save-buffer)
       (goto-char (point-min))
       )))