Skip to content

Add .gitattributes file#122

Closed
rcdailey wants to merge 1 commit intonotepad-plus-plus:masterfrom
rcdailey:git-attributes
Closed

Add .gitattributes file#122
rcdailey wants to merge 1 commit intonotepad-plus-plus:masterfrom
rcdailey:git-attributes

Conversation

@rcdailey
Copy link
Copy Markdown
Contributor

@rcdailey rcdailey commented May 27, 2015

Only adding .gitattributes file this time. Note that you should highly consider normalizing line endings one way or another before you commit this to your repo publicly, otherwise EOL hell will ensue.

@rcdailey
Add .gitattributes file
940a86d 
Convert line endings to CRLF on checkout for Windows batch
scripts and Visual Studio solution/project files.
@milipili milipili added the enhancement Proposed enhancements of existing features label Jun 25, 2015
@milipili milipili closed this in d2f0649 Jul 15, 2015
@Rikk
Copy link
Copy Markdown
Contributor

Rikk commented Jul 16, 2015

Why the need to explicitly set eol=crlf for some files?
Local repositories in Windows will have CRLF automatically, because core.autocrlf = true is default.
* text=auto normalizes eol, making it LF in remote.

@milipili
Copy link
Copy Markdown
Contributor

milipili commented Jul 16, 2015

It depends of the client configuration. core.autocrlf is not always set. I disagree on using gitattributes for that. For me the default configuration should checkout as-is, commit as-is from Windows Git. Unfortunately this is not the case for most users...
Making LF in remote should not be bad anyway since all source code will be converted that way.

@Rikk
Copy link
Copy Markdown
Contributor

Rikk commented Jul 16, 2015

My question is: why *.bat, *.sln, *.vcxproj need eol=crlf on remote(github)? (maybe I was too implicit above)

@milipili
Copy link
Copy Markdown
Contributor

milipili commented Jul 16, 2015

I don't understand on remote=github. Git attributes are used on checkout.
https://help.github.com/articles/dealing-with-line-endings/#platform-all

@Rikk
Copy link
Copy Markdown
Contributor

Rikk commented Jul 16, 2015

text
This attribute enables and controls end-of-line normalization. When a text file is normalized, its line endings are converted to LF in the repository. To control what line ending style is used in the working directory, use the eol attribute for a single file and the core.eol configuration variable for all text files.
source

Suppose one's working directory uses LF, we need to force .bat, .sln, .vcxproj files into CRLF because:
VC++ has problem with LF? or,
Git does not detect it as text in * text=auto?

@milipili
Copy link
Copy Markdown
Contributor

milipili commented Jul 16, 2015

You're right. It already annoys me. We will see later once all files have proper line endings.

@Rikk
Copy link
Copy Markdown
Contributor

Rikk commented Jul 16, 2015

Imo only 3 had errors (mixed eol), see #508.
Oh why you reverted? * text=auto seemed a good thing 😢

@milipili
Copy link
Copy Markdown
Contributor

milipili commented Jul 16, 2015

It is just temporary :)

chcg added a commit to chcg/notepad-plus-plus that referenced this pull request Feb 9, 2023
@chcg
Update to Scintilla 5.3.3 and Lexilla 5.2.2
a4f32cc 
update to https://www.scintilla.org/scintilla533.zip with:

    Released 8 February 2023.
    Fix SCI_LINESJOIN bug where carriage returns were incorrectly retained. Bug notepad-plus-plus#2372.
    Fix SCI_VERTICALCENTRECARET to update the vertical scroll position.
    When an autocompletion list is shown in response to SCN_CHARADDED, do not process character as fill-up or stop. This avoids closing immediately when a character may both trigger and finish autocompletion.
    On Cocoa fix character input bug where dotless 'i' and some other extended Latin characters could not be entered. The change also stops SCI_ASSIGNCMDKEY from working with these characters on Cocoa. Bug notepad-plus-plus#2374.
    On GTK, support IME context. Feature notepad-plus-plus#1476.
    On GTK on Win32, fix scrolling speed to not be too fast. Bug notepad-plus-plus#2375.
    On Qt, fix indicator drawing past left of text pane over margin. Bug notepad-plus-plus#2373, Bug notepad-plus-plus#1956.
    On Qt, allow scrolling with mouse wheel when scroll bar hidden.

and https://www.scintilla.org/lexilla522.zip with

    Released 8 February 2023.
    C++: Fix keywords that start with non-ASCII. Also affects other lexers. Issue notepad-plus-plus#130.
    Matlab: Include more prefix and suffix characters in numeric literals. Issue notepad-plus-plus#120.
    Matlab: More accurate treatment of line ends inside strings. Matlab and Octave are different here. Issue notepad-plus-plus#18.
    Modula-3: Don't treat identifier suffix that matches keyword as keyword. Issue notepad-plus-plus#129.
    Modula-3: Fix endless loop in folder. Issue notepad-plus-plus#128.
    Modula-3: Fix access to lines beyond document end in folder. Issue notepad-plus-plus#131.
    Python: Don't highlight match and case as keywords in contexts where they probably aren't used as keywords. Pull request notepad-plus-plus#122.
    X12: Support empty envelopes. Bug notepad-plus-plus#2369.
