# HG changeset patch
# User Alan Mackenzie <acm@muc.de>
# Date 1182329491 0
# Node ID 2daae59e565e33c7677f4884e1432ff05fec2713
# Parent  d573c63c3515734356582a585454b5aeff1d8d3a
(c-remove-any-local-eval-or-mode-variables): When removing lines, also
remove the \n.  Correction of patch of 2007-04-21.

diff -r d573c63c3515 -r 2daae59e565e lisp/progmodes/cc-mode.el
--- a/lisp/progmodes/cc-mode.el	Wed Jun 20 08:50:10 2007 +0000
+++ b/lisp/progmodes/cc-mode.el	Wed Jun 20 08:51:31 2007 +0000
@@ -790,7 +790,8 @@
   ;; If the buffer specifies `mode' or `eval' in its File Local Variable list
   ;; or on the first line, remove all occurrences.  See
   ;; `c-postprocess-file-styles' for justification.  There is no need to save
-  ;; point here, or even bother too much about the buffer contents.
+  ;; point here, or even bother too much about the buffer contents.  However,
+  ;; DON'T mess up the kill-ring.
   ;;
   ;; Most of the code here is derived from Emacs 21.3's `hack-local-variables'
   ;; in files.el.
@@ -819,8 +820,8 @@
 		      (regexp-quote suffix)
 		      "$")
 	      nil t)
-	(beginning-of-line)
-	(delete-region (point) (progn (end-of-line) (point)))))
+	(forward-line 0)
+	(delete-region (point) (progn (forward-line) (point)))))
 
     ;; Delete the first line, if we've got one, in case it contains a mode spec.
     (unless (and lv-point
@@ -828,7 +829,8 @@
 			(forward-line 0)
 			(bobp)))
       (goto-char (point-min))
-      (delete-region (point) (progn (end-of-line) (point))))))
+      (unless (eobp)
+	(delete-region (point) (progn (forward-line) (point)))))))
 
 (defun c-postprocess-file-styles ()
   "Function that post processes relevant file local variables in CC Mode.