X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/13a077aedcfe3d28a364fd617852f0f795396fd9..51603539e658892d93fc7691e0ce2772df6ed3c0:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index 4d5ee5f..d4a313e 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -84,7 +84,7 @@
 
 (require 'paren)
 (trap (show-paren-mode t))
-(or window-system (>= emacs-major-version 22) (menu-bar-mode -1))
+(or window-system (mdw-emacs-version-p 22) (menu-bar-mode -1))
 
 ;; Multiple cursors.
 
@@ -111,7 +111,7 @@
 
 ;; Emacs server behaviour.
 
-(and (or window-system (>= emacs-major-version 23))
+(and (or window-system (mdw-emacs-version-p 23))
      (progn (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$")
 		  edit-server-new-frame nil
 		  gnuserv-frame t)
@@ -380,7 +380,10 @@
 ;; Date format fiddling.
 
 (setq european-calendar-style t
-      calendar-date-style 'european)
+      calendar-date-style 'european
+      calendar-time-display-form
+      '(24-hours ":" minutes
+	(if time-zone " (") time-zone (if time-zone ")")))
 
 (setq diary-date-forms '((day "[-/]" month "[^-/0-9]")
 			 (day " *" monthname "[ \t]*\\(\^M\\|\n\\)")
@@ -394,9 +397,12 @@
 
 (add-hook 'diary-display-hook 'fancy-diary-display)
 (setq diary-list-include-blanks t)
-(add-hook 'list-diary-entries-hook 'sort-diary-entries t)
-(add-hook 'list-diary-entries-hook 'include-other-diary-files)
-(add-hook 'mark-diary-entries-hook 'mark-included-diary-files)
+(cond ((mdw-emacs-version-p 23 1)
+       (add-hook 'list-diary-entries-hook 'diary-include-other-diary-files)
+       (add-hook 'mark-diary-entries-hook 'diary-mark-included-diary-files))
+      (t
+       (add-hook 'list-diary-entries-hook 'include-other-diary-files)
+       (add-hook 'mark-diary-entries-hook 'mark-included-diary-files)))
 
 ;; Appointment management.
 
@@ -404,6 +410,8 @@
 (setq appt-issue-message t)
 (setq appt-display-interval 3)
 (setq appt-message-warning-time 10)
+(and (not mdw-fast-startup)
+     (trap (appt-activate 1)))
 
 ;; Org-mode agenda.