emacs: some fixes on mu and org

Signed-off-by: Miquel Sabaté Solà <msabate@suse.com>

2 files changed, 15 insertions, 12 deletions

diff --git a/emacs/settings/init-mu4e.el b/emacs/settings/init-mu4e.el
index 5e6f717..f0256a9 100644
--- a/emacs/settings/init-mu4e.el
+++ b/emacs/settings/init-mu4e.el
@@ -159,6 +159,7 @@
         mu4e-get-mail-command "mbsync -aqV"
         mu4e-update-interval 600
         mu4e-compose-dont-reply-to-self t
+        mu4e-compose-format-flowed t
         mu4e-headers-skip-duplicates t
         mu4e-headers-include-related t
         mu4e-headers-auto-update t)
@@ -203,9 +204,7 @@
           (evil-set-initial-state 'mu4e-compose-mode 'normal)
         (evil-set-initial-state 'mu4e-compose-mode 'insert)))
 
-    ; I want to write my messages inside of 80 characters, but receivers will
-    ; get a format=flow'ed version of it.
-    (set-fill-column 80)
+    ; Guess hard newlines
     (use-hard-newlines t 'guess)
 
     ; So it's easy to encrypt/decrypt emails.
diff --git a/emacs/settings/init-org.el b/emacs/settings/init-org.el
index cf6fce4..16cb0ec 100644
--- a/emacs/settings/init-org.el
+++ b/emacs/settings/init-org.el
@@ -68,6 +68,8 @@ the entire subtree.  Idea taken from @aaronbieber"
 ;(global-set-key "\C-ca" 'org-agenda)
 ;(global-set-key "\C-cb" 'org-iswitchb)
 
+(setq org-src-fontify-natively t)
+
 (setq org-todo-keywords
       '((sequence "TODO(t)"  "|"  "DONE(d!)")
         (sequence "IDEA(i)"  "WORKING(w)"  "|"  "USED(u@/!)"  "DISCARDED(x@/!)")))
@@ -91,20 +93,21 @@ the entire subtree.  Idea taken from @aaronbieber"
 
 (setq org-agenda-custom-commands
       '(("p" "Printed agenda"
+         ; Daily agenda with a 2-weeks deadline warning. Tasks are
+         ; represented as [ ] items.
+         ((agenda ""
+                  ((org-agenda-ndays 1)
+                   (org-deadline-warning-days 14)
+                   (org-agenda-todo-keyword-format "[ ]")
+                   (org-agenda-scheduled-leaders '("" ""))))
+
          ; Display a "High Priority" list of tasks on top.
-         ((tags "PRIORITY=\"A\""
+          (tags "PRIORITY=\"A\""
                 ((org-agenda-skip-function '(org-agenda-skip-entry-if 'todo 'done))
                  (org-agenda-sorting-strategy '(tag-up priority-down))
                  (org-agenda-todo-keyword-format "")
-                 (org-agenda-overriding-header "High priority\n--------------\n")))
+                 (org-agenda-overriding-header "\nHigh priority\n--------------\n")))
 
-          ; Daily agenda with a 2-weeks deadline warning. Tasks are
-          ; represented as [ ] items.
-          (agenda ""
-                  ((org-agenda-ndays 1)
-                   (org-deadline-warning-days 14)
-                   (org-agenda-todo-keyword-format "[ ]")
-                   (org-agenda-scheduled-leaders '("" ""))))
 
           ; All tasks except those already listed as high priority or
           ; ideas. Scheduled and deadlines are also ignored here.
@@ -158,6 +161,7 @@ the entire subtree.  Idea taken from @aaronbieber"
 
 ; The prefix for the different kinds of types being used.
 (setq org-agenda-prefix-format '((agenda . "%t%s")
+                                 (tags   . "%c:%s")
                                  (todo   . "%c:%t%s")))
 
 (provide 'init-org)