[Emacs-diffs] Changes to emacs/lisp/files.el

[Luc Teirlinck]

Index: emacs/lisp/files.el
diff -c emacs/lisp/files.el:1.753 emacs/lisp/files.el:1.754
*** emacs/lisp/files.el:1.753   Mon Mar 28 19:58:58 2005
--- emacs/lisp/files.el Fri Apr  1 04:44:04 2005
***************
*** 291,297 ****
    :group 'editing-basics)
  
  (defcustom mode-require-final-newline t
!   "*Whether to add a newline at the end of the 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.
--- 291,297 ----
    :group 'editing-basics)
  
  (defcustom mode-require-final-newline t
!   "*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,308 ****
  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."
    :type '(choice (const :tag "When visiting" visit)
                 (const :tag "When saving" t)
                 (const :tag "When visiting or saving" visit-save)
                 (other :tag "Ask" ask))
    :group 'editing-basics
    :version "22.1")
--- 299,314 ----
  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.
! 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")