bug#11841: 24.1; emacs hangs when opening cpp file with mixed eol styles

[Stefan Monnier]

> --- a/cc-engine.el    Sun Apr 22 09:42:29 2012 +0000
> +++ b/cc-engine.el    Fri Jul 20 20:52:39 2012 +0000
> @@ -1455,7 +1455,12 @@
>           (not (bobp))
 
>           (if (let (open-paren-in-column-0-is-defun-start)
> -               (forward-comment -1))
> +               (or (forward-comment -1)
> +                   ;; Cope specifically with ^M^J here -
> +                   ;; forward-comment gets stuck at ^Ms.
> +                   (and (eq (char-before) ?\r)
> +                        (progn (backward-char)
> +                               (forward-comment -1)))))
>               (if (looking-at "\\*/")
>                   ;; Emacs <= 20 and XEmacs move back over the
>                   ;; closer of a block comment that lacks an opener.

Hard to believe you'd prefer such an ugly workaround instead of just
fixing the syntax of ^M.


        Stefan