From: Carsten Dominik Date: Fri, 25 Jul 2008 23:02:16 +0000 (+0000) Subject: 2008-07-25 Carsten Dominik X-Git-Tag: emacs-pretest-23.0.90~3874 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0627c2654bf515e6b4085a1d28052060250aefe6;p=emacs.git 2008-07-25 Carsten Dominik * 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 ca55cd320eb..c5602aea408 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -1,3 +1,20 @@ +2008-07-25 Carsten Dominik + + * 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 * 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 23cda508a9a..9a7ed8b6b98 100644 --- a/lisp/org/org-agenda.el +++ b/lisp/org/org-agenda.el @@ -6,7 +6,7 @@ ;; Author: Carsten Dominik ;; 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 0ddac74d883..3cd44dafd3e 100644 --- a/lisp/org/org-archive.el +++ b/lisp/org/org-archive.el @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik ;; 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 fb913a09f43..947b55933ce 100644 --- a/lisp/org/org-bbdb.el +++ b/lisp/org/org-bbdb.el @@ -6,7 +6,7 @@ ;; Thomas Baumann ;; 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 0fe619d5bc7..6c067f533df 100644 --- a/lisp/org/org-bibtex.el +++ b/lisp/org/org-bibtex.el @@ -5,7 +5,7 @@ ;; Author: Bastien Guerry ;; Carsten Dominik ;; 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 6caf8393f94..dcaa8a08140 100644 --- a/lisp/org/org-clock.el +++ b/lisp/org/org-clock.el @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik ;; 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 ef7bb690862..5c6d46becbf 100644 --- a/lisp/org/org-colview.el +++ b/lisp/org/org-colview.el @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik ;; 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 0ba1dcc75b3..a80f671aceb 100644 --- a/lisp/org/org-compat.el +++ b/lisp/org/org-compat.el @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik ;; 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 cf02d1808da..f24f4a14990 100644 --- a/lisp/org/org-exp.el +++ b/lisp/org/org-exp.el @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik ;; 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 "" desc ""))) + (setq rpl (concat "" desc ""))) ((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 b17bc02d0c6..a0a9e5f988d 100644 --- 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 ;; Maintainer: Bastien Guerry ;; Keywords: org, wp, tex diff --git a/lisp/org/org-faces.el b/lisp/org/org-faces.el index 2e6f9c24c98..c3e4ac60950 100644 --- a/lisp/org/org-faces.el +++ b/lisp/org/org-faces.el @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik ;; 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 9702f41a614..e1d82321388 100644 --- a/lisp/org/org-gnus.el +++ b/lisp/org/org-gnus.el @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik ;; 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 fef64915cf4..c43de2e98b9 100644 --- a/lisp/org/org-id.el +++ b/lisp/org/org-id.el @@ -4,7 +4,7 @@ ;; Author: Carsten Dominik ;; 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 e574605efea..779dbb48772 100644 --- a/lisp/org/org-info.el +++ b/lisp/org/org-info.el @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik ;; 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 13844f08a2b..30f6479545e 100644 --- a/lisp/org/org-irc.el +++ b/lisp/org/org-irc.el @@ -4,7 +4,7 @@ ;; ;; Author: Philip Jackson ;; 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 6766a9d0144..cb6bbd071c8 100644 --- a/lisp/org/org-jsinfo.el +++ b/lisp/org/org-jsinfo.el @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik ;; 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 aef009d12cd..61d5fa7165e 100644 --- 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 -;; 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 b3cdc060201..e957d3feb2b 100644 --- a/lisp/org/org-macs.el +++ b/lisp/org/org-macs.el @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik ;; 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 fe9f7413c59..65d1cc3a4a8 100644 --- a/lisp/org/org-mew.el +++ b/lisp/org/org-mew.el @@ -5,7 +5,7 @@ ;; Author: Tokuya Kameshima ;; 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 0f84d02d14a..abec4b9449e 100644 --- a/lisp/org/org-mhe.el +++ b/lisp/org/org-mhe.el @@ -5,7 +5,7 @@ ;; Author: Thomas Baumann ;; 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 a098fc4cefc..7f6827a077d 100644 --- a/lisp/org/org-mouse.el +++ b/lisp/org/org-mouse.el @@ -4,7 +4,7 @@ ;; ;; Author: Piotr Zielinski ;; Maintainer: Carsten Dominik -;; 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 f239aa2ca08..c34d97f8598 100644 --- a/lisp/org/org-publish.el +++ b/lisp/org/org-publish.el @@ -4,7 +4,7 @@ ;; Author: David O'Toole ;; Maintainer: Bastien Guerry ;; 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 2bbb20ef0e6..ebeb1120cac 100644 --- a/lisp/org/org-remember.el +++ b/lisp/org/org-remember.el @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik ;; 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 d54dfdddd30..4d30664d84a 100644 --- a/lisp/org/org-rmail.el +++ b/lisp/org/org-rmail.el @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik ;; 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 68963032ff2..2b771a6f671 100644 --- a/lisp/org/org-table.el +++ b/lisp/org/org-table.el @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik ;; 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 6f5e3aaded1..759b0de3815 100644 --- a/lisp/org/org-vm.el +++ b/lisp/org/org-vm.el @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik ;; 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 433343ca29d..e3700b1749c 100644 --- a/lisp/org/org-wl.el +++ b/lisp/org/org-wl.el @@ -5,7 +5,7 @@ ;; Author: Tokuya Kameshima ;; 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 40515683075..f5598144d6f 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik ;; 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