~mdw
/
profile
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
el/dot-emacs.el (diary-add-to-list): Fix for multiple appointments.
[profile]
/
dot
/
emacs
diff --git
a/dot/emacs
b/dot/emacs
index
b03ff68
..
f6290cc
100644
(file)
--- a/
dot/emacs
+++ b/
dot/emacs
@@
-52,6
+52,7
@@
(maybe-autoload 'stgit "stgit" nil t)
(maybe-autoload 'nc-timesheet-prepare "nc-timesheet" nil t nil)
(maybe-autoload 'nc-timesheet-submit "nc-timesheet" nil t nil)
(maybe-autoload 'stgit "stgit" nil t)
(maybe-autoload 'nc-timesheet-prepare "nc-timesheet" nil t nil)
(maybe-autoload 'nc-timesheet-submit "nc-timesheet" nil t nil)
+(maybe-autoload 'org-bbdb-anniversaries "org" nil t)
(and (library-exists-p "debian-changelog-mode")
(add-to-list 'auto-mode-alist
(and (library-exists-p "debian-changelog-mode")
(add-to-list 'auto-mode-alist
@@
-121,6
+122,7
@@
;; Emacs server behaviour.
(and (or window-system (mdw-emacs-version-p 23))
;; 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)
(progn (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$")
edit-server-new-frame nil
gnuserv-frame t)
@@
-158,7
+160,9
@@
(setq mail-from-style 'angles
mail-signature t
mail-yank-prefix "> "
(setq mail-from-style 'angles
mail-signature t
mail-yank-prefix "> "
- mail-archive-file-name "~/Mail/sent"
+ mail-archive-file-name nil
+ message-default-mail-headers ""
+ message-default-news-headers ""
compose-mail-user-agent-warnings nil)
(setq rmail-display-summary t)
compose-mail-user-agent-warnings nil)
(setq rmail-display-summary t)
@@
-196,24
+200,31
@@
(trap (bbdb-initialize 'gnus 'sendmail 'message)))
(setq bbdb-file "~/etc/brain/bbdb"
bbdb-north-american-phone-numbers-p nil
(trap (bbdb-initialize 'gnus 'sendmail 'message)))
(setq bbdb-file "~/etc/brain/bbdb"
bbdb-north-american-phone-numbers-p nil
+ bbdb-dwim-net-address-allow-redundancy t
+ bbdb-extract-address-components-func 'bbdb-extract-address-components
bbdb/news-auto-create-p
(lambda ()
(let ((group gnus-newsgroup-name))
bbdb/news-auto-create-p
(lambda ()
(let ((group gnus-newsgroup-name))
- (and (string-match "^nn
imap
\\+" group)
+ (and (string-match "^nn
\\(imap\\|folder\\)
\\+" group)
(not (string-match ":\\(crap\\|spam\\|lists\\)\\." group)))))
bbdb-user-mail-names
(concat "^"
"\\(" "\\(mdw\\|markw\\|root\\|postmaster\\)"
"\\([-+][^@]*\\|\\)"
"@\\(\\(dist\\|esc\\)orted\\.org\\.uk\\|odin\\.gg\\)"
(not (string-match ":\\(crap\\|spam\\|lists\\)\\." group)))))
bbdb-user-mail-names
(concat "^"
"\\(" "\\(mdw\\|markw\\|root\\|postmaster\\)"
"\\([-+][^@]*\\|\\)"
"@\\(\\(dist\\|esc\\)orted\\.org\\.uk\\|odin\\.gg\\)"
+ "\\|" "\\(mdw\\(\\+[^@]*\\)?\\|0mdwk\\.[^@]*\\)" "@"
+ "\\(chiark\\|slimy\\|coriolis\\)\\.greenend\\.org\\.uk"
"\\|" "distorted\\.mdw@g\\(\\|oogle\\)mail.com"
"\\|" "mwooding@\\(good\\|blackberry\\)\\.com"
"\\|" "distorted\\.mdw@g\\(\\|oogle\\)mail.com"
"\\|" "mwooding@\\(good\\|blackberry\\)\\.com"
+ "\\|" "mark\\.wooding@trustonic\\.com"
"\\)$")
bbdb-canonicalize-net-hook
(lambda (addr)
(cond ((null addr)
nil)
"\\)$")
bbdb-canonicalize-net-hook
(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\\)$")
"HTML-[0-9]+-[0-9]+-[0-9]+"
"@\\(nationwide-communications\\."
"co\\.uk\\)$")
@@
-223,6
+234,13
@@
"\\|" "distorted\\.org\\.uk"
"\\)$")
addr)
"\\|" "distorted\\.org\\.uk"
"\\)$")
addr)
+ (string-match (concat "^MicrosoftExchange[0-9a-f]*"
+ "@newincco\\.onmicrosoft\\.com")
+ addr)
+ (member (md5 addr)
+ '("8815c5583970856799c85a3ee0eb6a9f" ;work wiki spam
+ "0b94ab4d25dacaa5ac07243a09c9e22e" ;work bug spam
+ ))
(and (string-match "^news\\([0-9]+\\)@\\(.*\\)$" addr)
(string= (md5 (match-string 2 addr))
"879b795aed959b1a000e9f95c132b16c")))
(and (string-match "^news\\([0-9]+\\)@\\(.*\\)$" addr)
(string= (md5 (match-string 2 addr))
"879b795aed959b1a000e9f95c132b16c")))
@@
-293,6
+311,7
@@
(setq-default truncate-partial-width-windows nil
truncate-lines t)
(setq default-indicate-empty-lines t)
(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
(setq whitespace-style
'(trailing space-before-tab space-after-tab empty indentation face))
(setq woman-use-own-frame nil ;Keep man pages somewhere sensible
@@
-441,7
+460,9
@@
(setq appt-display-interval 3)
(setq appt-message-warning-time 10)
(and (not mdw-fast-startup)
(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.
;; Org-mode agenda.
@@
-461,7
+482,7
@@
(display-time)
(column-number-mode 1)
(trap
(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))))
(let ((calendar-view-diary-initially-flag t))
(calendar))))
@@
-525,6
+546,9
@@
(background-color . "black")
(foreground-color . "white"))
(nil (menu-bar-lines . 0))))
(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.
;; Other frame fiddling.
@@
-639,7
+663,6
@@
"\\)$")
. text-mode)
("\\.calc?$" . apcalc-mode)
"\\)$")
. 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)
("/\\(s\\|sh\\)/" . arm-assembler-mode)
("\\.\\(cmd\\|exec\\|rexx\\)$" . rexx-mode)
("\\.st$" . smalltalk-mode)
@@
-760,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 '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)
(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)