(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.
;; 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)
;;;--------------------------------------------------------------------------
;;; Calendar configuration.
-(setq diary-file "~/etc/state/diary")
+(setq diary-file
+ (let ((main-diary "~/etc/state/diary")
+ (private-diary "~/etc/state.private/diary.private"))
+ (if (file-exists-p private-diary)
+ private-diary
+ main-diary)))
;; Trivial stuff for the sunrise/sunset calculations.
;; Date format fiddling.
-(setq european-calendar-style t)
-
-(setq diary-date-forms '((day "[-/]" month "[^-/0-9]")
- (day " *" monthname "[ \t]*\\(\^M\\|\n\\)")
- (backup day " *" monthname "\\W+\\<[^*0-9]")
- (day "[-/]" month "[-/]" year "[^0-9]")
- (day " *" monthname " *" year "[^0-9]")
- (year "[-/]" month "[-/]" day "[^0-9]")
- (dayname "\\W")))
+(setq european-calendar-style t
+ 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\\)")
+ (backup day " *" monthname "\\W+\\<\\([^*0-9]\\|[0-9]+[:aApP]\\)")
+ (day "[-/]" month "[-/]" year "[^0-9]")
+ (day " *" monthname " *" year "[^0-9]")
+ (year "[-/]" month "[-/]" day "[^0-9]")
+ (dayname "\\W")))
;; Fancy diary handling.
(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.
(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.
(progn
(global-set-key [?\e ?\e] 'mdw-wrong)
(global-set-key [?\e ?\C-\] ?\C-\]] 'keyboard-escape-quit)
- (global-set-key [?\C-x ?w left] 'windmove-left)
- (global-set-key [?\C-x ?w ?h] 'windmove-left)
- (global-set-key [?\C-x ?w up] 'windmove-up)
- (global-set-key [?\C-x ?w ?k] 'windmove-up)
- (global-set-key [?\C-x ?w down] 'windmove-down)
- (global-set-key [?\C-x ?w ?j] 'windmove-down)
- (global-set-key [?\C-x ?w right] 'windmove-right)
- (global-set-key [?\C-x ?w ?l] 'windmove-right)
- (global-set-key [?\C-x ?g ?l] 'org-store-link)
- (global-set-key [?\C-x ?g ?a] 'org-agenda)
- (global-set-key [?\C-x ?g ?b] 'org-iswitchb)
- (global-set-key [?\C-x ?t ?i] 'timeclock-in)
- (global-set-key [?\C-x ?t ?c] 'timeclock-change)
- (global-set-key [?\C-x ?t ?o] 'timeclock-out)
- (global-set-key [?\C-x ?t ?r] 'timeclock-reread-log)
- (global-set-key [?\C-x ?t ?w] 'timeclock-workday-remaining-string)
- (global-set-key [?\C-x ?t ?s] 'timeclock-status-string)
- (global-set-key [?\C-x ?t ?p] 'nc-timesheet-prepare)
- (global-set-key [?\C-x ?t ?\C-m] 'nc-timesheet-submit)
+ (global-set-key [?\C-c ?w left] 'windmove-left)
+ (global-set-key [?\C-c ?w ?h] 'windmove-left)
+ (global-set-key [?\C-c ?w up] 'windmove-up)
+ (global-set-key [?\C-c ?w ?k] 'windmove-up)
+ (global-set-key [?\C-c ?w down] 'windmove-down)
+ (global-set-key [?\C-c ?w ?j] 'windmove-down)
+ (global-set-key [?\C-c ?w right] 'windmove-right)
+ (global-set-key [?\C-c ?w ?l] 'windmove-right)
+ (global-set-key [?\C-c ?g ?l] 'org-store-link)
+ (global-set-key [?\C-c ?g ?a] 'org-agenda)
+ (global-set-key [?\C-c ?g ?b] 'org-iswitchb)
+ (global-set-key [?\C-c ?t ?i] 'timeclock-in)
+ (global-set-key [?\C-c ?t ?c] 'timeclock-change)
+ (global-set-key [?\C-c ?t ?o] 'timeclock-out)
+ (global-set-key [?\C-c ?t ?r] 'timeclock-reread-log)
+ (global-set-key [?\C-c ?t ?w] 'timeclock-workday-remaining-string)
+ (global-set-key [?\C-c ?t ?s] 'timeclock-status-string)
(global-set-key [?\C-x ?3] 'mdw-split-window-horizontally)
(global-set-key [?\M-#] 'calc-dispatch)
(global-set-key [?\C-x ?/] 'auto-fill-mode)