emacs: Give org-iswitchb a key binding, and include diary stuff in agenda.

diff --git a/emacs b/emacs
index fb51fec04f52523fc5deb4bb8350f92715580b61..ba6c4421405c366b52a0043b74c8ccc3d2ba613d 100644 (file)
--- a/emacs
+++ b/emacs
@@ -289,6 +289,10 @@
 (setq appt-display-interval 3)
 (setq appt-message-warning-time 10)
 
 (setq appt-display-interval 3)
 (setq appt-message-warning-time 10)
 

+;; --- Org-mode agenda ---
+
+(setq org-agenda-include-diary t)
+

 ;; --- Cosmetic stuff ---
 
 (setq display-time-24hr-format t)
 ;; --- Cosmetic stuff ---
 
 (setq display-time-24hr-format t)


@@ -375,6 +379,7 @@
 (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 ?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 ?i] 'timeclock-in)
 (global-set-key [?\C-x ?t ?c] 'timeclock-change)
 (global-set-key [?\C-x ?t ?o] 'timeclock-out)