From dbe5c6031a0c82742b30d97021b8bded2514bdd5 Mon Sep 17 00:00:00 2001 From: David Maus Date: Sun, 5 Sep 2010 21:13:03 +0200 Subject: [PATCH 1/5] Revert "org-icalendar.el: exclude tags from the summary of the ical entry." This reverts commit 373224ecdbd32a6e7ed523e28b581f637a7b1621. --- lisp/org-icalendar.el | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lisp/org-icalendar.el b/lisp/org-icalendar.el index 5faea0eb3..4f307c487 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)) (error (throw :skip nil))) summary (org-icalendar-cleanup-string (org-entry-get nil "SUMMARY")) From 108f2f28579f46b1535252f94faac456a4d5b757 Mon Sep 17 00:00:00 2001 From: David Maus Date: Sun, 5 Sep 2010 21:18:36 +0200 Subject: [PATCH 2/5] Exclude tags from the summary of ical entries * org-icalendar.el (org-print-icalendar-entries): Exclude tags from summary of non-TODO ical entries. (org-print-icalendar-entries): Use `org-complex-heading-regexp' to exclude tags from summary of TODO ical entries. --- lisp/org-icalendar.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/org-icalendar.el b/lisp/org-icalendar.el index 4f307c487..c374e2eed 100644 --- a/lisp/org-icalendar.el +++ b/lisp/org-icalendar.el @@ -311,7 +311,7 @@ When COMBINE is non nil, add the category to each line." inc t hd (condition-case nil (org-icalendar-cleanup-string - (org-get-heading)) + (org-get-heading t)) (error (throw :skip nil))) summary (org-icalendar-cleanup-string (org-entry-get nil "SUMMARY")) @@ -439,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 @@ -471,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 From 872d401fb375695ad53c9762a08d3be65df7c616 Mon Sep 17 00:00:00 2001 From: Bastien Date: Fri, 3 Sep 2010 01:19:35 +0000 Subject: [PATCH 3/5] Use `C-c C-x _' for interactively calling `org-timer-stop' Unless I missed something, `org-timer-stop' has no keybinding yet. I propose to use `C-c C-x _'. Is that okay for everyone? --- lisp/org.el | 1 + 1 file changed, 1 insertion(+) diff --git a/lisp/org.el b/lisp/org.el index 26acc6917..a814cf4da 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) From bd8a0a6f395d83fb8c15a5c0feeb4ee60093ff40 Mon Sep 17 00:00:00 2001 From: Achim Gratz Date: Fri, 27 Aug 2010 22:56:43 +0000 Subject: [PATCH 4/5] inside table, delete-backward-char must not insert spaces when overwrite mode is on * lisp/org.el (org-delete-backward-char): check for nil overwrite-mode before inserting spaces. TINYCHANGE There's probably a different/better way to do this, but this seemed the least intrusive. This patch is in the public domain. --- lisp/org.el | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index a814cf4da..09281cccd 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -16574,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))) From e13843ef6516f72bc0a322792bf3368643e72af9 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Sun, 5 Sep 2010 22:59:07 +0200 Subject: [PATCH 5/5] Keep byte compiler happy. --- lisp/org-clock.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lisp/org-clock.el b/lisp/org-clock.el index 3328609fe..aecea4e93 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