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

Added support for switching OPI buffer to emulator #135

Merged
merged 1 commit into from Feb 9, 2014

Conversation

yjaradin
Copy link
Member

@yjaradin yjaradin commented Feb 9, 2014

Fixes #107
This uses a new property (errors.prefix) rather than relying on oz.standalone and magic values in the emulator.

@@ -117,6 +117,15 @@ public:
ozVSGet(vm, value, valueBufSize, valueStr);

auto& stream = boolToStdErr ? std::cerr : std::cout;

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have spaces at EOL here. (They show up in the GitHub diff if you select the text.) Spaces at EOL are a source of merge conflicts and weird diffs in the future, so they should be avoided.

I suggest you configure your editor to automatically remove spaces at EOL (and add an EOL at EOF) when saving the file.

@yjaradin
Copy link
Member Author

yjaradin commented Feb 9, 2014

@sjrd I fixed both issues in my working dir. Do you prefer for me to amend my commit and force push the branch or to add a second commit to the branch?

@sjrd
Copy link
Member

sjrd commented Feb 9, 2014

I prefer that you amend and force push.

Fixes mozart#107
This uses a new property (errors.prefix) rather than relying on oz.standalone and magic values in the emulator.
@sjrd
Copy link
Member

sjrd commented Feb 9, 2014

LGTM. Thanks :)

sjrd added a commit that referenced this pull request Feb 9, 2014
Added support for switching OPI buffer to emulator
@sjrd sjrd merged commit f4322eb into mozart:master Feb 9, 2014
@yjaradin yjaradin deleted the fixBufferSwitching branch February 9, 2014 22:34
eregon pushed a commit to eregon/mozart2 that referenced this pull request Oct 12, 2016
Added support for switching OPI buffer to emulator
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.

Emacs does not switch to Oz Emulator buffer to show errors
2 participants