Re: [frogs] Patch for removing oldaddlyrics function

["Carl D. Sorensen" <c_sorensen@xxxxxxx>]

On 2/4/09 3:21 PM, "Ian Hulin" <ian@xxxxxxxxxxxx> wrote:

> Hi Carl,
> 
> Carl D. Sorensen wrote:
>>  
>> 
>> 
>> On 2/3/09 7:18 AM, "Graham Percival" <graham@xxxxxxxxxxxxxxxxx>
>> <mailto:graham@xxxxxxxxxxxxxxxxx>  wrote:
>> 
>>   
>>  
>>>  
>>> On Tue, Feb 03, 2009 at 12:32:46AM +0000, Ian Hulin wrote:
>>>     
>>>  
>>>>  
>>>> -------------------------- ly/music-functions-init.ly
>>>> --------------------------
>>>> index 61a8197..82d7114 100644
>>>> @@ -1,6 +1,6 @@
>>>> -% -*-Scheme-*-
>>>> +??????% -*-Scheme-*-
>>>> 
>>>> -\version "2.12.0"
>>>> +\version "2.12.3"
>>>> 
>>>> 
>>>>  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>>>>       
>>>>  
>>>  
>>> Either your text editor is totally screwed, or you misunderstood
>>> -- I was complaining about the -*-Scheme-*- part.  What's with the
>>> change to the first line of this file?
>>>     
>>>  
>>  
>> 
>> Let me try to clarify this.  The first line of the file tells editors to use
>> Scheme style indenting (if they know how to do it).
>> 
>> The change to ??????% -*=Scheme-*-  messes up that selection.
>> 
>> It appears that some unknown character has accidentally been put into the
>> editor on the first line, and it's turned into a bunch of question marks..
>> 
>> Please remove the series of question marks at the beginning of the first
>> line.
>> 
>> The difference between 2.12.0 and 2.12.3 is trivial; there were no syntax
>> changes between 2.12.0 and 2.12.3 that affect this particular file.
>> 
>> Thanks,
>> 
>> Carl
>> 
>> 
>>   
> The junk characters didn't appear on my editor buffer (Jedit) hence the
> confusion about Graham's feedback.  It's the diff operation from the Windows
> version of git that's doing the putting the strange characters in, which I was
> screen-scraping into a text to send as the patch.  So can I just edit the text
> file to take the junk characters out, will a difference section with no
> differing text screw up applying the patch? I hope not, so I'm sending the
> amended patch file.  I reckon the junk characters got in because I had Windows
> line-ends set at some stage,
> 
> HTH
> 
> Cheers,
> 
> Ian

Ian,

What if you just use git format-patch, instead of git diff?  It will create
a file for you and should avoid screen-scraping.

Carl
> 


---

----
Join the Frogs!