[Emacs-diffs] Changes to emacs/lisp/progmodes/cc-mode.el

[Martin Stjernholm]

Index: emacs/lisp/progmodes/cc-mode.el
diff -c emacs/lisp/progmodes/cc-mode.el:1.22 
emacs/lisp/progmodes/cc-mode.el:1.23
*** emacs/lisp/progmodes/cc-mode.el:1.22        Sun Jan 26 16:36:15 2003
--- emacs/lisp/progmodes/cc-mode.el     Mon Jan 27 19:41:21 2003
***************
*** 299,305 ****
  
    ;; these variables should always be buffer local; they do not affect
    ;; indentation style.
-   (make-local-variable 'require-final-newline)
    (make-local-variable 'parse-sexp-ignore-comments)
    (make-local-variable 'indent-line-function)
    (make-local-variable 'indent-region-function)
--- 299,304 ----
***************
*** 326,333 ****
               'c-indent-new-comment-line)))
  
    ;; now set their values
!   (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
        outline-regexp "[^#\n\^M]"
--- 325,331 ----
               'c-indent-new-comment-line)))
  
    ;; now set their values
!   (setq parse-sexp-ignore-comments t
        indent-line-function 'c-indent-line
        indent-region-function 'c-indent-region
        outline-regexp "[^#\n\^M]"
***************
*** 336,341 ****
--- 334,345 ----
        comment-column 32
        comment-start-skip "/\\*+ *\\|//+ *"
        comment-multi-line t)
+ 
+   ;; Set `require-final-newline' only if we should.
+   (let ((rfn (assq mode c-require-final-newline)))
+     (when rfn
+       (make-local-variable 'require-final-newline)
+       (setq require-final-newline (cdr rfn))))
  
    ;; Fix keyword regexps.
    (c-init-language-vars)