From: Lennart Borgman <lennart.borgman@gmail.com>
To: Xah Lee <xahlee@gmail.com>
Cc: help-gnu-emacs@gnu.org
Subject: Re: how to patch diff into source code?
Date: Wed, 21 Jan 2009 22:29:50 +0100 [thread overview]
Message-ID: <e01d8a50901211329n7fc2e1c6hfaed094a97afdbe7@mail.gmail.com> (raw)
In-Reply-To: <cd7ab62a-714e-4876-94bd-dda6cdff2269@r15g2000prd.googlegroups.com>
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.
next prev parent reply other threads:[~2009-01-21 21:29 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-21 2:08 how to patch diff into source code? Xah Lee
2009-01-21 21:29 ` Lennart Borgman [this message]
2009-01-21 21:30 ` Xah Lee
2009-01-21 22:55 ` Ian Eure
2009-01-21 23:23 ` Juanma Barranquero
[not found] ` <mailman.5472.1232580233.26697.help-gnu-emacs@gnu.org>
2009-01-21 23:33 ` Xah Lee
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e01d8a50901211329n7fc2e1c6hfaed094a97afdbe7@mail.gmail.com \
--to=lennart.borgman@gmail.com \
--cc=help-gnu-emacs@gnu.org \
--cc=xahlee@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).