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

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

2 files changed, 39 insertions, 4 deletions

diff --git a/.config/emacs/custom.el b/.config/emacs/custom.el
index 5a3e67f..dad3d8d 100644
--- a/.config/emacs/custom.el
+++ b/.config/emacs/custom.el
@@ -3,16 +3,20 @@
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
- '(custom-enabled-themes (quote (wombat)))
- '(custom-safe-themes (quote ("71b172ea4aad108801421cc5251edb6c792f3adbaecfa1c52e94e3d99634dee7" "fc5fcb6f1f1c1bc01305694c59a1a861b008c534cae8d0e48e4d5e81ad718bc6" default)))
+ '(custom-enabled-themes (quote (zenburn)))
+ '(custom-safe-themes (quote ("1e7e097ec8cb1f8c3a912d7e1e0331caeed49fef6cff220be63bd2a6ba4cc365" "71b172ea4aad108801421cc5251edb6c792f3adbaecfa1c52e94e3d99634dee7" "fc5fcb6f1f1c1bc01305694c59a1a861b008c534cae8d0e48e4d5e81ad718bc6" default)))
  '(erc-nick "lukeshu")
  '(explicit-shell-file-name "/bin/bash")
  '(inhibit-startup-screen t)
  '(mdmua-maildir "~/Maildir")
  '(minibuffer-prompt-properties (quote (read-only t point-entered minibuffer-avoid-prompt face minibuffer-prompt)))
+ '(page-break-lines-char 45)
  '(ruby-deep-arglist nil)
  '(ruby-deep-indent-paren nil)
- '(scroll-bar-mode nil))
+ '(safe-local-variable-values (quote ((Nginx-indent-tabs-mode) (Nginx-indent-level . 4) (Nginx-indent-level . 8))))
+ '(scroll-bar-mode nil)
+ '(sh-basic-offset 8)
+ '(sh-indent-comment t))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
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)))