(c-common-init): Use mode-require-final-newline.

diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index b8264157b48242f3b580b46739a5900ee02d50bd..eaa798217cf3dbc34221959b70cf481dfbf886c3 100644 (file)
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -557,7 +557,8 @@ This function does not do any hidden buffer changes."
   (let ((rfn (assq mode c-require-final-newline)))
     (when rfn
       (make-local-variable 'require-final-newline)
-      (setq require-final-newline (cdr rfn)))))
+      (and (cdr rfn)
+          (setq require-final-newline mode-require-final-newline)))))
 
 (defun c-postprocess-file-styles ()
   "Function that post processes relevant file local variables in CC Mode.