Agenda: Catch error when no mark is set

Bernt Hansen writes:

> When org-agenda-diary-file is set to a special org file for diary
> entries and transient mark mode is enabled 'i' in the agenda fails
> with 'mark is not active now'
>
> My workaround for this is C-SPC to set the mark anywhere legal in the
> agenda display (ie not on the first or last line) and then hit 'i'
> to insert my diary entries.

lisp/ChangeLog

@@ -1,5 +1,8 @@
 2009-11-20  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org-agenda.el (org-agenda-diary-entry-in-org-file): Make sure
+	hat checking for the mark does not throw an error.
+
 	* org.el (org-sort-entries-or-items): Make sure that the final
 	entry has a newline before doing the sorting.
 

lisp/org-agenda.el

@@ -6667,7 +6667,7 @@ The cursor may be at a date in the calendar, or in the Org agenda."
 	      d2 (car calendar-mark-ring))
       (setq d1 (calendar-gregorian-from-absolute
 		(get-text-property (point-at-bol) 'day))
-	    d2 (and (mark)
+	    d2 (and (ignore-errors (mark))
 		    (save-excursion
 		      (goto-char (mark))
 		      (setq dp (get-text-property (point-at-bol) 'day)))