2009-01-26 Carsten Dominik <dominik@science.uva.nl>

	* org.el (org-yank): Tell `delete-selection-mode' about
	`org-yank'.

	* org-faces.el (org-clock-overlay): Fix face definition.

	* org-export-latex.el (org-export-latex-first-lines): Pass
	timestamp and footnote parameters to the preprocessor.

	* org-exp.el (org-export-remove-timestamps): Do not remove time
	stamps inside tables.

diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index a569d6a114452c52dfc5b7ce06a57aedc6386092..b874d8983002b61dddce5ba698315442b7f99ff4 100644 (file)
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,16 @@
+2009-01-26  Carsten Dominik  <dominik@science.uva.nl>
+
+       * org.el (org-yank): Tell `delete-selection-mode' about
+       `org-yank'.
+
+       * org-faces.el (org-clock-overlay): Fix face definition.
+
+       * org-export-latex.el (org-export-latex-first-lines): Pass
+       timestamp and footnote parameters to the preprocessor.
+
+       * org-exp.el (org-export-remove-timestamps): Do not remove time
+       stamps inside tables.
+
 2009-01-25  Carsten Dominik  <carsten.dominik@gmail.com>
 
        * org-exp.el (org-export-as-html): Turn \par into a paragraph.

diff --git a/lisp/org/org-archive.el b/lisp/org/org-archive.el
index baddac4abe7ea8805a8dbcd66c2d2d2e19d0c4e8..8c2ef988030c303fe62a6d38eaa7a16a3d505834 100644 (file)
--- a/lisp/org/org-archive.el
+++ b/lisp/org/org-archive.el
@@ -1,6 +1,7 @@
 ;;; org-archive.el --- Archiving for Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009
+;;   Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp

diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el
index 21f2dab4fee2a19d0cf4077788dda0e27e5297c7..3703b52d1cb82d5cba318b56243553d0ba6e5f4c 100644 (file)
--- a/lisp/org/org-clock.el
+++ b/lisp/org/org-clock.el
@@ -1,6 +1,7 @@
 ;;; org-clock.el --- The time clocking code for Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009
+;;   Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp

diff --git a/lisp/org/org-colview.el b/lisp/org/org-colview.el
index 8f7b56b431b25a61af0a281f3e9d27e315360190..1de46fef303926727111811e2f677de57caba990 100644 (file)
--- a/lisp/org/org-colview.el
+++ b/lisp/org/org-colview.el
@@ -1,6 +1,7 @@
 ;;; org-colview.el --- Column View in Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009
+;;   Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp

diff --git a/lisp/org/org-compat.el b/lisp/org/org-compat.el
index 0703d72301f970890fc49557d020a04bca0340ab..cc4a2fa9d6a37d8983318906e373576ef1fd4b31 100644 (file)
--- a/lisp/org/org-compat.el
+++ b/lisp/org/org-compat.el
@@ -1,6 +1,7 @@
 ;;; org-compat.el --- Compatibility code for Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009
+;;   Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp

diff --git a/lisp/org/org-exp.el b/lisp/org/org-exp.el
index 0a888746c8cfb6c3200508300fea1777b64a75a5..14abae40507979f579f3d4e3b03385c91183611d 100644 (file)
--- a/lisp/org/org-exp.el
+++ b/lisp/org/org-exp.el
@@ -1,6 +1,7 @@
 ;;; org-exp.el --- ASCII, HTML, XOXO and iCalendar export for Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009