chcg added a commit to chcg/notepad-plus-plus that referenced this pull request Feb 9, 2023
@chcg
Update to Scintilla 5.3.3 and Lexilla 5.2.2
093a015 
update to https://www.scintilla.org/scintilla533.zip with:

    Released 8 February 2023.
    Fix SCI_LINESJOIN bug where carriage returns were incorrectly retained. Bug notepad-plus-plus#2372.
    Fix SCI_VERTICALCENTRECARET to update the vertical scroll position.
    When an autocompletion list is shown in response to SCN_CHARADDED, do not process character as fill-up or stop. This avoids closing immediately when a character may both trigger and finish autocompletion.
    On Cocoa fix character input bug where dotless 'i' and some other extended Latin characters could not be entered. The change also stops SCI_ASSIGNCMDKEY from working with these characters on Cocoa. Bug notepad-plus-plus#2374.
    On GTK, support IME context. Feature notepad-plus-plus#1476.
    On GTK on Win32, fix scrolling speed to not be too fast. Bug notepad-plus-plus#2375.
    On Qt, fix indicator drawing past left of text pane over margin. Bug notepad-plus-plus#2373, Bug notepad-plus-plus#1956.
    On Qt, allow scrolling with mouse wheel when scroll bar hidden.

and https://www.scintilla.org/lexilla522.zip with

    Released 8 February 2023.
    C++: Fix keywords that start with non-ASCII. Also affects other lexers. Issue notepad-plus-plus#130.
    Matlab: Include more prefix and suffix characters in numeric literals. Issue notepad-plus-plus#120.
    Matlab: More accurate treatment of line ends inside strings. Matlab and Octave are different here. Issue notepad-plus-plus#18.
    Modula-3: Don't treat identifier suffix that matches keyword as keyword. Issue notepad-plus-plus#129.
    Modula-3: Fix endless loop in folder. Issue notepad-plus-plus#128.
    Modula-3: Fix access to lines beyond document end in folder. Issue notepad-plus-plus#131.
    Python: Don't highlight match and case as keywords in contexts where they probably aren't used as keywords. Pull request notepad-plus-plus#122.
    X12: Support empty envelopes. Bug notepad-plus-plus#2369.

update CMakeLists.txt to latest changes within vcxproj file
@chcg chcg mentioned this pull request Feb 9, 2023
Closed
chcg added a commit to chcg/notepad-plus-plus that referenced this pull request Feb 10, 2023
@chcg
Update to Scintilla 5.3.3 and Lexilla 5.2.2
3b9f557 
update to https://www.scintilla.org/scintilla533.zip with:

    Released 8 February 2023.
    Fix SCI_LINESJOIN bug where carriage returns were incorrectly retained. Bug notepad-plus-plus#2372.
    Fix SCI_VERTICALCENTRECARET to update the vertical scroll position.
    When an autocompletion list is shown in response to SCN_CHARADDED, do not process character as fill-up or stop. This avoids closing immediately when a character may both trigger and finish autocompletion.
    On Cocoa fix character input bug where dotless 'i' and some other extended Latin characters could not be entered. The change also stops SCI_ASSIGNCMDKEY from working with these characters on Cocoa. Bug notepad-plus-plus#2374.
    On GTK, support IME context. Feature notepad-plus-plus#1476.
    On GTK on Win32, fix scrolling speed to not be too fast. Bug notepad-plus-plus#2375.
    On Qt, fix indicator drawing past left of text pane over margin. Bug notepad-plus-plus#2373, Bug notepad-plus-plus#1956.
    On Qt, allow scrolling with mouse wheel when scroll bar hidden.

and https://www.scintilla.org/lexilla522.zip with

    Released 8 February 2023.
    C++: Fix keywords that start with non-ASCII. Also affects other lexers. Issue notepad-plus-plus#130.
    Matlab: Include more prefix and suffix characters in numeric literals. Issue notepad-plus-plus#120.
    Matlab: More accurate treatment of line ends inside strings. Matlab and Octave are different here. Issue notepad-plus-plus#18.
    Modula-3: Don't treat identifier suffix that matches keyword as keyword. Issue notepad-plus-plus#129.
    Modula-3: Fix endless loop in folder. Issue notepad-plus-plus#128.
    Modula-3: Fix access to lines beyond document end in folder. Issue notepad-plus-plus#131.
    Python: Don't highlight match and case as keywords in contexts where they probably aren't used as keywords. Pull request notepad-plus-plus#122.
    X12: Support empty envelopes. Bug notepad-plus-plus#2369.

