From: Peng Li <seudut@gmail.com>
Date: Sat, 18 Feb 2017 16:44:44 +0000 (+0800)
Subject: emacs - change the error to warning when building
X-Git-Url: http://47.100.26.94:8080/?a=commitdiff_plain;h=426aa3f4af4c35eef6871e75276539311b7e6008;p=dotfiles.git

emacs - change the error to warning when building
---

diff --git a/emacs.d/config.org b/emacs.d/config.org
index 1182d1a..106773d 100644
--- a/emacs.d/config.org
+++ b/emacs.d/config.org
@@ -737,7 +737,7 @@ Always indents header, and hide header leading starts so that no need type =#+ST
   (setq org-ditaa-jar-path "/usr/local/Cellar/ditaa/0.9/libexec/ditaa0_9.jar")
   (unless 
       (file-exists-p org-ditaa-jar-path)
-    (error "seudut: ditaa.jar not found at %s " org-ditaa-jar-path))
+    (warn "seudut: ditaa.jar not found at %s " org-ditaa-jar-path))
 
   (org-babel-do-load-languages 'org-babel-load-languages
                                '((python . t)
@@ -2751,66 +2751,68 @@ Then, run =mu index --maildir=~/.Mail=
 ** Mu4e - Emacs frontend of Mu
 config from [[http://www.kirang.in/2014/11/13/emacs-as-email-client-with-offlineimap-and-mu4e-on-osx/][emacs-as-email-client-with-offlineimap-and-mu4e-on-osx]]
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
-  (require 'mu4e)
-  (setq mu4e-maildir "~/.Mail")
-  (setq mu4e-drafts-folder "/[Gmail].Drafts")
-  (setq mu4e-sent-folder   "/[Gmail].Sent Mail")
-  ;; don't save message to Sent Messages, Gmail/IMAP takes care of this
-  (setq mu4e-sent-messages-behavior 'delete)
-  ;; allow for updating mail using 'U' in the main view:
-  (setq mu4e-get-mail-command "offlineimap")
-
-  ;; shortcuts
-  (setq mu4e-maildir-shortcuts
-      '( ("/INBOX"               . ?i)
-         ("/[Gmail].Sent Mail"   . ?s)))
-
-  ;; something about ourselves
-  (setq
-     user-mail-address "seudut@gmail.com"
-     user-full-name  "Peng Li"
-     mu4e-compose-signature
-      (concat
-        "Thanks,\n"
-        "Peng\n"))
-
-  ;; show images
-  (setq mu4e-show-images t)
-
-  ;; use imagemagick, if available
-  (when (fboundp 'imagemagick-register-types)
-    (imagemagick-register-types))
-
-  ;; convert html emails properly
-  ;; Possible options:
-  ;;   - html2text -utf8 -width 72
-  ;;   - textutil -stdin -format html -convert txt -stdout
-  ;;   - html2markdown | grep -v '&nbsp_place_holder;' (Requires html2text pypi)
-  ;;   - w3m -dump -cols 80 -T text/html
-  ;;   - view in browser (provided below)
-  (setq mu4e-html2text-command "textutil -stdin -format html -convert txt -stdout")
-
-  ;; spell check
-  (add-hook 'mu4e-compose-mode-hook
-          (defun my-do-compose-stuff ()
-             "My settings for message composition."
-             (set-fill-column 72)
-             (flyspell-mode)))
-
-  ;; add option to view html message in a browser
-  ;; `aV` in view to activate
-  (add-to-list 'mu4e-view-actions
-    '("ViewInBrowser" . mu4e-action-view-in-browser) t)
-
-  ;; fetch mail every 10 mins
-  (setq mu4e-update-interval 600)
-
-  ;; mu4e view
-  (setq-default mu4e-headers-fields '((:flags . 6)
-                                      (:from-or-to . 22)
-                                      (:mailing-list . 20)
-                                      (:thread-subject . 70)
-                                      (:human-date . 16)))
+  (if (require 'mu4e nil 'noerror)
+      (progn
+        (setq mu4e-maildir "~/.Mail")
+        (setq mu4e-drafts-folder "/[Gmail].Drafts")
+        (setq mu4e-sent-folder   "/[Gmail].Sent Mail")
+        ;; don't save message to Sent Messages, Gmail/IMAP takes care of this
+        (setq mu4e-sent-messages-behavior 'delete)
+        ;; allow for updating mail using 'U' in the main view:
+        (setq mu4e-get-mail-command "offlineimap")
+
+        ;; shortcuts
+        (setq mu4e-maildir-shortcuts
+              '( ("/INBOX"               . ?i)
+                 ("/[Gmail].Sent Mail"   . ?s)))
+
+        ;; something about ourselves
+        (setq
+         user-mail-address "seudut@gmail.com"
+         user-full-name  "Peng Li"
+         mu4e-compose-signature
+         (concat
+          "Thanks,\n"
+          "Peng\n"))
+
+        ;; show images
+        (setq mu4e-show-images t)
+
+        ;; use imagemagick, if available
+        (when (fboundp 'imagemagick-register-types)
+          (imagemagick-register-types))
+
+        ;; convert html emails properly
+        ;; Possible options:
+        ;;   - html2text -utf8 -width 72
+        ;;   - textutil -stdin -format html -convert txt -stdout
+        ;;   - html2markdown | grep -v '&nbsp_place_holder;' (Requires html2text pypi)
+        ;;   - w3m -dump -cols 80 -T text/html
+        ;;   - view in browser (provided below)
+        (setq mu4e-html2text-command "textutil -stdin -format html -convert txt -stdout")
+
+        ;; spell check
+        (add-hook 'mu4e-compose-mode-hook
+                  (defun my-do-compose-stuff ()
+                    "My settings for message composition."
+                    (set-fill-column 72)
+                    (flyspell-mode)))
+
+        ;; add option to view html message in a browser
+        ;; `aV` in view to activate
+        (add-to-list 'mu4e-view-actions
+                     '("ViewInBrowser" . mu4e-action-view-in-browser) t)
+
+        ;; fetch mail every 10 mins
+        (setq mu4e-update-interval 600)
+
+        ;; mu4e view
+        (setq-default mu4e-headers-fields '((:flags . 6)
+                                            (:from-or-to . 22)
+                                            (:mailing-list . 20)
+                                            (:thread-subject . 70)
+                                            (:human-date . 16))))
+    (warn "seudut:mu4e not installed, it won't work."))
 #+END_SRC
 
 ** Smtp - send mail