From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Xah Lee Newsgroups: gmane.emacs.help Subject: Re: how to patch diff into source code? Date: Wed, 21 Jan 2009 13:30:12 -0800 (PST) Organization: http://groups.google.com Message-ID: <527e7ac7-9456-4615-92ff-7d5d34aff055@s1g2000prg.googlegroups.com> References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1232603070 17399 80.91.229.12 (22 Jan 2009 05:44:30 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 22 Jan 2009 05:44:30 +0000 (UTC) To: help-gnu-emacs@gnu.org Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Thu Jan 22 06:45:05 2009 Return-path: Envelope-to: geh-help-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1LPsN9-0003XK-Iv for geh-help-gnu-emacs@m.gmane.org; Thu, 22 Jan 2009 06:45:00 +0100 Original-Received: from localhost ([127.0.0.1]:44327 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LPsLs-0001Bc-4N for geh-help-gnu-emacs@m.gmane.org; Thu, 22 Jan 2009 00:43:40 -0500 Original-Path: news.stanford.edu!newsfeed.stanford.edu!postnews.google.com!s1g2000prg.googlegroups.com!not-for-mail Original-Newsgroups: gnu.emacs.help,comp.emacs Original-Lines: 44 Original-NNTP-Posting-Host: 24.6.175.142 Original-X-Trace: posting.google.com 1232573412 29708 127.0.0.1 (21 Jan 2009 21:30:12 GMT) Original-X-Complaints-To: groups-abuse@google.com Original-NNTP-Posting-Date: Wed, 21 Jan 2009 21:30:12 +0000 (UTC) Complaints-To: groups-abuse@google.com Injection-Info: s1g2000prg.googlegroups.com; posting-host=24.6.175.142; posting-account=bRPKjQoAAACxZsR8_VPXCX27T2YcsyMA User-Agent: G2/1.0 X-HTTP-UserAgent: Mozilla/5.0 (Macintosh; U; PPC Mac OS X 10_4_11; en) AppleWebKit/525.27.1 (KHTML, like Gecko) Version/3.2.1 Safari/525.27.1, gzip(gfe), gzip(gfe) Original-Xref: news.stanford.edu gnu.emacs.help:166219 comp.emacs:97682 X-Mailman-Approved-At: Thu, 22 Jan 2009 00:42:50 -0500 X-BeenThere: help-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Users list for the GNU Emacs text editor List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Errors-To: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.help:61552 Archived-At: it turns out the patch is corrupted by email. Xah On Jan 20, 6:08=C2=A0pm, Xah Lee wrote: > could anyone help me with a diff/patch question? > > i got the following patch: > > --- lisp\textmodes\css-mode.el.orig =C2=A0 =C2=A0 2008-03-01 20:28:16.000= 000000 > +0100 > +++ lisp\textmodes\css-mode.el =C2=A02009-01-19 09:14:55.138125000 +0100 > @@ -369,5 +369,5 @@ > =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0(forward-comment (- (point-max))) > =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0;; FIXME: We should also skip punctuation. > - =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0(not (memq (char-before) '(?\; ?\ > {))))))))))) > + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0(not (or (bobp) (memq (char-before) '(?\; > ?\{)))))))))))) > > =C2=A0(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=E2=80=A3Apply 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? > > Thanks. > > =C2=A0Xah > =E2=88=91http://xahlee.org/ > > =E2=98=84