X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/4d5799eb030cc5ca0fad368fc0538d72c80e9fa7..7047be8d18b9eafce46eb2401df7d2386b5f32ec:/el/dot-emacs.el

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index b307dc2..a1cba54 100644
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -259,6 +259,11 @@ it's currently off."
 
 ;; Functions for sexp diary entries.
 
+(defun mdw-not-org-mode (form)
+  "As FORM, but not in Org mode agenda."
+  (and (not mdw-diary-for-org-mode-p)
+       (eval form)))
+
 (defun mdw-weekday (l)
   "Return non-nil if `date' falls on one of the days of the week in L.
 L is a list of day numbers (from 0 to 6 for Sunday through to
@@ -333,13 +338,33 @@ as output rather than a string."
 				(nth 2 when))))))))
     (eq w d)))
 
+(defvar mdw-diary-for-org-mode-p nil)
+
+(defadvice org-agenda-list (around mdw-preserve-links activate)
+  (let ((mdw-diary-for-org-mode-p t))
+    ad-do-it))
+
 (defadvice diary-add-to-list (before mdw-trim-leading-space activate)
   "Trim leading space from the diary entry string."
   (save-match-data
     (let ((str (ad-get-arg 1)))
-      (if (and str (string-match "^[ \t]+" str))
-	  (let ((new (replace-match "" nil nil str)))
-	    (ad-set-arg 1 new))))))
+      (ad-set-arg 1
+		  (cond ((null str) nil)
+			((and mdw-diary-for-org-mode-p
+			      (string-match (concat
+					     "^[ \t]*"
+					     "\\(" diary-time-regexp
+					     "\\(-" diary-time-regexp "\\)?"
+					     "\\)[ \t]+")
+					    str))
+			 (replace-match "\\1 " nil nil str))
+			((string-match "^[ \t]+" str)
+			 (replace-match "" nil nil str))
+			((and (not mdw-diary-for-org-mode-p)
+			      (string-match "\\[\\[[^][]*]\\[\\([^][]*\\)]]"
+					    str))
+			 (replace-match "\\1" nil nil str))
+			(t str))))))
 
 ;; Fighting with Org-mode's evil key maps.
 
@@ -1073,12 +1098,14 @@ doesn't match any of the regular expressions in
 ;;;--------------------------------------------------------------------------
 ;;; General fontification.
 
+(make-face 'mdw-virgin-face)
+
 (defmacro mdw-define-face (name &rest body)
   "Define a face, and make sure it's actually set as the definition."
   (declare (indent 1)
 	   (debug 0))
   `(progn
-     (make-face ',name)
+     (copy-face 'mdw-virgin-face ',name)
      (defvar ,name ',name)
      (put ',name 'face-defface-spec ',body)
      (face-spec-set ',name ',body nil)))