1 files changed, 10 insertions, 5 deletions

@@ -91,11 +91,16 @@ ARG).  When called with multiple arguments or a list, it returns
   "Unfill, kill, then re-fill the region defined by START and END positions.
 REGION is passed straight to `kill-ring-save'."
   (interactive "*r")
-  (save-excursion
-    (save-restriction
-      (unfill-region start end)
-      (kill-ring-save start end region)
-      (fill-region start end))))
+  (let ((sentence-end-double-space nil))
+    (unfill-region start end)
+    (kill-ring-save
+     ;; A quick hack to try and ameliorate the "Args out of range" error when
+     ;; `unfill-region' removes some newlines.  I'm not sure if this will work
+     ;; if calling from Lisp or other such nonsense.
+     (max start (point-min))
+     (min end (point-max))
+     region))
+  (fill-region start end))
 
 (defmacro when-unfocused (name &rest forms)
   "Define a function NAME, executing FORMS, that fires when Emacs