2 files changed, 8 insertions, 1 deletions

diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index 40e5a3107a8..5148ff72dea 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -326,7 +326,7 @@
                'c-indent-new-comment-line)))
 
   ;; now set their values
-  (setq require-final-newline t
+  (setq require-final-newline c-require-final-newline
         parse-sexp-ignore-comments t
         indent-line-function 'c-indent-line
         indent-region-function 'c-indent-region
diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el
index 2b88a131776..50b09160ee3 100644
--- a/lisp/progmodes/cc-vars.el
+++ b/lisp/progmodes/cc-vars.el
@@ -704,6 +704,13 @@ space."
   :type 'function
   :group 'c)
 
+(defcustom c-require-final-newline t
+  "*Controls whether a final newline is added to the file when saved.
+This value is given to `require-final-newline' at mode initialization;
+see that variable for details."
+  :type 'symbol
+  :group 'c)
+
 (defcustom c-electric-pound-behavior nil
   "*List of behaviors for electric pound insertion.
 Only currently supported behavior is `alignleft'."