Merge remote-tracking branch 'origin/master' into build64-par

Conflicts:
	.kde/share/apps
	.kde/share/config
	.kde4

1 files changed, 32 insertions, 1 deletions

diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index 3cd2ea3..402957a 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -1,6 +1,6 @@
 ;; Preliminary settings ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(set-face-attribute 'default nil :height 80)
+(set-face-attribute 'default nil :height 75)
 (setq notify-method 'notify-via-libnotify)
 (add-to-list 'load-path "~/.emacs.d/")
 (add-to-list 'load-path "~/.emacs.d/el-get/el-get")
@@ -58,6 +58,36 @@
 
 ;; General settings ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(require 'go-mode-load)
+
+(require 'mailcrypt)
+(mc-setversion "gpg")
+(add-hook 'wl-summary-mode-hook 'mc-install-read-mode)
+(add-hook 'wl-mail-setup-hook 'mc-install-write-mode)
+
+(defun mc-wl-verify-signature ()
+  (interactive)
+  (save-window-excursion
+    (wl-summary-jump-to-current-message)
+    (mc-verify)))
+
+(defun mc-wl-decrypt-message ()
+  (interactive)
+  (save-window-excursion
+    (wl-summary-jump-to-current-message)
+    (let ((inhibit-read-only t))
+      (mc-decrypt))))
+
+(eval-after-load "mailcrypt"
+  '(setq mc-modes-alist
+       (append
+        (quote
+         ((wl-draft-mode (encrypt . mc-encrypt-message)
+            (sign . mc-sign-message))
+          (wl-summary-mode (decrypt . mc-wl-decrypt-message)
+            (verify . mc-wl-verify-signature))))
+        mc-modes-alist)))
+
 ;(load "mdmua")
 (load "emacsutils")
 
@@ -170,6 +200,7 @@
              ))
 
 (add-to-list 'auto-mode-alist '("PKGBUILD" . sh-mode))
+(add-to-list 'auto-mode-alist '("SRCBUILD" . sh-mode))
 
 ;(require 'flymake)
 ;(add-hook 'php-mode-hook (lambda() (flymake-mode 1)))