From f083b1cce35adcd4dff9db99b033056401a203ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Delafond?= <sdelafond@gmail.com>
Date: Fri, 27 Nov 2015 17:44:41 +0100
Subject: Revert some files from upstream

---
 lisp/org-agenda.el |  1 -
 lisp/org-timer.el  | 32 --------------------------------
 lisp/org.el        | 14 +-------------
 3 files changed, 1 insertion(+), 46 deletions(-)

diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 43f6148..0725d9e 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -8630,7 +8630,6 @@ displayed Org file fills the frame."
       (when delete-other-windows (delete-other-windows))
       (widen)
       (goto-char pos)
-      (org-back-to-heading t)
       (when (derived-mode-p 'org-mode)
 	(org-show-context 'agenda)
 	(run-hooks 'org-agenda-after-show-hook)))))
diff --git a/lisp/org-timer.el b/lisp/org-timer.el
index b9fc4c0..0758ed2 100644
--- a/lisp/org-timer.el
+++ b/lisp/org-timer.el
@@ -498,38 +498,6 @@ time is up."
 	(buffer-name (buffer-base-buffer))))
    (t (error "Not in an Org buffer"))))
 
-(defun org-timer--run-countdown-timer (secs title)
-  "Start countdown timer that will last SECS.
-TITLE will be appended to the notification message displayed when
-time is up."
-  (let ((msg (format "%s: time out" title)))
-    (run-with-timer
-     secs nil `(lambda ()
-		 (setq org-timer-countdown-timer nil
-		       org-timer-start-time nil)
-		 (org-notify ,msg ,org-clock-sound)
-		 (org-timer-set-mode-line 'off)
-		 (run-hooks 'org-timer-done-hook)))))
-
-(defun org-timer--get-timer-title ()
-  "Construct timer title from heading or file name of Org buffer."
-  (cond
-   ((derived-mode-p 'org-agenda-mode)
-    (let* ((marker (or (get-text-property (point) 'org-marker)
-		       (org-agenda-error)))
-	   (hdmarker (or (get-text-property (point) 'org-hd-marker)
-			 marker)))
-      (with-current-buffer (marker-buffer marker)
-	(org-with-wide-buffer
-	 (goto-char hdmarker)
-	 (org-show-entry)
-	 (or (ignore-errors (org-get-heading))
-	     (buffer-name (buffer-base-buffer)))))))
-   ((derived-mode-p 'org-mode)
-    (or (ignore-errors (org-get-heading))
-	(buffer-name (buffer-base-buffer))))
-   (t (error "Not in an Org buffer"))))
-
 (provide 'org-timer)
 
 ;; Local variables:
diff --git a/lisp/org.el b/lisp/org.el
index 11f1338..ea6c955 100755
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -6380,7 +6380,6 @@ needs to be inserted at a specific position in the font-lock sequence.")
 			     ":\\).*$")
 		     '(1 'org-tag-group prepend)))
 	   ;; Special keywords
-	   (list (concat "\\<" org-comment-string) '(0 'org-special-keyword t))
 	   (list (concat "\\<" org-deadline-string) '(0 'org-special-keyword t))
 	   (list (concat "\\<" org-scheduled-string) '(0 'org-special-keyword t))
 	   (list (concat "\\<" org-closed-string) '(0 'org-special-keyword t))
@@ -23847,20 +23846,9 @@ it has a `diary' type."
 		    (org-timestamp-format timestamp fmt t))
 	  (org-timestamp-format timestamp fmt (eq boundary 'end)))))))
 
-Return timestamp as-is if `org-display-custom-times' is nil or if
-it has a `diary' type."
-  (let ((type (org-element-property :type timestamp)))
-    (if (or (not org-display-custom-times) (eq type 'diary))
-	(org-element-interpret-data timestamp)
-      (let ((fmt (funcall (if (org-timestamp-has-time-p timestamp) #'cdr #'car)
-			  org-time-stamp-custom-formats)))
-	(if (and (not boundary) (memq type '(active-range inactive-range)))
-	    (concat (org-timestamp-format timestamp fmt)
-		    "--"
-		    (org-timestamp-format timestamp fmt t))
-	  (org-timestamp-format timestamp fmt (eq boundary 'end)))))))
 
 
+;;; Other stuff.
 
 (defvar reftex-docstruct-symbol)
 (defvar reftex-cite-format)
-- 
cgit v1.2.3