From 03f62993e6759d659200d1b0261b5d7a21667c03 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Wed, 25 Nov 2015 11:15:16 -0500
Subject: [PATCH] random tweaks to multi-line and more

---
 dotfiles/emacs.d/init.el | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/dotfiles/emacs.d/init.el b/dotfiles/emacs.d/init.el
index 91975952..c671a61b 100644
--- a/dotfiles/emacs.d/init.el
+++ b/dotfiles/emacs.d/init.el
@@ -204,12 +204,16 @@
 ;;                                                                     functions
 ;; =============================================================================
 
+(defun random-choice (choices)
+  (nth (random (length choices)) choices))
+
 (defun display-prefix (arg)
   "Display the value of the raw prefix arg."
   (interactive "p")
   (message "%s" arg))
 
 (defmacro imalison:prefix-alternatives (name &rest alternatives)
+  (car alternatives)
   `(defun ,name (arg)
      (interactive "p")
      (setq function
@@ -219,7 +223,7 @@
                   (cl-loop for alternative in alternatives
                            collect `((eq arg ,last-power) (quote ,alternative))
                            do (setq last-power (* last-power 4)))))))
-     (setq function (or function (car alternatives))) ; Set a default value for function
+     (setq function (or function)) ; Set a default value for function
      (setq current-prefix-arg nil)
      (call-interactively function)))
 
@@ -871,11 +875,17 @@ The current directory is assumed to be the project's root otherwise."
   (progn
     (defun imalison:multi-line-skip-fill ()
       (interactive)
-      (multi-line-adjust-whitespace multi-line-skip-fill-respacer))
+      (multi-line-execute multi-line-skip-fill-stragety nil))
+
+    (defun imalison:multi-line-fill ()
+      (interactive)
+      (multi-line-execute multi-line-fill-stragety nil))
+
     (imalison:prefix-alternatives imalison:multi-line multi-line
                                   multi-line-single-line
-                                  imalison:multi-line-skip-fill))
-  :bind ("C-c d" . imalison:multi-line))
+                                  imalison:multi-line-skip-fill
+                                  imalison:multi-line-fill))
+    :bind ("C-c d" . imalison:multi-line))
 
 (use-package recentf
   ;; binding is in helm.
@@ -2404,6 +2414,7 @@ items follow a style that is consistent with other prog-modes."
   :ensure spaceline
   :config
   (progn
+    (setq powerline-default-separator (random-choice '(butt slant wave)))
     (setq spaceline-workspace-numbers-unicode t
           spaceline-window-numbers-unicode t)
     (if (display-graphic-p)
@@ -2412,13 +2423,6 @@ items follow a style that is consistent with other prog-modes."
     (setq powerline-height 25)
     (spaceline-spacemacs-theme)))
 
-(use-package telephone-line
-  :disabled t
-  :config
-  (progn
-    (setq telephone-line-primary-left-separator #'telephone-line-cubed-left)
-    (telephone-line-mode 1)))
-
 ;; =============================================================================
 ;;                                                                        Themes
 ;; =============================================================================
@@ -2434,9 +2438,6 @@ items follow a style that is consistent with other prog-modes."
       (setq calendar-latitude latitude)
       (setq calendar-longitude longitude))))
 
-(defun random-choice (choices)
-  (nth (random (length choices)) choices))
-
 (defun imalison:set-font-height ()
   (interactive)
   (let ((new-height (read-face-attribute 'default :height (selected-frame))))