(refill-fill-paragraph-at): Don't preserve the trailing space since

fill.el doesn't remove it anymore.
(refill-mode): Reset fill-paragraph-function even if it was nil.

diff --git a/lisp/textmodes/refill.el b/lisp/textmodes/refill.el
index 820936dc1138d397216b607086b85105c0192718..985604701cf8d867967e44ab130f46820e83bf92 100644 (file)
--- a/lisp/textmodes/refill.el
+++ b/lisp/textmodes/refill.el
@@ -114,7 +114,6 @@ This is used to optimize refilling.")
       ;; leading to excessive refilling and wrong choice of fill-prefix.
       ;; might be a bug in my paragraphs.el.
       (forward-paragraph)
-      (skip-syntax-backward "-")
       (let ((end (point))
            (beg (progn (backward-paragraph) (point)))
            (obeg (overlay-start refill-ignorable-overlay))
@@ -230,7 +229,7 @@ refilling if they would cause auto-filling."
   (when refill-ignorable-overlay
     (delete-overlay refill-ignorable-overlay)
     (kill-local-variable 'refill-ignorable-overlay))
-  (when refill-late-fill-paragraph-function
+  (when (local-variable-p 'refill-late-fill-paragraph-function)
     (setq fill-paragraph-function refill-late-fill-paragraph-function)
     (kill-local-variable 'refill-late-fill-paragraph-function))
   (if refill-mode