Re: how to patch diff into source code?

[Lennart Borgman]

On Wed, Jan 21, 2009 at 3:08 AM, Xah Lee <xahlee@gmail.com> wrote:
> could anyone help me with a diff/patch question?
>
> i got the following patch:
>
> --- lisp\textmodes\css-mode.el.orig     2008-03-01 20:28:16.000000000
> +0100
> +++ lisp\textmodes\css-mode.el  2009-01-19 09:14:55.138125000 +0100
> @@ -369,5 +369,5 @@
>                           (forward-comment (- (point-max)))
>                           ;; FIXME: We should also skip punctuation.
> -                          (not (memq (char-before) '(?\; ?\
> {)))))))))))
> +                          (not (or (bobp) (memq (char-before) '(?\;
> ?\{))))))))))))
>
>  (defun css-forward-sexp (n)
>
> how do i use diff (or other?) to merge it into source?
> i've never used diff for patching.
>
> i just found and used menu Tools‣Apply Patch, but then i got
>
> patching file /Users/xah/web/emacs/css-mode.el
> patch: **** malformed patch at line 8: ?\{))))))))))))
>
> is it something i did wrong or the patch?

I know very little about diff, but it looks like the -+ rows are
wrapped. However when I recently applied a patch with CVS Emacs (using
the commands in the Diff menu) Emacs asked me if it should correct the
wrapped lines.