# HG changeset patch
# User Carsten Dominik <dominik@science.uva.nl>
# Date 1232955882 0
# Node ID 64ef70f990a9d470274aff7b3b05e835dc045b3d
# Parent  c63d75135537596787ebea9a2fbf311dda15b7de
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 -r c63d75135537 -r 64ef70f990a9 lisp/org/ChangeLog
--- a/lisp/org/ChangeLog	Mon Jan 26 07:31:35 2009 +0000
+++ b/lisp/org/ChangeLog	Mon Jan 26 07:44:42 2009 +0000
@@ -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 -r c63d75135537 -r 64ef70f990a9 lisp/org/org-archive.el
--- a/lisp/org/org-archive.el	Mon Jan 26 07:31:35 2009 +0000
+++ b/lisp/org/org-archive.el	Mon Jan 26 07:44:42 2009 +0000
@@ -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 -r c63d75135537 -r 64ef70f990a9 lisp/org/org-clock.el
--- a/lisp/org/org-clock.el	Mon Jan 26 07:31:35 2009 +0000
+++ b/lisp/org/org-clock.el	Mon Jan 26 07:44:42 2009 +0000
@@ -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 -r c63d75135537 -r 64ef70f990a9 lisp/org/org-colview.el
--- a/lisp/org/org-colview.el	Mon Jan 26 07:31:35 2009 +0000
+++ b/lisp/org/org-colview.el	Mon Jan 26 07:44:42 2009 +0000
@@ -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 -r c63d75135537 -r 64ef70f990a9 lisp/org/org-compat.el
--- a/lisp/org/org-compat.el	Mon Jan 26 07:31:35 2009 +0000
+++ b/lisp/org/org-compat.el	Mon Jan 26 07:44:42 2009 +0000
@@ -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 -r c63d75135537 -r 64ef70f990a9 lisp/org/org-exp.el
--- a/lisp/org/org-exp.el	Mon Jan 26 07:31:35 2009 +0000
+++ b/lisp/org/org-exp.el	Mon Jan 26 07:44:42 2009 +0000
@@ -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 @@
   (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 -r c63d75135537 -r 64ef70f990a9 lisp/org/org-export-latex.el
--- a/lisp/org/org-export-latex.el	Mon Jan 26 07:31:35 2009 +0000
+++ b/lisp/org/org-export-latex.el	Mon Jan 26 07:44:42 2009 +0000
@@ -790,7 +790,9 @@
 	    :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 -r c63d75135537 -r 64ef70f990a9 lisp/org/org-faces.el
--- a/lisp/org/org-faces.el	Mon Jan 26 07:31:35 2009 +0000
+++ b/lisp/org/org-faces.el	Mon Jan 26 07:44:42 2009 +0000
@@ -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 @@
        :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 -r c63d75135537 -r 64ef70f990a9 lisp/org/org-gnus.el
--- a/lisp/org/org-gnus.el	Mon Jan 26 07:31:35 2009 +0000
+++ b/lisp/org/org-gnus.el	Mon Jan 26 07:44:42 2009 +0000
@@ -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 -r c63d75135537 -r 64ef70f990a9 lisp/org/org-info.el
--- a/lisp/org/org-info.el	Mon Jan 26 07:31:35 2009 +0000
+++ b/lisp/org/org-info.el	Mon Jan 26 07:44:42 2009 +0000
@@ -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 -r c63d75135537 -r 64ef70f990a9 lisp/org/org-install.el
--- a/lisp/org/org-install.el	Mon Jan 26 07:31:35 2009 +0000
+++ b/lisp/org/org-install.el	Mon Jan 26 07:44:42 2009 +0000
@@ -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 -r c63d75135537 -r 64ef70f990a9 lisp/org/org-jsinfo.el
--- a/lisp/org/org-jsinfo.el	Mon Jan 26 07:31:35 2009 +0000
+++ b/lisp/org/org-jsinfo.el	Mon Jan 26 07:44:42 2009 +0000
@@ -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 -r c63d75135537 -r 64ef70f990a9 lisp/org/org-list.el
--- a/lisp/org/org-list.el	Mon Jan 26 07:31:35 2009 +0000
+++ b/lisp/org/org-list.el	Mon Jan 26 07:44:42 2009 +0000
@@ -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 -r c63d75135537 -r 64ef70f990a9 lisp/org/org-macs.el
--- a/lisp/org/org-macs.el	Mon Jan 26 07:31:35 2009 +0000
+++ b/lisp/org/org-macs.el	Mon Jan 26 07:44:42 2009 +0000
@@ -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 -r c63d75135537 -r 64ef70f990a9 lisp/org/org-mhe.el
--- a/lisp/org/org-mhe.el	Mon Jan 26 07:31:35 2009 +0000
+++ b/lisp/org/org-mhe.el	Mon Jan 26 07:44:42 2009 +0000
@@ -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 -r c63d75135537 -r 64ef70f990a9 lisp/org/org-mouse.el
--- a/lisp/org/org-mouse.el	Mon Jan 26 07:31:35 2009 +0000
+++ b/lisp/org/org-mouse.el	Mon Jan 26 07:44:42 2009 +0000
@@ -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 -r c63d75135537 -r 64ef70f990a9 lisp/org/org-remember.el
--- a/lisp/org/org-remember.el	Mon Jan 26 07:31:35 2009 +0000
+++ b/lisp/org/org-remember.el	Mon Jan 26 07:44:42 2009 +0000
@@ -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 -r c63d75135537 -r 64ef70f990a9 lisp/org/org-table.el
--- a/lisp/org/org-table.el	Mon Jan 26 07:31:35 2009 +0000
+++ b/lisp/org/org-table.el	Mon Jan 26 07:44:42 2009 +0000
@@ -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 -r c63d75135537 -r 64ef70f990a9 lisp/org/org-vm.el
--- a/lisp/org/org-vm.el	Mon Jan 26 07:31:35 2009 +0000
+++ b/lisp/org/org-vm.el	Mon Jan 26 07:44:42 2009 +0000
@@ -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 -r c63d75135537 -r 64ef70f990a9 lisp/org/org-wl.el
--- a/lisp/org/org-wl.el	Mon Jan 26 07:31:35 2009 +0000
+++ b/lisp/org/org-wl.el	Mon Jan 26 07:44:42 2009 +0000
@@ -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 -r c63d75135537 -r 64ef70f990a9 lisp/org/org.el
--- a/lisp/org/org.el	Mon Jan 26 07:31:35 2009 +0000
+++ b/lisp/org/org.el	Mon Jan 26 07:44:42 2009 +0000
@@ -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 @@
 (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)