+;;   Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -1863,10 +1864,11 @@ from the buffer."
   (while (re-search-forward org-maybe-keyword-time-regexp nil t)
     (backward-char 1)
     (org-if-unprotected
-     (replace-match "")
-     (beginning-of-line 1)
-     (if (looking-at "[- \t]*\\(=>[- \t0-9:]*\\)?[ \t]*\n")
-        (replace-match "")))))
+     (unless (save-match-data (org-at-table-p))
+       (replace-match "")
+       (beginning-of-line 1)
+       (if (looking-at "[- \t]*\\(=>[- \t0-9:]*\\)?[ \t]*\n")
+          (replace-match ""))))))
 
 (defun org-export-remove-clock-lines ()
   "Remove timestamps and keywords for export."

diff --git a/lisp/org/org-export-latex.el b/lisp/org/org-export-latex.el
index 2da0648537fe41dc1249263e17301814414ea66b..a4e627498afc2f7ad5fa5ce55543761a93f809d1 100644 (file)
--- a/lisp/org/org-export-latex.el
+++ b/lisp/org/org-export-latex.el
@@ -790,7 +790,9 @@ If BEG is non-nil, the is the beginning of he region."
            :add-text nil
            :comments nil
            :skip-before-1st-heading nil
-           :LaTeX-fragments nil))
+           :LaTeX-fragments nil
+           :timestamps (plist-get opt-plist :timestamps)
+           :footnotes (plist-get opt-plist :footnotes)))
        (add-text-properties pt (max pt (1- end))
                             '(:org-license-to-kill t))))))
 

diff --git a/lisp/org/org-faces.el b/lisp/org/org-faces.el
index e94d1dbf0fa2f6803dc5e9f6c426fbaf043feebc..eb415a4a154edfa4b7936a3194d0f0eb974c92e5 100644 (file)
--- a/lisp/org/org-faces.el
+++ b/lisp/org/org-faces.el
@@ -1,6 +1,7 @@
 ;;; org-faces.el --- Face definitions for Org-mode.
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009;
+;;   Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -408,7 +409,7 @@ changes."
        :background "SkyBlue4")
       (((class color) (min-colors 8))
        :background "cyan" :foreground "black")
-      (t :inverse-video t)))
+      (t (:inverse-video t))))
     "Basic face for displaying the secondary selection."
     :group 'org-faces)
 

diff --git a/lisp/org/org-gnus.el b/lisp/org/org-gnus.el
index b77ae9c05a7c84da52547bbfae0a6a718de050c6..3c56e7f6bc469a6a5218163855a0a802658f2816 100644 (file)
--- a/lisp/org/org-gnus.el
+++ b/lisp/org/org-gnus.el
@@ -1,6 +1,7 @@
 ;;; org-gnus.el --- Support for links to Gnus groups and messages from within Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009
+;;   Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;;         Tassilo Horn <tassilo at member dot fsf dot org>

diff --git a/lisp/org/org-info.el b/lisp/org/org-info.el
index 110e921ae5e5a94e515d0e36f6227598aeafc841..a2c8acffbd11eab7fea7c7ead905fe4a6a13b370 100644 (file)
--- a/lisp/org/org-info.el
+++ b/lisp/org/org-info.el
@@ -1,6 +1,7 @@
 ;;; org-info.el --- Support for links to Info nodes from within Org-Mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009
+;;   Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp

diff --git a/lisp/org/org-install.el b/lisp/org/org-install.el
index f14f8f9f0874f30abdc3c2c5a9d37abc3453ef09..01a1076d90aa4aa581778bafb76d0587fde76909 100644 (file)
--- a/lisp/org/org-install.el
+++ b/lisp/org/org-install.el
@@ -1,6 +1,7 @@
 ;;; org-install.el --- Outline-based notes management and organizer
 ;; Carstens outline-mode for keeping track of everything.
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009
+;;   Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp

diff --git a/lisp/org/org-jsinfo.el b/lisp/org/org-jsinfo.el
index c13629976dc0e6580a21ae11819b30f7961f699b..39462cf3266694d6deba1320cc6f5a7a8bfc8c6f 100644 (file)
--- a/lisp/org/org-jsinfo.el
+++ b/lisp/org/org-jsinfo.el
@@ -1,6 +1,7 @@
 ;;; org-jsinfo.el --- Support for org-info.js Javascript in Org HTML export
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009
+;;   Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp

diff --git a/lisp/org/org-list.el b/lisp/org/org-list.el
index 41d2e26fd7e4c46221db331f9d87c6032dff9ade..bf5bbdf234df7ae5b4f02146f87190c093f48c22 100644 (file)
--- a/lisp/org/org-list.el
+++ b/lisp/org/org-list.el
@@ -1,6 +1,7 @@
 ;;; org-list.el --- Plain lists for Org-mode
 ;;
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009
+;;   Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;;        Bastien Guerry <bzg AT altern DOT org>

diff --git a/lisp/org/org-macs.el b/lisp/org/org-macs.el
index 6772e98ecf8b61d72d66f85a94db6b72fb6b0423..2055fcf7c8b07ea82184885706c564e8105b4d0f 100644 (file)
--- a/lisp/org/org-macs.el
+++ b/lisp/org/org-macs.el
@@ -1,6 +1,7 @@
 ;;; org-macs.el --- Top-level definitions for Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009
