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

protect CRLF from carriage-return action #1118

Merged
merged 1 commit into from Dec 9, 2011
Merged

Conversation

minrk
Copy link
Member

@minrk minrk commented Dec 7, 2011

Carriage return action introduced in PR #1089 clears a line in the qtconsole, which means that CRLF line endings would replace whole lines with '\n', thus hiding the output of ls and ~all system calls.

This changes the behavior to only act on CR if it is not followed by LF.

Test included.

closes #1111

CarriageReturn action introduced in ipython#1089 clears a line in the qtconsole, which means that CRLF line endings would replace whole lines with '\n'.

This changes the regex to only match `\r` not followed by `\n` preventing the CR action from firing on CRLF.

Test included

closes ipython#1111
@minrk
Copy link
Member Author

minrk commented Dec 9, 2011

updated to just change the regex to match \r not followed by \n

@minrk minrk merged commit 814d5b9 into ipython:master Dec 9, 2011
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.

ls broken after merge of #1089
1 participant