X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/cc71d815da7ea76f48c2a3e67ec6e3627ea630bd..d401f71b8893a07042aa05958c8d5d7689983dbe:/el/dot-emacs.el?ds=sidebyside

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 11be2ac..91283d9 100644
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -57,6 +57,12 @@ This may be at the expense of cool features.")
   (interactive)
   (error "wrong button"))
 
+(defun mdw-emacs-version-p (major &optional minor)
+  "Return non-nil if the running Emacs is at least version MAJOR.MINOR."
+  (or (> emacs-major-version major)
+      (and (= emacs-major-version major)
+	   (>= emacs-minor-version (or minor 0)))))
+
 ;; Some error trapping.
 ;;
 ;; If individual bits of this file go tits-up, we don't particularly want
@@ -189,8 +195,7 @@ fringes is not taken out of the allowance for WIDTH, unlike
   "Split a wide window into appropriate widths."
   (interactive "P")
   (setq width (cond (width (prefix-numeric-value width))
-		    ((and window-system
-			  (>= emacs-major-version 22))
+		    ((and window-system (mdw-emacs-version-p 22))
 		     77)
 		    (t 78)))
   (let* ((win (selected-window))
@@ -265,6 +270,50 @@ function returns non-nil."
 	(memq (nth d '(sunday monday tuesday wednesday
 			      thursday friday saturday)) l))))
 
+(defun mdw-discordian-date (date)
+  "Return the Discordian calendar date corresponding to DATE.
+
+The return value is (YOLD . st-tibs-day) or (YOLD SEASON DAYNUM DOW).
+
+The original is by David Pearson.  I modified it to produce date components
+as output rather than a string."
+  (let* ((days ["Sweetmorn" "Boomtime" "Pungenday"
+		"Prickle-Prickle" "Setting Orange"])
+	 (months ["Chaos" "Discord" "Confusion"
+		  "Bureaucracy" "Aftermath"])
+	 (day-count [0 31 59 90 120 151 181 212 243 273 304 334])
+	 (year (- (extract-calendar-year date) 1900))
+	 (month (1- (extract-calendar-month date)))
+	 (day (1- (extract-calendar-day date)))
+	 (julian (+ (aref day-count month) day))
+	 (dyear	(+ year 3066)))
+    (if (and (= month 1) (= day 28))
+	(cons dyear 'st-tibs-day)
+      (list dyear
+	    (aref months (floor (/ julian 73)))
+	    (1+ (mod julian 73))
+	    (aref days (mod julian 5))))))
+
+(defun mdw-diary-discordian-date ()
+  "Convert the date in `date' to a string giving the Discordian date."
+  (let* ((ddate (mdw-discordian-date date))
+	 (tail (format "in the YOLD %d" (car ddate))))
+    (if (eq (cdr ddate) 'st-tibs-day)
+	(format "St Tib's Day %s" tail)
+      (let ((season (cadr ddate))
+	    (daynum (caddr ddate))
+	    (dayname (cadddr ddate)))
+      (format "%s, the %d%s day of %s %s"
+	      dayname
+	      daynum
+	      (let ((ldig (mod daynum 10)))
+		(cond ((= ldig 1) "st")
+		      ((= ldig 2) "nd")
+		      ((= ldig 3) "rd")
+		      (t "th")))
+	      season
+	      tail)))))
+
 (defun mdw-todo (&optional when)
   "Return non-nil today, or on WHEN, whichever is later."
   (let ((w (calendar-absolute-from-gregorian (calendar-current-date)))
@@ -1014,7 +1063,7 @@ doesn't match any of the regular expressions in
   (((type w32)) :family "courier new" :height 85)
   (((type x)) :family "6x13" :foundry "trad" :height 130)
   (t :foreground "white" :background "black"))
-(if (>= emacs-major-version 23)
+(if (mdw-emacs-version-p 23)
     (mdw-define-face variable-pitch
       (((type x)) :family "sans" :height 100))
   (mdw-define-face variable-pitch