tags 428898 patch fixed-upstream
thanks

This issue has been fixed upstream with the following patch, which
will be included in Emacs 22.2 :

2007-06-18  Alan Mackenzie  <[EMAIL PROTECTED]>

        * progmodes/cc-mode.el (c-remove-any-local-eval-or-mode-variables):
        When removing lines, also remove the \n.  Correction of patch of
        2007-04-21.


--- cc-mode.el  2007/04/28 20:39:11     1.58.2.1
+++ cc-mode.el  2007/06/20 08:27:53     1.58.2.2
@@ -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.


Regards,

Sven


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to