Thanks to Carsten for another org-mode release.
I have found and fixed a few bugs in 5.15:
The code for the %c escape in org-remember-apply-templates caused remember to
stop working if the kill-ring was empty (current-kill raises an error if the
kill
ring is empty). It also didn't check the X selection, so it wouldn't work
properly if x-select-enable-clipboard is nil (some of us like having two
clipboards :).
org-clock-cancel did not remove the clock information from the modeline.
org-clock-in was using the third matched group of the org-todo-line regex as the
clock string. This included the tags for the entry, so with the default
org-tags-column setting of -80 the clock string was far too long for any entry
with tags. The patch changes this to use org-complex-heading-regex, which can
extract just the title.
The patch attatched fixes all three of these.
Also, 'provide.el' appears to be missing from the tarball.
James
--- org-5.15/org.el 2007-11-28 15:15:16.000000000 +0000
+++ org-5.15.mine/org.el 2007-11-29 02:27:15.000000000 +0000
@@ -12950,7 +12950,14 @@
(nth 1 entry)
org-default-notes-file))
(headline (nth 2 entry))
- (v-c (current-kill 0)) ;; FIXME: protection needed?
+ (v-c (if (or (and (eq window-system 'x)
+ (x-cut-buffer-or-selection-value))
+ (bound-and-true-p x-last-selected-text)
+ (bound-and-true-p x-last-selected-text-primary))
+ x-last-selected-text-primary
+ (if (> (length kill-ring) 0)
+ (current-kill 0)
+ nil)))
(v-t (format-time-string (car org-time-stamp-formats)
(org-current-time)))
(v-T (format-time-string (cdr org-time-stamp-formats)
(org-current-time)))
(v-u (concat "[" (substring v-t 1 -1) "]"))
@@ -17673,8 +17680,8 @@
(if (and org-clock-heading-function
(functionp org-clock-heading-function))
(setq org-clock-heading (funcall org-clock-heading-function))
- (if (looking-at org-todo-line-regexp)
- (setq org-clock-heading (match-string 3))
+ (if (looking-at org-complex-heading-regexp)
+ (setq org-clock-heading (match-string 4))
(setq org-clock-heading "???")))
(setq org-clock-heading (propertize org-clock-heading 'face nil))
(org-clock-find-position)
@@ -17793,6 +17800,9 @@
(set-buffer (marker-buffer org-clock-marker))
(goto-char org-clock-marker)
(delete-region (1- (point-at-bol)) (point-at-eol)))
+ (setq global-mode-string
+ (delq 'org-mode-line-string global-mode-string))
+ (force-mode-line-update)
(message "Clock canceled"))
(defun org-clock-goto (&optional delete-windows)
_______________________________________________
Emacs-orgmode mailing list
Remember: use `Reply All' to send replies to the list.
Emacs-orgmode@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-orgmode
