From fcc4fef5ae8adec386f8e0d94e5f332cc6f8c3c8 Mon Sep 17 00:00:00 2001
From: Luke Hoersten <Luke@Hoersten.org>
Date: Sun, 13 Dec 2009 11:45:37 -0600
Subject: Updated nav and yasnipped modes as well as cleaned up the pastebin
 script.

---
 hoersten-pastebin-region.el | 42 +++++++++++++++++++++++-------------------
 init.el                     |  8 ++++++--
 2 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/hoersten-pastebin-region.el b/hoersten-pastebin-region.el
index ab7be13..ccaa0ef 100644
--- a/hoersten-pastebin-region.el
+++ b/hoersten-pastebin-region.el
@@ -15,24 +15,28 @@
 (defun pastebin-region (start end)
   "Send selected text to dpaste pastebin."
   (interactive "r")
-  (let* ((pastebin-url "http://inf/paste/")
-         (url-request-method "POST")
-         (url-request-extra-headers '(("Content-Type" . "application/x-www-form-urlencoded")))
-         (url-request-data
-          (format "title=%s&content=%s&lexer=%s&author=%s"
-                  (url-hexify-string (buffer-file-name))                                         ; title
-                  (url-hexify-string (buffer-substring-no-properties start end))                 ; content
-                  (url-hexify-string (or (assoc-default major-mode pastebin-type-assoc) "text")) ; lexer
-                  (url-hexify-string (user-full-name)))))                                        ; author
-    (url-retrieve pastebin-url (lambda (arg)
-                                 (cond
-                                  ((equal :error (car arg))
-                                   (signal (cdr arg)))
-                                  ((equal :redirect (car arg))
-                                   (let ((redirected (cadr arg)))
-                                     (message redirected)
-                                     (with-temp-buffer
-                                       (insert redirected)
-                                       (clipboard-kill-ring-save (point-min) (point-max))))))))))
+  (let*
+      ((pastebin-url "http://inf/paste/")
+       (url-request-method "POST")
+       (url-request-extra-headers '(("Content-Type" . "application/x-www-form-urlencoded")))
+       (url-request-data
+        (format
+         "title=%s&content=%s&lexer=%s&author=%s"
+         (url-hexify-string (buffer-file-name))                                         ; title
+         (url-hexify-string (buffer-substring-no-properties start end))                 ; content
+         (url-hexify-string (or (assoc-default major-mode pastebin-type-assoc) "text")) ; lexer
+         (url-hexify-string (user-full-name)))))                                        ; author
+    (url-retrieve
+     pastebin-url
+     (lambda (arg)
+       (cond
+        ((equal :error (car arg))
+         (signal (cdr arg)))
+        ((equal :redirect (car arg))
+         (let ((redirected (cadr arg)))
+           (message redirected)
+           (with-temp-buffer
+             (insert redirected)
+             (clipboard-kill-ring-save (point-min) (point-max))))))))))
 
 (provide 'hoersten-pastebin-region)
diff --git a/init.el b/init.el
index cf19d73..f0c904b 100644
--- a/init.el
+++ b/init.el
@@ -44,18 +44,22 @@
 ;; includes
 (require 'hoersten-pastebin-region) ; send selected text to pastebin
 (require 'mercurial)                ; load mercurial mode
-(require 'nav)                      ; load nav bar
 (require 'hoersten-c-style)         ; load c specific lisp
 
+;; nav mode
+(add-to-list 'load-path "~/.emacs.d/nav/")
+(require 'nav)
+
 ;; unicode
 (require 'pretty-mode)
 (global-pretty-mode t)
 (setq haskell-font-lock-symbols 'unicode)
 
 ;; snippets
+(add-to-list 'load-path "~/.emacs.d/yasnippet/")
 (require 'yasnippet)
 (yas/initialize)
-(yas/load-directory "~/.emacs.d/snippets/")
+(yas/load-directory "~/.emacs.d/yasnippet/snippets/")
 
 ;; zencoding html
 (require 'zencoding-mode)
-- 
cgit v1.2.3