ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,869 Commits 2 Branches 439 Tags 111 MiB
Commit Graph

17 Commits

Author SHA1 Message Date
Bastien Guerry 0beda99171 Revert "Update copyright years." 
This reverts commit 21105594fc.
 2014-01-05 06:28:07 +01:00
Bastien Guerry 21105594fc Update copyright years. 2014-01-04 18:56:11 +01:00
Eric Schulte 6ebc8c8561 export inline svg images with htmlize 2013-05-21 06:42:14 -06:00
Bastien Guerry 7513f16182 contrib/lisp/*el: Fix license information and add "This file is not part..." 
Also do some aesthetic code clean-up in org-drill.el.
 2013-03-10 17:57:47 +01:00
Bastien Guerry fb37d1538d htmlize.el (htmlize-create-auto-links): Fix link regexp 
* htmlize.el (htmlize-create-auto-links): Fix link regexp.

Thanks to Daniel Dehennin for reporting this.
 2013-01-12 14:56:56 +01:00
Bastien Guerry 60b23bdeac Merge branch 'maint' 
Conflicts:
	contrib/lisp/htmlize.el
	etc/schema/od-manifest-schema-v1.2-os.rnc
	etc/schema/od-schema-v1.2-os.rnc
	lisp/org-exp-blocks.el
 2013-01-01 16:06:17 +01:00
Bastien Guerry 98cd4687a2 Update copyright years. 
Happy new year!
 2013-01-01 16:04:24 +01:00
Bastien Guerry 1e6263354e contrib/lisp/htmlize.el: Upgrade to version 1.43 2012-09-25 16:03:28 +02:00
Bastien Guerry ecd0562c5f Fix the master branch. 
I started from the 78ec8e commit then cherry-picked and squashed
commits that have been done in master since then, except the bad
commits that overwrote the tree (in master) with the tree in maint.

This commit also bumps the version number to 7.8.06.

The only "fix" that was made between 78ec8e and the previous commit
is e0072f which has been reported to break stuff.
 2012-03-19 22:01:29 +01:00
Bastien Guerry de42649f7b Manually revert maint to e85080. 
e85080 is the last correct commit in the maint branch
before releasing 7.8.04.  The 7.8.05 release should be
done from this commit.
 2012-03-17 16:28:46 +01:00
Bastien Guerry 73bb18ba37 Manually revert to the Release 7.8.04 tag. 2012-03-17 15:52:24 +01:00
Bastien Guerry 6e534f9c61 Manually revert back to commit e85080. 
This fixes a wrong merge that should not have happened:
commit 7e903a merges the master branch into the maint branch,
while we really want to keep the maint branch a bugfix-only
branch.

This commit reverts back the maint branch to its state before
merging the master branch.  From there, we will fix remaining
problems with the maint branch (e.g. copyright issues) then
release this maint branch as Org-mode 7.8.05.
 2012-03-17 14:34:01 +01:00
Bastien Guerry 346ee30e42 Fix trailing whitespaces for *.el files in contrib/. 2012-01-04 16:21:56 +01:00
Bastien Guerry 681914f32b Copyright year fixes for contrib/. 2012-01-04 15:48:18 +01:00
Bastien Guerry 904ed18bc2 Fix copyright years for elisp files in core and contrib. 
Also add "This file is not part of GNU Emacs." when this is the case.
 2011-08-15 15:23:11 +02:00
Carsten Dominik b6de229d4e Protect htmlize from some buggy fants 2009-05-14 09:33:07 +02:00
Carsten Dominik 139dbfcd20 Bundle htmlize.el with Org in the contrib directory 2009-04-15 17:36:02 +02:00