Merge branch 'master' of https://github.com/tremeur29/emacs.d

custom/dwpost.el

@@ -64,7 +64,10 @@
     (setq music (lastfm-user-get-recent-tracks :user lastfm-user :from 1 :to 1))
     (setq music (replace-regexp-in-string (regexp-quote "\" \"") " – " (format "%S" music) nil 'literal))
     (sleep-for 1)
-    (unless (not music)
+    (if (not music)
+	(setq music "nil"))
+    (if (equal music "nil")
+	(sleep-for 0)
       (insert (concat "post-music: "
 		      (let* ((musicjunk
 			      (format "%S" music))

snippets/org-mode/ficsetup

@@ -0,0 +1,6 @@
+# name: ficsetup
+# key: ficsetup
+# --
+#+TITLE: ${1:tbc}
+* fic
+$0