Merge remote-tracking branch 'origin/master' into phoenix

2 files changed, 34 insertions, 62 deletions

diff --git a/.emacs.d/site-lisp/mode-icons.el b/.emacs.d/site-lisp/mode-icons.el
deleted file mode 100644
index 771d6f3..0000000
--- a/.emacs.d/site-lisp/mode-icons.el
+++ /dev/null
@@ -1,59 +0,0 @@
-;;; mode-icons.el --- Show icons for modes
-
-;; Copyright (C) 2012  Tom Willemsen
-
-;; Author: Tom Willemsen <thomas@aethon.nl>
-;; Keywords: multimedia
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;;
-
-;;; Code:
-
-(defun mode-icons-get-icon-file (name)
-  (concat user-emacs-directory "/icons/" name))
-
-(defvar mode-icons
-  `(("Emacs-Lisp" . (image :type xpm
-                           :file ,(mode-icons-get-icon-file "emacs.xpm")
-                           :ascent center))
-    ("Python" . (image :type xpm
-                       :file ,(mode-icons-get-icon-file "python.xpm")
-                       :ascent center))
-    ("Scheme" . (image :type xpm
-                       :file ,(mode-icons-get-icon-file "scheme.xpm")
-                       :ascent center))
-    ("Lisp" . (image :type xpm
-                     :file ,(mode-icons-get-icon-file "cl.xpm")
-                     :ascent center))
-    ("PHP" . (image :type xpm
-                    :file ,(mode-icons-get-icon-file "php.xpm")
-                    :ascent center)))
-  "Icons for major modes.")
-
-(defun set-mode-icon (mode)
-  (let ((icon-spec (assoc mode mode-icons)))
-    (if icon-spec
-        (setq mode-name (propertize mode-name 'display (cdr icon-spec))))))
-
-(defun set-current-mode-icon ()
-  (set-mode-icon mode-name))
-
-(add-hook 'after-change-major-mode-hook 'set-current-mode-icon)
-
-(provide 'mode-icons)
-;;; mode-icons.el ends here
diff --git a/.emacs.d/site-lisp/oni.el b/.emacs.d/site-lisp/oni.el
index cc16324..439be25 100644
--- a/.emacs.d/site-lisp/oni.el
+++ b/.emacs.d/site-lisp/oni.el
@@ -293,6 +293,7 @@ If COUNT has been specified indent by that much, otherwise look at
 (defun oni:markdown-mode-func ()
   "Function for `markdown-mode-hook'."
   (setq-local comment-auto-fill-only-comments nil)
+  (setq-local whitespace-style '(face trailing))
   (auto-fill-mode)
   (whitespace-mode))
 
@@ -300,8 +301,7 @@ If COUNT has been specified indent by that much, otherwise look at
   "Function for `message-mode-hook'."
   (setq-local comment-auto-fill-only-comments nil)
   (auto-fill-mode)
-  (flyspell-mode)
-  (ispell-change-dictionary (read-string "New dictionary: ")))
+  (flyspell-mode))
 
 (defun oni:mini-fix-timestamp-string (date-string)
   "A minimal version of Xah Lee's `fix-timestamp-string'.
@@ -410,7 +410,9 @@ When dealing with braces, add another line and indent that too."
   (rainbow-delimiters-mode)
   (setq fci-rule-column 79
         fill-column 72)
-  (fci-mode))
+  (setq-local whitespace-style '(tab-mark))
+  (fci-mode)
+  (whitespace-mode))
 
 (defun oni:raise-ansi-term (arg)
   "Create or show an `ansi-term' buffer."
@@ -466,6 +468,35 @@ use.  If MODE is not nil, open a new buffer with the name
     (while (search-forward from nil t)
       (replace-match to))))
 
+(defun oni:request-pull ()
+  "Start a mail to request pulling from a git repository."
+  (interactive)
+  (let* ((default-directory
+           (expand-file-name
+            (or (locate-dominating-file default-directory ".git")
+                (magit-read-top-dir nil))))
+         (refs (magit-list-interesting-refs magit-uninteresting-refs))
+         (from (cdr (assoc (completing-read "From: " refs) refs)))
+         (url (read-from-minibuffer "Pull URL: "))
+         (to (symbol-name (read-from-minibuffer "Up to (HEAD): "
+                                                nil nil t nil "HEAD")))
+         (patchp (and current-prefix-arg (listp current-prefix-arg))))
+    (message "Requesting pull for %s from %s to %s at %s with%s patch"
+             default-directory from to url (if patchp "" "out"))
+
+    (compose-mail
+     nil (concat
+          "Requesting pull for "
+          (file-name-base (directory-file-name default-directory))))
+
+    (save-excursion
+      (goto-char (point-max))
+      (insert
+       (shell-command-to-string
+        (concat "git --git-dir='" default-directory ".git' --work-tree='"
+                default-directory "' request-pull " (when patchp "-p ")
+                from " " url " " to))))))
+
 (defun oni:required-packages-installed-p ()
   "Check if all the packages I need are installed."
   (let ((tmp-packages oni:required-packages)