+;;   Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp

diff --git a/lisp/org/org-mhe.el b/lisp/org/org-mhe.el
index 21a4b6afcd2ceaae9f2c3aec6bb6473d4eb943a1..ef32397ea283684adf63ee177afa79e24c0b0557 100644 (file)
--- a/lisp/org/org-mhe.el
+++ b/lisp/org/org-mhe.el
@@ -1,6 +1,7 @@
 ;;; org-mhe.el --- Support for links to MH-E messages from within Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009
+;;   Free Software Foundation, Inc.
 
 ;; Author: Thomas Baumann <thomas dot baumann at ch dot tum dot de>
 ;; Keywords: outlines, hypermedia, calendar, wp

diff --git a/lisp/org/org-mouse.el b/lisp/org/org-mouse.el
index f4dae16dd6bdd71f4ab3c13ca5eb839f092a3073..c04acb2bf309d7abe694c4e509ffd36782754aef 100644 (file)
--- a/lisp/org/org-mouse.el
+++ b/lisp/org/org-mouse.el
@@ -1,6 +1,6 @@
 ;;; org-mouse.el --- Better mouse support for org-mode
 
-;; Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation
+;; Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 ;;
 ;; Author: Piotr Zielinski <piotr dot zielinski at gmail dot com>
 ;; Maintainer: Carsten Dominik <carsten at orgmode dot org>

diff --git a/lisp/org/org-remember.el b/lisp/org/org-remember.el
index 047209f1091d2e3bb458457a98bb962d633ea97c..8114d32dea75d1af0af558c8201d10569b432b81 100644 (file)
--- a/lisp/org/org-remember.el
+++ b/lisp/org/org-remember.el
@@ -1,6 +1,7 @@
 ;;; org-remember.el --- Fast note taking in Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009
+;;   Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp

diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el
index 13f1879b1a7747819d2212af378b9d60c1ccea22..fbc7debe1b21bccebdcddab40285069c9bee3146 100644 (file)
--- a/lisp/org/org-table.el
+++ b/lisp/org/org-table.el
@@ -1,6 +1,7 @@
 ;;; org-table.el --- The table editor for Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009
+;;   Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp

diff --git a/lisp/org/org-vm.el b/lisp/org/org-vm.el
index 24af56b23217f501b6f6d0cffb976f3409b992e8..225660b7da4653bee9a22632f7b3ff5ffb21ccd5 100644 (file)
--- a/lisp/org/org-vm.el
+++ b/lisp/org/org-vm.el
@@ -1,6 +1,7 @@
 ;;; org-vm.el --- Support for links to VM messages from within Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009
+;;   Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp

diff --git a/lisp/org/org-wl.el b/lisp/org/org-wl.el
index 6e82fadced2b21f35af811c42136d46747ca4a10..0863c7a4b48d181d25c9c521087a3481300e717e 100644 (file)
--- a/lisp/org/org-wl.el
+++ b/lisp/org/org-wl.el
@@ -1,6 +1,7 @@
 ;;; org-wl.el --- Support for links to Wanderlust messages from within Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009
+;;   Free Software Foundation, Inc.
 
 ;; Author: Tokuya Kameshima <kames at fa2 dot so-net dot ne dot jp>
 ;; Keywords: outlines, hypermedia, calendar, wp

diff --git a/lisp/org/org.el b/lisp/org/org.el
index 97ba3924bd57d7dfabad41068391e2eabc9741bb..22db64a6ad69f8e3a597cccb6f15e89a1ad4d11c 100644 (file)
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -1,6 +1,7 @@
 ;;; org.el --- Outline-based notes management and organizer
 ;; Carstens outline-mode for keeping track of everything.
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009
+;;   Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -12863,6 +12864,7 @@ because, in this case the deletion might narrow the column."
 (put 'orgtbl-self-insert-command 'delete-selection t)
 (put 'org-delete-char 'delete-selection 'supersede)
 (put 'org-delete-backward-char 'delete-selection 'supersede)
+(put 'org-yank 'delete-selection 'yank)
 
 ;; Make `flyspell-mode' delay after some commands
 (put 'org-self-insert-command 'flyspell-delayed t)