Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode

3 files changed, 11 insertions, 8 deletions

diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 3328609..aecea4e 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -35,6 +35,7 @@
   (require 'cl))
 
 (declare-function calendar-absolute-from-iso    "cal-iso"    (&optional date))
+(declare-function notifications-notify "notifications" ())
 (defvar org-time-stamp-formats)
 
 (defgroup org-clock nil
@@ -558,6 +559,7 @@ use libnotify if available, or fall back on a message."
 	 (start-process "emacs-timer-notification" nil
 			org-show-notification-handler notification))
 	((featurep 'notifications)
+	 (require 'notifications)
 	 (notifications-notify
 	  :title "Org-mode message"
 	  :body notification
diff --git a/lisp/org-icalendar.el b/lisp/org-icalendar.el
index 5faea0e..c374e2e 100644
--- a/lisp/org-icalendar.el
+++ b/lisp/org-icalendar.el
@@ -311,9 +311,7 @@ When COMBINE is non nil, add the category to each line."
 		inc t
 		hd (condition-case nil
 		       (org-icalendar-cleanup-string
-			(replace-regexp-in-string 
-			 ":[[:alnum:]_@#%:]+:[ \t]*$" ""
-			 (org-get-heading)))
+			(org-get-heading t))
 		     (error (throw :skip nil)))
 		summary (org-icalendar-cleanup-string
 			 (org-entry-get nil "SUMMARY"))
@@ -441,7 +439,7 @@ END:VEVENT\n"
       (when org-icalendar-include-todo
 	(setq prefix "TODO-")
 	(goto-char (point-min))
-	(while (re-search-forward org-todo-line-regexp nil t)
+	(while (re-search-forward org-complex-heading-regexp nil t)
 	  (catch :skip
 	    (org-agenda-skip)
 	    (when org-icalendar-verify-function
@@ -473,7 +471,7 @@ END:VEVENT\n"
 			((eq org-icalendar-include-todo t)
 			 ;; include everything that is not done
 			 (member state org-not-done-keywords))))
-	      (setq hd (match-string 3)
+	      (setq hd (match-string 4)
 		    summary (org-icalendar-cleanup-string
 			     (org-entry-get nil "SUMMARY"))
 		    desc (org-icalendar-cleanup-string
diff --git a/lisp/org.el b/lisp/org.el
index 26acc69..09281cc 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -16385,6 +16385,7 @@ BEG and END default to the buffer boundaries."
 (org-defkey org-mode-map "\C-c\C-x."    'org-timer)
 (org-defkey org-mode-map "\C-c\C-x-"    'org-timer-item)
 (org-defkey org-mode-map "\C-c\C-x0"    'org-timer-start)
+(org-defkey org-mode-map "\C-c\C-x_"    'org-timer-stop)
 (org-defkey org-mode-map "\C-c\C-x,"    'org-timer-pause-or-continue)
 
 (define-key org-mode-map "\C-c\C-x\C-c" 'org-columns)
@@ -16573,9 +16574,11 @@ because, in this case the deletion might narrow the column."
 	    (noalign (looking-at "[^|\n\r]*  |"))
 	    (c org-table-may-need-update))
 	(backward-delete-char N)
-	(skip-chars-forward "^|")
-	(insert " ")
-	(goto-char (1- pos))
+	(if (not overwrite-mode)
+	    (progn
+	      (skip-chars-forward "^|")
+	      (insert " ")
+	      (goto-char (1- pos))))
 	;; noalign: if there were two spaces at the end, this field
 	;; does not determine the width of the column.
 	(if noalign (setq org-table-may-need-update c)))