(mode-require-final-newline): Make Custom correctly report a nil value

and allow to set it to nil via Custom.
Doc fix.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ff0c3894c5ef5e6cbcfdd1426ca76b2da4e90407..17c580e0efc585bb1f4fab72fc4a5ffdba824805 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-31  Luc Teirlinck  <teirllm@auburn.edu>
+
+       * files.el (mode-require-final-newline): Make Custom correctly
+       report a nil value and allow to set it to nil via Custom.
+       Doc fix.
+
 2005-04-01  Kenichi Handa  <handa@m17n.org>
 
        * international/characters.el: Enable the correct case setting for

diff --git a/lisp/files.el b/lisp/files.el
index 15d6f794e1690d7108ea3ee258dafc6de390784f..eca86c52a794cbdc23330a9d3dbd402b7ded9e1e 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -291,7 +291,7 @@ from `mode-require-final-newline'."
   :group 'editing-basics)
 
 (defcustom mode-require-final-newline t
-  "*Whether to add a newline at the end of the file, in certain major modes.
+  "*Whether to add a newline at end of file, in certain major modes.
 Those modes set `require-final-newline' to this value when you enable them.
 They do so because they are used for files that are supposed
 to end in newlines, and the question is how to arrange that.
@@ -299,10 +299,16 @@ to end in newlines, and the question is how to arrange that.
 A value of t means do this only when the file is about to be saved.
 A value of `visit' means do this right after the file is visited.
 A value of `visit-save' means do it at both of those times.
-Any other non-nil value means ask user whether to add a newline, when saving."
+Any other non-nil value means ask user whether to add a newline, when saving.
+nil means don't add newlines.
+
+You will have to be careful if you set this to nil: you will have
+to remember to manually add a final newline whenever you finish a
+file that really needs one."
   :type '(choice (const :tag "When visiting" visit)
                 (const :tag "When saving" t)
                 (const :tag "When visiting or saving" visit-save)
+                (const :tag "Never" nil)
                 (other :tag "Ask" ask))
   :group 'editing-basics
   :version "22.1")