From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sat, 23 Dec 2017 03:34:15 +0000 (-0500)
Subject: * lisp/textmodes/fill.el (adaptive-fill-function): Change default
X-Git-Tag: emacs-27.0.90~5971
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=57d54a0edd0c59fbd09efd826db1ef2b3f41b902;p=emacs.git

* lisp/textmodes/fill.el (adaptive-fill-function): Change default

Use 'ignore' rather than nil since they behave identically, except that
'ignore' interacts correctly with add/remove-function.
---

diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index 96023265b03..d218db0fac1 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -128,10 +128,11 @@ if it would act as a paragraph-starter on the second line."
   :type 'regexp
   :group 'fill)
 
-(defcustom adaptive-fill-function nil
-  "Function to call to choose a fill prefix for a paragraph, or nil.
-A nil value means the function has not determined the fill prefix."
-  :type '(choice (const nil) function)
+(defcustom adaptive-fill-function #'ignore
+  "Function to call to choose a fill prefix for a paragraph.
+A nil return value means the function has not determined the fill prefix."
+  :version "27.1"
+  :type 'function
   :group 'fill)
 
 (defvar fill-indent-according-to-mode nil ;Screws up CC-mode's filling tricks.