From f5d29d0e1c8ccd8f32303c78b15ff49e14b39449 Mon Sep 17 00:00:00 2001
From: Gergely Polonkai <gergely@polonkai.eu>
Date: Mon, 28 Nov 2016 05:23:11 +0100
Subject: [PATCH] Borrow fill-or-unfill-paragraph from sachachua

---
 init.el            |  1 +
 lisp/text-manip.el | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/init.el b/init.el
index 8355bfe..f6e51a9 100644
--- a/init.el
+++ b/init.el
@@ -1048,6 +1048,7 @@
  ("M-t W" . transpose-windows)
  ("C-a" . gpolonkai/move-to-beginning-of-line)
  ("C-e" . gpolonkai/move-to-end-of-line)
+ ("M-q" . sachachua/fill-or-unfill-paragraph)
  :map ctl-x-map
  ("C-y" . duplicate-line)
  ("_" . maximize-window)
diff --git a/lisp/text-manip.el b/lisp/text-manip.el
index b6e4dff..7befdd8 100644
--- a/lisp/text-manip.el
+++ b/lisp/text-manip.el
@@ -5,3 +5,13 @@
   (when (looking-back "[.!?…]")
     (call-interactively 'self-insert-command arg))
   (call-interactively 'self-insert-command arg))
+
+;; From http://pages.sachachua.com/.emacs.d/Sacha.html
+(defun sachachua/fill-or-unfill-paragraph (&optional unfill region)
+  "Fill paragraph (or REGION).
+  With the prefix argument UNFILL, unfill it instead."
+  (interactive (progn
+                 (barf-if-buffer-read-only)
+                 (list (if current-prefix-arg 'unfill) t)))
+  (let ((fill-column (if unfill (point-max) fill-column)))
+    (fill-paragraph nil region)))