update CMakeLists.txt to latest changes within vcxproj file
chcg added a commit to chcg/notepad-plus-plus that referenced this pull request Feb 11, 2023
@chcg
Update to Scintilla 5.3.3 and Lexilla 5.2.2
73c7cde 
update to https://www.scintilla.org/scintilla533.zip with:

    Released 8 February 2023.
    Fix SCI_LINESJOIN bug where carriage returns were incorrectly retained. Bug notepad-plus-plus#2372.
    Fix SCI_VERTICALCENTRECARET to update the vertical scroll position.
    When an autocompletion list is shown in response to SCN_CHARADDED, do not process character as fill-up or stop. This avoids closing immediately when a character may both trigger and finish autocompletion.
    On Cocoa fix character input bug where dotless 'i' and some other extended Latin characters could not be entered. The change also stops SCI_ASSIGNCMDKEY from working with these characters on Cocoa. Bug notepad-plus-plus#2374.
    On GTK, support IME context. Feature notepad-plus-plus#1476.
    On GTK on Win32, fix scrolling speed to not be too fast. Bug notepad-plus-plus#2375.
    On Qt, fix indicator drawing past left of text pane over margin. Bug notepad-plus-plus#2373, Bug notepad-plus-plus#1956.
    On Qt, allow scrolling with mouse wheel when scroll bar hidden.

and https://www.scintilla.org/lexilla522.zip with

    Released 8 February 2023.
    C++: Fix keywords that start with non-ASCII. Also affects other lexers. Issue notepad-plus-plus#130.
    Matlab: Include more prefix and suffix characters in numeric literals. Issue notepad-plus-plus#120.
    Matlab: More accurate treatment of line ends inside strings. Matlab and Octave are different here. Issue notepad-plus-plus#18.
    Modula-3: Don't treat identifier suffix that matches keyword as keyword. Issue notepad-plus-plus#129.
    Modula-3: Fix endless loop in folder. Issue notepad-plus-plus#128.
    Modula-3: Fix access to lines beyond document end in folder. Issue notepad-plus-plus#131.
    Python: Don't highlight match and case as keywords in contexts where they probably aren't used as keywords. Pull request notepad-plus-plus#122.
    X12: Support empty envelopes. Bug notepad-plus-plus#2369.

update CMakeLists.txt to latest changes within vcxproj file
donho pushed a commit to donho/notepad-plus-plus that referenced this pull request Feb 12, 2023
@chcg @donho
Update to Scintilla 5.3.3 and Lexilla 5.2.2
43182e1 
update to https://www.scintilla.org/scintilla533.zip with:

   1. Released 8 February 2023.
   2. Fix SCI_LINESJOIN bug where carriage returns were incorrectly retained. Bug notepad-plus-plus#2372.
   3. Fix SCI_VERTICALCENTRECARET to update the vertical scroll position.
   4. When an autocompletion list is shown in response to SCN_CHARADDED, do not process character as fill-up or stop. This avoids closing immediately when a character may both trigger and finish autocompletion.
   5. On Cocoa fix character input bug where dotless 'i' and some other extended Latin characters could not be entered. The change also stops SCI_ASSIGNCMDKEY from working with these characters on Cocoa. Bug notepad-plus-plus#2374.
   6. On GTK, support IME context. Feature notepad-plus-plus#1476.
   7. On GTK on Win32, fix scrolling speed to not be too fast. Bug notepad-plus-plus#2375.
   8. On Qt, fix indicator drawing past left of text pane over margin. Bug notepad-plus-plus#2373, Bug notepad-plus-plus#1956.
   9. On Qt, allow scrolling with mouse wheel when scroll bar hidden.

and https://www.scintilla.org/lexilla522.zip with

   1. Released 8 February 2023.
   2. C++: Fix keywords that start with non-ASCII. Also affects other lexers. Issue notepad-plus-plus#130.
   3. Matlab: Include more prefix and suffix characters in numeric literals. Issue notepad-plus-plus#120.
   4. Matlab: More accurate treatment of line ends inside strings. Matlab and Octave are different here. Issue notepad-plus-plus#18.
   5. Modula-3: Don't treat identifier suffix that matches keyword as keyword. Issue notepad-plus-plus#129.
   6. Modula-3: Fix endless loop in folder. Issue notepad-plus-plus#128.
   7. Modula-3: Fix access to lines beyond document end in folder. Issue notepad-plus-plus#131.
   8. Python: Don't highlight match and case as keywords in contexts where they probably aren't used as keywords. Pull request notepad-plus-plus#122.
   9. X12: Support empty envelopes. Bug notepad-plus-plus#2369.

update CMakeLists.txt to latest changes within vcxproj file

Close notepad-plus-plus#13082
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

enhancement Proposed enhancements of existing features

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@rcdailey @Rikk @milipili