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
98cd4687a2
Update copyright years.
...
Happy new year!
2013-01-01 16:04:24 +01:00
5de94e46e4
Merge branch 'maint'
2012-12-20 13:16:47 +01:00
bfb9f9d10f
Use (point-marker) instead of (move-marker (make-marker) (point))
...
* org-agenda.el (org-agenda-get-restriction-and-command): Use `point-marker'.
* org-capture.el (org-capture-place-template): Likewise.
* org-colview-xemacs.el (org-dblock-write:columnview): Likewise.
* org-colview.el (org-dblock-write:columnview): Likewise.
* org-mobile.el (org-mobile-locate-entry): Likewise.
* org-table.el (org-table-convert-region): Likewise.
* org.el (org-update-statistics-cookies): Likewise.
* contrib/lisp/org-invoice.el (org-dblock-write:invoice): Likewise.
2012-12-20 13:16:41 +01:00
4c7dcd0830
Silence byte compiler
...
* contrib/lisp/org-invoice.el (org-invoice-info-to-table,
org-invoice-list-to-table): Silence byte compiler.
* lisp/org-agenda.el (org-agenda-show-clocking-issues,
org-agenda-format-item): Silence byte compiler.
* lisp/org-colview-xemacs.el (org-agenda-columns): Silence byte
compiler.
* lisp/org-colview.el (org-agenda-columns): Silence byte compiler.
* lisp/org.el (org-properties-postprocess-alist): Silence byte
compiler.
Function renaming was necessary as of
a00a7b2918
2012-11-17 15:51:26 +01:00
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
6e306f65ff
Fix copyright years in maint.
2012-03-17 16:31:04 +01:00
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
73bb18ba37
Manually revert to the Release 7.8.04 tag.
2012-03-17 15:52:24 +01:00
fdc20f7792
Fix more copyright years.
2012-03-17 14:39:43 +01:00
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
346ee30e42
Fix trailing whitespaces for *.el files in contrib/.
2012-01-04 16:21:56 +01:00
e44d2975ff
Fix copyright (to 2012) year and Org version (to 7.8.03).
2012-01-03 18:47:01 +01:00
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
738ba015a3
Install new contributed package org-invoice.el by Peter Jones
2009-09-16 14:19:17 +01:00
Bastien Guerry
Dmitry Antipov
Nicolas Goaziou
Carsten Dominik