Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make backquoted inline code only work on a single line #4290

Merged
merged 1 commit into from
Jan 13, 2015

Conversation

adamdruppe
Copy link
Contributor

Andrei pointed out linker errors copy/pasted into Phobos doc are written `like this'. That would break things since the backtick was never closed.

This change does what github does in that case: the paired backticks must occur on the same line. If backtick is open when a newline is encountered, the tick is canceled and the text output normally.

andralex added a commit that referenced this pull request Jan 13, 2015
Make backquoted inline code only work on a single line
@andralex andralex merged commit 6268b82 into dlang:master Jan 13, 2015
@andralex
Copy link
Member

awes

@rainers
Copy link
Member

rainers commented Jan 14, 2015

ddocbackticks.html kills the git experience on Windows for me, because it is considered modified, but nothing works to get it out of the way. A lot of operations are blocked by error: Your local changes to the following files would be overwritten by merge.

I suspect that this happens because ddocbackticks.html has CRLF line endings. ddoc10336.html has these aswell and has caused trouble in the past, but currently works.

@yebblies
Copy link
Member

Do you have autocrlf turned on? You shouldn't have any problems when it's off.

@rainers
Copy link
Member

rainers commented Jan 14, 2015

Yes, but that's the default for git on Windows. Unfortunately, Visual Studio also adds CRLF whenever adding lines, so you get mixed line endings when using LF-only files.

@yebblies
Copy link
Member

It may be the default, but you can turn it off. And you should, because it's horrible.

And yeah, if you're using visual studio you're going to need to watch out for mixed line endings.

@rainers
Copy link
Member

rainers commented Jan 14, 2015

I remember having tried turning autocrlf off when ddoc10336.html was causing troubles, but that was also a disaster. I guess I'll have to find/write some VS extension that handles this better...

@MartinNowak
Copy link
Member

So let's just use LF then, that's also what the editorconfig says (not yet for HTML though).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants