2008-07-25 Carsten Dominik <dominik@science.uva.nl>

	* org-publish.el (org-publish-file): Use the true name of the
	file.

	* org-jsinfo.el (org-infojs-handle-options): Use :style-extra
	instead of :style.

	* org-exp.el (org-export-plist-vars)
	(org-export-add-options-to-plist): Handle creator setting flag.
	(org-export-as-html): Handle attributes also for ftp and mailto
	links.

	* org-agenda.el (org-agenda-diary-entry)
	(org-agenda-execute-calendar-command): Cater for the second
	argument of `calendar-cursor-to-date'.

diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index ca55cd320ebe6532c670e887e6b2cde5d4e90115..c5602aea4080467a6bb74057d79a4cdc2d376382 100644 (file)
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,20 @@
+2008-07-25  Carsten Dominik  <dominik@science.uva.nl>
+
+       * org-publish.el (org-publish-file): Use the true name of the
+       file.
+
+       * org-jsinfo.el (org-infojs-handle-options): Use :style-extra
+       instead of :style.
+
+       * org-exp.el (org-export-plist-vars)
+       (org-export-add-options-to-plist): Handle creator setting flag.
+       (org-export-as-html): Handle attributes also for ftp and mailto
+       links.
+
+       * org-agenda.el (org-agenda-diary-entry)
+       (org-agenda-execute-calendar-command): Cater for the second
+       argument of `calendar-cursor-to-date'.
+
 2008-07-24  Carsten Dominik  <dominik@science.uva.nl>
 
        * org-exp.el (org-export-region-as-html, org-export-as-html): Make

diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index 23cda508a9a0a6d0a764e5cf99813a0769e05f85..9a7ed8b6b98ceef2a3825b7aefe257bbcdcec668 100644 (file)
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -6,7 +6,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.06a
+;; Version: 6.06b
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -5120,13 +5120,12 @@ All the standard commands work: block, weekly etc."
       (unwind-protect
          (progn
            (fset 'calendar-cursor-to-date
-                 (lambda (&optional error)
+                 (lambda (&optional error dummy)
                    (calendar-gregorian-from-absolute
                     (get-text-property point 'day))))
              (call-interactively cmd))
        (fset 'calendar-cursor-to-date oldf)))))
 
-
 (defun org-agenda-execute-calendar-command (cmd)
   "Execute a calendar command from the agenda, with the date associated to
 the cursor position."
@@ -5144,7 +5143,7 @@ the cursor position."
       (unwind-protect
          (progn
            (fset 'calendar-cursor-to-date
-                 (lambda (&optional error)
+                 (lambda (&optional error dummy)
                    (calendar-gregorian-from-absolute
                     (get-text-property point 'day))))
            (call-interactively cmd))

diff --git a/lisp/org/org-archive.el b/lisp/org/org-archive.el
index 0ddac74d8839ae827eef5a90be18f5ef69bd7390..3cd44dafd3ec330c56ce31433c49d9c0f79cde85 100644 (file)
--- a/lisp/org/org-archive.el
+++ b/lisp/org/org-archive.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.06a
+;; Version: 6.06b
 ;;
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/org-bbdb.el b/lisp/org/org-bbdb.el
index fb913a09f439f61666b041cb416d8cdc75363c15..947b55933ced576ebe6436a2744d487b5b357094 100644 (file)
--- a/lisp/org/org-bbdb.el
+++ b/lisp/org/org-bbdb.el
@@ -6,7 +6,7 @@
 ;;         Thomas Baumann <thomas dot baumann at ch dot tum dot de>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.06a
+;; Version: 6.06b
 ;;
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/org-bibtex.el b/lisp/org/org-bibtex.el
index 0fe619d5bc7331f866c17d67371955994fbc612b..6c067f533df70bba288b8906b261cbaef1ee6c7a 100644 (file)
--- a/lisp/org/org-bibtex.el
+++ b/lisp/org/org-bibtex.el
@@ -5,7 +5,7 @@
 ;; Author: Bastien Guerry <bzg at altern dot org>
 ;;         Carsten Dominik <carsten dot dominik at gmail dot com>
 ;; Keywords: org, wp, remember
-;; Version: 6.06a
+;; Version: 6.06b
 ;;
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el
index 6caf8393f94b6aabdd603616072ea688e20cdba0..dcaa8a0814021d6ce50fe3a7a3772e503a05dbdd 100644 (file)
--- a/lisp/org/org-clock.el
+++ b/lisp/org/org-clock.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.06a
+;; Version: 6.06b
 ;;
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/org-colview.el b/lisp/org/org-colview.el
index ef7bb6908621f120d18c2d663441a8fff8a947c3..5c6d46becbfdcf7a4bd680775323bb844b310587 100644 (file)
--- a/lisp/org/org-colview.el
+++ b/lisp/org/org-colview.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.06a
+;; Version: 6.06b
 ;;
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/org-compat.el b/lisp/org/org-compat.el
index 0ba1dcc75b34ad33dc70166d61457532a5900405..a80f671aceb79a070204a0917b7c1cbf4278734a 100644 (file)
--- a/lisp/org/org-compat.el
+++ b/lisp/org/org-compat.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.06a
+;; Version: 6.06b
 ;;
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/org-exp.el b/lisp/org/org-exp.el
index cf02d1808daabaa81f6c4d90acab8645bc7b1805..f24f4a14990a5dc87d6dae56ab067946becdb057 100644 (file)
--- a/lisp/org/org-exp.el
+++ b/lisp/org/org-exp.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.06a
+;; Version: 6.06b
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -883,6 +883,7 @@ modified) list.")
                  ("LaTeX" . :LaTeX-fragments)
                  ("skip"  . :skip-before-1st-heading)
                  ("author" . :author-info)
+                 ("creator" . :creator-info)
                  ("timestamp" . :time-stamp-file)))
            o)
        (while (setq o (pop op))
@@ -3072,7 +3073,7 @@ lang=\"%s\" xml:lang=\"%s\">
             ((member type '("ftp" "mailto" "news"))
              ;; standard URL
              (setq link (concat type ":" path))
-             (setq rpl (concat "<a href=\"" link "\">" desc "</a>")))
+             (setq rpl (concat "<a href=\"" link "\"" attr ">" desc "</a>")))
 
             ((functionp (setq fnc (nth 2 (assoc type org-link-protocols))))
              ;; The link protocol has a function for format the link

diff --git a/lisp/org/org-export-latex.el b/lisp/org/org-export-latex.el
index b17bc02d0c6a15af837ccbd6f83720dac151cde9..a0a9e5f988d40843f1153ce0964056e003f9157a 100644 (file)
--- a/lisp/org/org-export-latex.el
+++ b/lisp/org/org-export-latex.el
@@ -4,7 +4,7 @@
 ;;
 ;; Emacs Lisp Archive Entry
 ;; Filename: org-export-latex.el
-;; Version: 6.06a
+;; Version: 6.06b
 ;; Author: Bastien Guerry <bzg AT altern DOT org>
 ;; Maintainer: Bastien Guerry <bzg AT altern DOT org>
 ;; Keywords: org, wp, tex

diff --git a/lisp/org/org-faces.el b/lisp/org/org-faces.el
index 2e6f9c24c982df656f6381278c9268bacfd0a778..c3e4ac60950a80f0d2ffb8c85a7e8b617b9530aa 100644 (file)
--- a/lisp/org/org-faces.el
+++ b/lisp/org/org-faces.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.06a
+;; Version: 6.06b
 ;;
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/org-gnus.el b/lisp/org/org-gnus.el
index 9702f41a614bd6784ec17b88deac01207ede9478..e1d82321388f9e5f458ccf7aa93e8f161b58b6f5 100644 (file)
--- a/lisp/org/org-gnus.el
+++ b/lisp/org/org-gnus.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.06a
+;; Version: 6.06b
 ;;
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/org-id.el b/lisp/org/org-id.el
index fef64915cf40a823a8ace9a67dcc8a15cbc251a9..c43de2e98b92718fa415ea1f4baab5bff7963aac 100644 (file)
--- a/lisp/org/org-id.el
+++ b/lisp/org/org-id.el
@@ -4,7 +4,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.06a
+;; Version: 6.06b
 ;;
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/org-info.el b/lisp/org/org-info.el
index e574605efeaeca7c2d9c2fa00b169ff4a7850d8f..779dbb48772c86af18f66e8f30463ad13448bfe3 100644 (file)
--- a/lisp/org/org-info.el
+++ b/lisp/org/org-info.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.06a
+;; Version: 6.06b
 ;;
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/org-irc.el b/lisp/org/org-irc.el
index 13844f08a2ba92ab0c1844094381cdb1267fe17c..30f6479545eb6280b74d23dbdf803fcc28c3ed27 100644 (file)
--- a/lisp/org/org-irc.el
+++ b/lisp/org/org-irc.el
@@ -4,7 +4,7 @@
 ;;
 ;; Author: Philip Jackson <emacs@shellarchive.co.uk>
 ;; Keywords: erc, irc, link, org
-;; Version: 6.06a
+;; Version: 6.06b
 ;;
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/org-jsinfo.el b/lisp/org/org-jsinfo.el
index 6766a9d0144a1d9fbfc592f7b12d46d2f14318bb..cb6bbd071c8bc8ee924c92fe35d423f932f1c51a 100644 (file)
--- a/lisp/org/org-jsinfo.el
+++ b/lisp/org/org-jsinfo.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.06a
+;; Version: 6.06b
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -180,8 +180,8 @@ Option settings will replace the %MANAGER-OPTIONS cookie."
           (setq s (replace-match s t t template))
           (setq exp-plist
                 (plist-put
-                 exp-plist :style
-                 (concat (or (plist-get exp-plist :style) "") "\n" s)))))
+                 exp-plist :style-extra
+                 (concat (or (plist-get exp-plist :style-extra) "") "\n" s)))))
     ;; This script absolutely needs the table of contents, to we change that
     ;; setting
     (if (not (plist-get exp-plist :table-of-contents))

diff --git a/lisp/org/org-mac-message.el b/lisp/org/org-mac-message.el
index aef009d12cd4598f4e9f959c52d950b38cca667c..61d5fa7165e5b507ee1f860d38c165dce847e7e4 100644 (file)
--- a/lisp/org/org-mac-message.el
+++ b/lisp/org/org-mac-message.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2008 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
-;; Version: 6.06a
+;; Version: 6.06b
 ;; Keywords: outlines, hypermedia, calendar, wp
 
 ;; This file is part of GNU Emacs.

diff --git a/lisp/org/org-macs.el b/lisp/org/org-macs.el
index b3cdc0602015ea11cdaa372063259c1a2e5fe19c..e957d3feb2b48c63c99cb13d233a7c5d6903dc46 100644 (file)
--- a/lisp/org/org-macs.el
+++ b/lisp/org/org-macs.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.06a
+;; Version: 6.06b
 ;;
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/org-mew.el b/lisp/org/org-mew.el
index fe9f7413c590d56516e9b83abfd39085c3cd37bb..65d1cc3a4a802207b048e1c6d1deaed85d55ac95 100644 (file)
--- a/lisp/org/org-mew.el
+++ b/lisp/org/org-mew.el
@@ -5,7 +5,7 @@
 ;; Author: Tokuya Kameshima <kames at fa2 dot so-net dot ne dot jp>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.06a
+;; Version: 6.06b
 
 ;; This file is part of GNU Emacs.
 

diff --git a/lisp/org/org-mhe.el b/lisp/org/org-mhe.el
index 0f84d02d14a17225fd69e22d1586221f3aedbcc7..abec4b9449e51d470e91c147c549de7d18c5a697 100644 (file)
--- a/lisp/org/org-mhe.el
+++ b/lisp/org/org-mhe.el
@@ -5,7 +5,7 @@
 ;; Author: Thomas Baumann <thomas dot baumann at ch dot tum dot de>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.06a
+;; Version: 6.06b
 ;;
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/org-mouse.el b/lisp/org/org-mouse.el
index a098fc4cefce615d3718fedd772c731dfac4515c..7f6827a077d0567140406edac7a13a7a61f0fda2 100644 (file)
--- a/lisp/org/org-mouse.el
+++ b/lisp/org/org-mouse.el
@@ -4,7 +4,7 @@
 ;;
 ;; Author: Piotr Zielinski <piotr dot zielinski at gmail dot com>
 ;; Maintainer: Carsten Dominik <carsten at orgmode dot org>
-;; Version: 6.06a
+;; Version: 6.06b
 ;;
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/org-publish.el b/lisp/org/org-publish.el
index f239aa2ca08cc0741cea59ffa5b0281635a22c3f..c34d97f85982f0dd77abd8dfb8360f33715ed55b 100644 (file)
--- a/lisp/org/org-publish.el
+++ b/lisp/org/org-publish.el
@@ -4,7 +4,7 @@
 ;; Author: David O'Toole <dto@gnu.org>
 ;; Maintainer: Bastien Guerry <bzg AT altern DOT org>
 ;; Keywords: hypermedia, outlines, wp
-;; Version: 6.06a
+;; Version: 6.06b
 
 ;; This file is part of GNU Emacs.
 ;;
@@ -554,6 +554,7 @@ See `org-publish-org-to' to the list of arguments."
                                          (abbreviate-file-name filename))))
                      (error "Can't publish file outside of a project")))))
           (project-plist (cdr project))
+          (ftname (file-truename filename))
           (publishing-function
            (or (plist-get project-plist :publishing-function)
                'org-publish-org-to-html))
@@ -565,8 +566,8 @@ See `org-publish-org-to' to the list of arguments."
       (setq tmp-pub-dir
            (file-name-directory
             (concat pub-dir
-                    (and (string-match (regexp-quote base-dir) filename)
-                         (substring filename (match-end 0))))))
+                    (and (string-match (regexp-quote base-dir) ftname)
+                         (substring ftname (match-end 0))))))
       (if (listp publishing-function)
          ;; allow chain of publishing functions
          (mapc (lambda (f)

diff --git a/lisp/org/org-remember.el b/lisp/org/org-remember.el
index 2bbb20ef0e61add216f15948be6fdec3c84366a2..ebeb1120cacb8bf6a3ef19589b0e54cfee945fa9 100644 (file)
--- a/lisp/org/org-remember.el
+++ b/lisp/org/org-remember.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.06a
+;; Version: 6.06b
 ;;
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/org-rmail.el b/lisp/org/org-rmail.el
index d54dfdddd30688b41a17c5ed444d178309a7896b..4d30664d84afd20bbda53b37db834e41ece069d9 100644 (file)
--- a/lisp/org/org-rmail.el
+++ b/lisp/org/org-rmail.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.06a
+;; Version: 6.06b
 ;;
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el
index 68963032ff246b8380111133d2ae83d17ebb9eec..2b771a6f6710babaf438e22a772f7eb2dc474504 100644 (file)
--- a/lisp/org/org-table.el
+++ b/lisp/org/org-table.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.06a
+;; Version: 6.06b
 ;;
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/org-vm.el b/lisp/org/org-vm.el
index 6f5e3aaded1d863f7011f6311879b324505ea9c6..759b0de3815fa13c162f2a9cd40efa0c6b5b49ea 100644 (file)
--- a/lisp/org/org-vm.el
+++ b/lisp/org/org-vm.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.06a
+;; Version: 6.06b
 ;;
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/org-wl.el b/lisp/org/org-wl.el
index 433343ca29dba836f1a4238821fda4e808f17cd9..e3700b1749c40a20f5c74002c6a7f0205bd0326d 100644 (file)
--- a/lisp/org/org-wl.el
+++ b/lisp/org/org-wl.el
@@ -5,7 +5,7 @@
 ;; Author: Tokuya Kameshima <kames at fa2 dot so-net dot ne dot jp>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.06a
+;; Version: 6.06b
 ;;
 ;; This file is part of GNU Emacs.
 ;;

diff --git a/lisp/org/org.el b/lisp/org/org.el
index 40515683075d8ff16f64fa909d278ef02122d039..f5598144d6f0bf712c4cc375cdc1e9e584ace507 100644 (file)
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.06a
+;; Version: 6.06b
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -91,7 +91,7 @@
 
 ;;; Version
 
-(defconst org-version "6.06a"
+(defconst org-version "6.06b"
   "The version number of the file org.el.")
 
 (defun org-version (&optional here)
@@ -2650,7 +2650,7 @@ collapsed state."
 (org-autoload (if (featurep 'xemacs) "org-colview-xemacs" "org-colview")
  '(org-columns-number-to-string org-columns-get-format-and-top-level
    org-columns-compute org-agenda-columns org-columns-remove-overlays
-   org-columns org-insert-columns-dblock))
+   org-columns org-insert-columns-dblock org-dblock-write:columnview))
 
 ;; Autoload ID code
 
@@ -5513,7 +5513,8 @@ the language, a switch telling of the content should be in a single line."
     (when font-lock-mode
       (font-lock-unfontify-region (point-min) (point-max)))
     (put-text-property (point-min) (point-max) 'font-lock-fontified t))
-  (kill-buffer (current-buffer)))
+  (kill-buffer (current-buffer))
+  (and (org-mode-p) (org-restart-font-lock)))
 
 ;;;; Plain list items, including checkboxes