tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity
12,007 Commits 5 Branches 424 Tags 196 MiB
Commit Graph

22 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 6e306f65ff Fix copyright years in maint. 2012-03-17 16:31:04 +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 fdc20f7792 Fix more copyright years. 2012-03-17 14:39:43 +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 e44d2975ff Fix copyright (to 2012) year and Org version (to 7.8.03). 2012-01-03 18:47:01 +01:00
Bastien Guerry 58f1dbccf8 Remove the "Version" header in Org libraries (leave it in org.el). 
Also remove blank lines before the ";;; org*el ends here" declarations.

Having a "Version" header forced us to update every file when releasing a
new version of Org; it also forced us to update every file when merging Org
with Emacs trunk, thus cluttering the diffs between the previously merged
version and the new one with useless information.

Glenn Morris suggested this in emacs-devel:
http://lists.gnu.org/archive/html/emacs-devel/2011-08/msg00322.html
 2011-08-17 14:42:34 +02: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 552b53dcd6 org-choose.el: Revert previous change and implement a better fix 2009-04-09 09:41:05 +02:00
Carsten Dominik 31446d85a3 org-choose.el: Fix bug. 2009-04-08 15:12:20 +02:00
Carsten Dominik 8f819da4d5 org-choose.el: Fix bug with checking siblings 
Org-choose.el would check not only siblings but also any children of
them.

Patch by Tom Breton
 2009-02-24 05:35:00 +01:00
Carsten Dominik 29ff144600 Fix compatibility issues with org-choose.el 
Patch by Tom Breton.
 2009-02-13 22:36:01 +01:00
Carsten Dominik da6fb7448b org-choose: Apply Tom's patch 2009-02-13 07:35:46 +01:00
Carsten Dominik 23551eee32 org-choose: Make XEmacs compatible 2009-02-12 09:37:12 +01:00
Carsten Dominik 6761dcbbd2 Minor fixes 2009-02-12 07:12:38 +01:00
Carsten Dominik 6296225ac6 Fix a bug in org-choose.el 2009-02-10 10:10:44 +01:00
Carsten Dominik dccca7f6bd Add documentation to org-choose.el 2009-02-10 07:51:17 +01:00
Carsten Dominik 71e7e8e4a2 org-choose.el: Remove commented line 2009-02-09 12:43:28 +01:00
Carsten Dominik bc5b23def7 org-choose.el: Append new interpretation for custom widget 
org-choose.el did prepend its new interpretation to the list of
possible interpretations.  Now it appends, as it should.
 2009-02-08 14:12:56 +01:00
Carsten Dominik 56692965b7 Add Tom Breton's org-choose.el as a contributed package 2009-02-08 13:57:37 +01:00