Reviewing merge request #3: Fenced Code support for the coehilite extension

Hi,

Here it is, fenced code blocks will now also be highlited by the codehilite extension. Also added a few more options like Formatter style, and the use of inline styles instead of css classes.

Hope you'll like it,

Lucas

Requested by: sh4wn
Status: Merged
Source repository: fenced-code-pygments:master
Target repository: mainline:master
Created at: January 25th, 2010 20:17

Commits that would be merged:

Version 1

Version 1

3587cb2
4e7d92f

Added pygments support to fenced_code

ee6fb73

Refactored codehilite and fenced code, so now fenced code will also be highlited when codehilite extension is enabled

Showing

Showing 3587cb2-4e7d92f

Comments
Include comments entered inline

Oh yeah, my editor automaticly removes trailing spaces, so the diff is a bit fucked.

sh4wn | 2010-01-25 20:17:47 UTC

→ State changed from Open to Merged

Thanks for this. It’s merged now.

Waylan Limberg | 2010-01-26 00:05:41 UTC

Add a new comment:

Login or create an account to post a comment

How to apply this merge request to your repository

One way to merge in these changes is to pull them into a local branch for review, verifying the changes and then merge to back to master.

# Check out a new branch for integration
git checkout -b merge-requests/3

# Fetch the merge request into this branch
git pull \
  git://gitorious.org/python-markdown/mainline.git \
  refs/merge-requests/3

# Show the commits, assess they are okay
git log --pretty=oneline --abbrev-commit master..merge-requests/3

# To apply the changes to your branch:
git checkout master
git merge merge-requests/3
git push origin master

Reviewing merge request #3: Fenced Code support for the coehilite extension

Commits that would be merged:

Comments Include comments entered inline

Add a new comment:

Gitorious

Comments
Include comments entered inline