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

15 Commits

Author SHA1 Message Date
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 54ead894de Remove "Version" tag in ob-fortran.el and org-eshell.el. 2012-03-17 16:42:25 +01:00
Bastien Guerry 218e8e444a Update version 7.8.05 2012-03-17 16:41:44 +01:00
Bastien Guerry 560624fcc7 Set version 7.8.04 in maint. 2012-03-17 16:32:53 +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 b058173c6c Don't use the "Version:" tag elsewhere than in org.el 
This commit prepares the maint>master merge, which otherwise
results in merge conflicts.
 2012-03-17 14:43:21 +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 d254b05500 Revert "Release 7.8.04" 
This reverts commit 78ec8e21b8.
 2012-03-17 14:24:27 +01:00
Bastien Guerry 78ec8e21b8 Release 7.8.04 2012-03-16 19:04:04 +00:00
Bastien Guerry 710c073971 Don't use (end-of-buffer) in code. 
* org-eshell.el (org-eshell-open): Use (goto-char (point-max))
instead of (end-of-buffer).
 2012-01-05 17:58:40 +01:00
Bastien Guerry 8931636eae Copyright, license, and header fixes. 
Thanks to Glenn Morris for this fix in Emacs trunk.
 2012-01-05 09:43:21 +01:00
Bastien Guerry f1500f2b04 More fixes to the copyright year... 2012-01-04 16:12:43 +01:00
Bastien Guerry e44d2975ff Fix copyright (to 2012) year and Org version (to 7.8.03). 2012-01-03 18:47:01 +01:00
Bastien Guerry a0f2396f8f Move org-eshell.el by Konrad Hinsen to Org's core. 
* org-eshell.el: New file.
 2011-12-21 09:43:48 +01:00