el/dot-emacs.el (diary-add-to-list): Fix for multiple appointments.

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index bd00d20..f6290cc 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -122,6 +122,7 @@
 ;; Emacs server behaviour.
 
 (and (or window-system (mdw-emacs-version-p 23))
+     (not mdw-fast-startup)
      (progn (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$")
                  edit-server-new-frame nil
                  gnuserv-frame t)
@@ -221,7 +222,9 @@
       (lambda (addr)
        (cond ((null addr)
               nil)
-             ((or (string-match (concat "^reply-[0-9a-f]+-[0-9a-f]+_"
+             ((or (string-match "^mailer-daemon@" addr)
+                  (string-match "\.invalid$" addr)
+                  (string-match (concat "^reply-[0-9a-f]+-[0-9a-f]+_"
                                         "HTML-[0-9]+-[0-9]+-[0-9]+"
                                         "@\\(nationwide-communications\\."
                                         "co\\.uk\\)$")
@@ -308,6 +311,7 @@
 (setq-default truncate-partial-width-windows nil
              truncate-lines t)
 (setq default-indicate-empty-lines t)
+(setq view-read-only t)
 (setq whitespace-style
       '(trailing space-before-tab space-after-tab empty indentation face))
 (setq woman-use-own-frame nil          ;Keep man pages somewhere sensible
@@ -456,7 +460,9 @@
 (setq appt-display-interval 3)
 (setq appt-message-warning-time 10)
 (and (not mdw-fast-startup)
-     (trap (appt-activate 1)))
+     (trap (require 'org)
+          (require 'bbdb)
+          (appt-activate 1)))
 
 ;; Org-mode agenda.
 
@@ -476,7 +482,7 @@
 (display-time)
 (column-number-mode 1)
 (trap
-  (if window-system
+  (if (and window-system (not mdw-fast-startup))
       (let ((calendar-view-diary-initially-flag t))
        (calendar))))
 
@@ -540,6 +546,9 @@
             (background-color . "black")
             (foreground-color . "white"))
        (nil (menu-bar-lines . 0))))
+(let ((backg (frame-parameter nil 'background-color)))
+  (if (and backg window-system)
+      (push (cons 'background-color backg) default-frame-alist)))
 
 ;; Other frame fiddling.
 
@@ -654,7 +663,6 @@
                          "\\)$")
                 . text-mode)
                ("\\.calc?$" . apcalc-mode)
-               ("/src/linux/.*\\.\\(c\\|h\\|cc\\)$" . linux-c-mode)
                ("/\\(s\\|sh\\)/" . arm-assembler-mode)
                ("\\.\\(cmd\\|exec\\|rexx\\)$" . rexx-mode)
                ("\\.st$" . smalltalk-mode)
@@ -775,7 +783,6 @@
   (add-hook 'c-mode-hook 'mdw-fontify-c-and-c++ t)
   (add-hook 'objc-mode-hook 'mdw-fontify-c-and-c++ t)
   (add-hook 'c++-mode-hook 'mdw-fontify-c-and-c++ t)
-  (add-hook 'linux-c-mode-hook #'(lambda () (setq c-basic-offset 8)))
   (add-hook 'asm-mode-hook 'mdw-fontify-asm t)
   (add-hook 'go-mode-hook 'mdw-fontify-go t)
   (add-hook 'rust-mode-hook 'mdw-fontify-rust t)