From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/73993 Path: news.gmane.org!not-for-mail From: Katsumi Yamaoka Newsgroups: gmane.emacs.gnus.general Subject: Re: git newbie errors Date: Wed, 10 Nov 2010 11:15:07 +0900 Organization: Emacsen advocacy group Message-ID: References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1289355385 31568 80.91.229.12 (10 Nov 2010 02:16:25 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 10 Nov 2010 02:16:25 +0000 (UTC) To: ding@gnus.org Original-X-From: ding-owner+M22361@lists.math.uh.edu Wed Nov 10 03:16:21 2010 Return-path: Envelope-to: ding-account@gmane.org Original-Received: from util0.math.uh.edu ([129.7.128.18]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PG0EW-0007oG-VY for ding-account@gmane.org; Wed, 10 Nov 2010 03:16:21 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.math.uh.edu) by util0.math.uh.edu with smtp (Exim 4.63) (envelope-from ) id 1PG0E7-0008P8-BU; Tue, 09 Nov 2010 20:15:55 -0600 Original-Received: from mx2.math.uh.edu ([129.7.128.33]) by util0.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.63) (envelope-from ) id 1PG0E5-0008Ou-KL for ding@lists.math.uh.edu; Tue, 09 Nov 2010 20:15:53 -0600 Original-Received: from quimby.gnus.org ([80.91.231.51]) by mx2.math.uh.edu with esmtp (Exim 4.72) (envelope-from ) id 1PG0E0-0005eE-Me for ding@lists.math.uh.edu; Tue, 09 Nov 2010 20:15:52 -0600 Original-Received: from orlando.hostforweb.net ([216.246.45.90]) by quimby.gnus.org with esmtp (Exim 3.36 #1 (Debian)) id 1PG0Dz-00014S-00 for ; Wed, 10 Nov 2010 03:15:47 +0100 Original-Received: from localhost ([127.0.0.1]:51229) by orlando.hostforweb.net with esmtpa (Exim 4.69) (envelope-from ) id 1PG0DR-0001wW-0g for ding@gnus.org; Tue, 09 Nov 2010 20:15:13 -0600 X-Hashcash: 1:20:101110:ding@gnus.org::xCcMJEkVcE/wO9iw:000008bh X-Face: #kKnN,xUnmKia.'[pp`;Omh}odZK)?7wQSl"4o04=EixTF+V[""w~iNbM9ZL+.b*_CxUmFk B#Fu[*?MZZH@IkN:!"\w%I_zt>[$nm7nQosZ<3eu;B:$Q_:p!',P.c0-_Cy[dz4oIpw0ESA^D*1Lw= L&i*6&( User-Agent: Gnus/5.110011 (No Gnus v0.11) Emacs/24.0.50 (gnu/linux) Cancel-Lock: sha1:YVZLo9Mg70Sn5LLzJltXviKS+Q4= X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - orlando.hostforweb.net X-AntiAbuse: Original Domain - gnus.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - jpl.org X-Source: X-Source-Args: X-Source-Dir: X-Spam-Score: -1.9 (-) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:73993 Archived-At: Lars Magne Ingebrigtsen wrote: > I did... something... just now that probably removed Sven, Glenn, and > Katsumi's last three patches. I'm not quite sure what. > But I've tried reapplying them, but have a look... Er, I don't know what happened in your side. I did: When I was about to apply Sven's patch, I found nnbabyl.el has been changed by Glenn in the Emacs trunk. So, I put Glenn's change and Sven's patch into the local copy of Gnus git, and updated the ChangeLog locally. And then: git commit --author='Glenn...' -m '...' lisp/nnbabyl.el git push git commit --author='Sven...' -m '...' lisp/message.el git push git commit -m Update. lisp/ChangeLog git push (Maybe a better way was to push Glenn's change and its log, and then to put Sven's change and its log.) Before them I noticed "(was Re: ...)" in subject was not removed even though message-subject-trailing-was-query is t (to which Lars has changed it in 2010-10-31). Try replying to the article: Therefore I changed message-subject-trailing-was-regexp slightly. See: Now "(was Re: ...)" got not being deleted again. :< BTW, I wondered why there are two regexps message-subject-trailing-was-ask-regexp and message-subject-trailing-was-regexp. Is there any reason unable to integrate them into one?