Commit Graph

11309 Commits

Author SHA1 Message Date
Bastien Guerry fe87e69108 mk/server.mk: More compact help. 2012-08-26 20:22:57 +02:00
Bastien Guerry 140bf0fb81 Merge branch 'maint' 2012-08-26 20:20:45 +02:00
Bastien Guerry 72a2df1aee mk/server.mk: Set SERVROOT and SERVERMK and add more help 2012-08-26 20:20:34 +02:00
Bastien Guerry cc215fcf16 Merge branch 'maint' of orgmode.org:org-mode into maint 2012-08-26 20:04:54 +02:00
Bastien Guerry 4bde726bbb * org-compat.el (org-check-version): Autoload. 2012-08-26 20:04:41 +02:00
Achim Gratz 6c9a6ae8d1 Merge branch 'maint' 2012-08-26 20:02:59 +02:00
Achim Gratz ac0667b841 Makefile: add description of ORG_ADD_CONTRIB to info documentation
* doc/org.texi: Add description of ORG_ADD_CONTRIB to info
  documentation.  Add link to Worg for more details.
2012-08-26 20:01:24 +02:00
Achim Gratz 84ab3a0d4d Merge branch 'maint' 2012-08-26 19:30:32 +02:00
Achim Gratz fe599cfe88 Makefile: fix location of default.mk in org-fixup.el
* mk/org-fixup.el: Fix location of default.mk, now in mk/default.mk.
2012-08-26 19:29:45 +02:00
Sean O'Halpin 4b6b6f4799 Make it possible to use buffer local noweb start/end patterns
* lisp/ob.el (org-babel-expand-noweb-references): Capture current
noweb start and end patterns then use to set buffer locals in
(with-temp-buffer) form.

This solves the problem that using different patterns for
org-babel-noweb-wrap-start and org-babel-noweb-wrap-end could be done
only globally.

TINYCHANGE
2012-08-26 19:26:01 +02:00
Achim Gratz 57c4a4aa07 Merge branch 'maint' 2012-08-26 19:06:39 +02:00
Achim Gratz c32d456f72 Makefile: Improve documentation.
* doc/org.texi: Clarify installation procedure.  Provide link to the
  build system description on Worg.
2012-08-26 17:50:10 +02:00
Sean O'Halpin 30a24f464f Make it possible to use buffer local noweb start/end patterns
* lisp/ob.el (org-babel-expand-noweb-references): Capture current
noweb start and end patterns then use to set buffer locals in
(with-temp-buffer) form.

This solves the problem that using different patterns for
org-babel-noweb-wrap-start and org-babel-noweb-wrap-end could be done
only globally.

TINYCHANGE
2012-08-26 08:29:32 -06:00
Achim Gratz db0e306658 Merge branch 'maint' 2012-08-26 15:28:47 +02:00
Achim Gratz bf352eceda Rename utils/ to mk/, move some files to mk/ and make the requisite changes throughout
* Makefile: Include default.mk and targets.mk from mk/ where they've
  been moved to.

* README_maintainer: Rename utils to make throughout.

* doc/Makefile: Rename utils to make throughout.

* doc/org.texi: Remove reference to utils/, x11idle.c is now in
  contrib/scripts.

* mk/make_emacs_changelog: Add mk/ to list of directories not to be
  reported in Emacs' ChangeLog.  Also retain utils/ and re-add
  UTILITIES; add a comment explaining why these need to stay.

* mk/default.mk: Rename utils to make throughout.  Include version.mk
  from mk/ where it's been moved to.

* mk/targets.mk: Rename utils to make throughout.

* mk/server.mk: Rename utils to make throughout.  Only put those files
  from mk/ into the archives that are needed outside the server:
  default.mk targets.mk version.mk and org-fixup.el.

* lisp/org-compat.el: Rename utils to make throughout.

* .gitignore:  Rename utils to make throughout.
2012-08-26 15:27:19 +02:00
Bastien Guerry ea1b1ca191 Merge branch 'maint' 2012-08-26 14:54:07 +02:00
Bastien Guerry d85e7bc10a org-agenda.el: Fix bug when calling `org-agenda-kill' and `org-agenda-archive-with' with a non-nil value of `org-agenda-stick'
* org-agenda.el (org-agenda-kill, org-agenda-archive-with):
Fix bug when called with a non-nil value of `org-agenda-stick'.

Thanks to Moritz Ulrich for reporting this.
2012-08-26 14:53:59 +02:00
Bastien Guerry 93d3f11ea9 Merge branch 'maint' 2012-08-26 11:20:14 +02:00
Bastien Guerry 74d1658c60 org-agenda.el (org-agenda-refile): Fix bug when refiling an sticky agenda entry
* org-agenda.el (org-agenda-refile): Fix bug when refiling an
entry from a sticky agenda.

Thanks a lot to Moritz Ulrich for reporting this.
2012-08-26 11:20:02 +02:00
Achim Gratz c87ca996ce Merge branch 'maint' 2012-08-26 10:33:13 +02:00
Achim Gratz ee9e27e66e server.mk: add version.mk to distribution archives
* targets.mk: If $(ORGVERSION) and $(GITVERSION) are not defined and
  cannot be determined from Git, try to read `version.mk´.  Fall back
  to "N/A" if still no definition has been made.

* utils/server.mk: Create `version.mk´ for each distribution.  Append
  "-dist" and "-elpa" to $(GITVERSION) to easily recognize builds from
  distribution archives.  Remove `version.mk´ in `cleanrel´ and use
  the same globbing patterns as .gitignore.

* .gitignore: Add "version.mk", also ignore ELPA archive (no ".gz"
  suffix) and only "org-version.el" (no globbing).
2012-08-26 10:32:11 +02:00
Yann Hodique dc116516be org-taskjuggler.el: Make taskjuggler compatible with org-publish
* lisp/org-publish.el (org-publish-org-to-taskjuggler): New function to
publish taskjuggler projects.
* lisp/org-taskjuggler.el (org-export-as-taskjuggler): Adapt signature
to reflect standard interface, in particular allow export to buffer.
2012-08-26 09:54:57 +02:00
Yann Hodique e48d77aa98 org-taskjuggler.el: Update doc to reflect latest changes 2012-08-26 09:54:57 +02:00
Yann Hodique 4aec7ef42e org-taskjuggler.el: Allow reports definition from within the org file
* org-taskjuggler.el (org-export-taskjuggler-report-tag): Add
new option.
(org-export-taskjuggler-valid-report-attributes): Add new option.
(org-export-as-taskjuggler): Compute reports.
(org-taskjuggler-open-report): Generate report from org item.
(org-taskjuggler-insert-reports): Insert default reports only if no
explicit one is defined.
2012-08-26 09:54:57 +02:00
Yann Hodique 467e65d303 org-taskjuggler.el: Disambiguate "headline", as it's a valid attribute 2012-08-26 09:54:57 +02:00
Yann Hodique c97dbf12ae org-taskjuggler.el: Make project umbrella task optional
* org-taskjuggler.el (org-export-taskjuggler-keep-project-as-task): Add
new option.
(org-export-as-taskjuggler): Optionally drop the topmost "task"
(project).
(org-taskjuggler-assign-task-ids): Adapt path computation by optionally
dropping the topmost component (project).

Introduce `org-export-taskjuggler-keep-project-as-task' as a flag to
toggle the behavior. Keep old behavior as default.
2012-08-26 09:54:57 +02:00
Yann Hodique a35500b842 org-taskjuggler.el: Use project end date, if specified
* org-taskjuggler.el (org-taskjuggler-open-project): Use START - END as
an alternative to START +Xd.
2012-08-26 09:54:57 +02:00
Yann Hodique 9fef2fb032 org-taskjuggler.el: Introduce a global header, for early macros
* org-taskjuggler.el (org-export-taskjuggler-default-global-header): Add
new option.
(org-export-as-taskjuggler): Insert global header before anything else.
2012-08-26 09:54:57 +02:00
Yann Hodique bc78b9941c org-taskjuggler.el: Fix milestone definition
* org-taskjuggler.el (org-taskjuggler-open-task): Task with end-only is
also a milestone (deadline), task with length is not.
2012-08-26 09:54:57 +02:00
Yann Hodique fc6b40a034 org-taskjuggler.el: Make use of org properties
* org-taskjuggler.el (org-taskjuggler-date): Introduce new function to
produce a taskjuggler-compatible date.
(org-taskjuggler-components): Make use of SCHEDULED/DEADLINE properties.

Infer start and end date from SCHEDULED/DEADLINE information.
2012-08-26 09:54:57 +02:00
Yann Hodique b711e70ed8 org-taskjuggler.el: Properly install local variables at export time
* org-taskjuggler.el (org-export-as-taskjuggler): Compute opt-plist, use
`org-install-letbind'.
2012-08-26 09:54:57 +02:00
Yann Hodique b183bd1d07 org-taskjuggler.el: Make task and resource properties customizable
* org-taskjuggler.el (org-export-taskjuggler-valid-task-attributes): Add
new option.
(org-export-taskjuggler-valid-resource-attributes): Add new custom
option.
2012-08-26 09:54:57 +02:00
Achim Gratz 4ca67b8164 Merge branch 'maint' 2012-08-26 09:28:08 +02:00
Achim Gratz f8cc3189f5 Makefile: deactivate perl scripts unless server configuration is active
* doc/Makefile: Do not use perl scripts in util/ unless the server
  configuration $(SERVERMK) is set.
2012-08-26 09:25:34 +02:00
Achim Gratz 48c01d3a11 server.mk: implement upload targets
* utils/server.mk: Implement `upload´ (create and install everything),
  `upload-elpa´ (create and install ELPA archive),
  `upload-release´ (create and install release archives) and
  `upload-doc´ (create and install manuals).  The server layout is
  hardcoded and the directory structure must be in place, the server
  root is determined via variable $(SERVROOT).
2012-08-26 09:25:33 +02:00
Nicolas Goaziou ab075316b0 Merge branch 'maint' 2012-08-25 23:46:18 +02:00
Nicolas Goaziou 11082518ee org-element: Tiny refactoring
* lisp/org-element.el (org-element-paragraph-parser): Tiny refactoring.
2012-08-25 23:45:14 +02:00
Nicolas Goaziou 967f20c9a9 Merge branch 'maint' 2012-08-25 23:31:10 +02:00
Nicolas Goaziou 3113c5fce9 org-element: Small code comment clean-up
* lisp/org-element.el (org-element-paragraph-parser): Remove trailing
  code comments.
2012-08-25 23:30:29 +02:00
Jambunathan K 9c1d338834 org-e-odt.el: Support for indented tables.
1. Use element translation for description lists.
2. Handle low-level headlines.
3. Handle tables within listified headlines.

Some crude changes for creating references to a list item.

Also other misc changes.
2012-08-26 02:06:20 +05:30
Bastien Guerry bff77bcd7d Merge branch 'maint' 2012-08-25 22:14:13 +02:00
Jambunathan K 0b209c16f6 Set `org-e-html-coding-system' to 'utf-8 2012-08-25 22:13:58 +02:00
Jambunathan K 2cb72af8e8 Set `org-e-html-coding-system' to 'utf-8 2012-08-26 00:50:17 +05:30
Nicolas Goaziou 8bf85553a3 Merge branch 'maint' 2012-08-25 15:42:26 +02:00
Nicolas Goaziou 90f6324dbf Add missing part from commit b4604d2833
* lisp/org.el (org-fill-context-prefix): Fix incorrect output when
  called at the beginning of a plain list with an affiliated keyword.
(org-fill-paragraph): Remove useless variable.
2012-08-25 15:41:01 +02:00
Nicolas Goaziou 1f3d1f55fe Merge branch 'maint' 2012-08-25 15:28:40 +02:00
Nicolas Goaziou b4604d2833 org-element: Fix filling bug in a list with affiliated keyword
* lisp/org-element.el (org-element-paragraph-parser): Fix parsing of
   paragraph at the beginning of an item.
* testing/lisp/test-org-element.el: Add test.
2012-08-25 15:27:01 +02:00
Nicolas Goaziou 61b5e28509 org-export: Flesh out dictionary
* contrib/lisp/org-export.el (org-export-dictionary): Flesh out
  dictionary.
(org-export-translate): Allow for a :default charset in order to
simplify dictionary completion.
2012-08-25 14:07:41 +02:00
Nicolas Goaziou d86f09a854 org-element: Extract search option and application in "file"-type links
* lisp/org-element.el (org-element-link-type-is-file): New variable.
(org-element-link-parser): Extract search option and application in
"file"-type links.
* contrib/lisp/org-e-html.el (org-e-html-link): Remove components
  extraction since this in now done in `org-element-link-parser'.
* contrib/lisp/org-e-odt.el: Remove components extraction since this
  in now done in `org-element-link-parser'.
* contrib/lisp/org-e-texinfo.el (org-e-texinfo-link): Remove
  components extraction since this in now done in
  `org-element-link-parser'.
* contrib/lisp/org-e-latex.el (org-e-latex-link): Remove components
  extraction since this in now done in `org-element-link-parser'.
* contrib/lisp/org-e-man.el (org-e-man-link): Remove components
  extraction since this in now done in `org-element-link-parser'.
* contrib/lisp/org-e-groff.el (org-e-groff-link): Remove components
  extraction since this in now done in `org-element-link-parser'.
* contrib/lisp/org-md.el (org-md-link): Remove components extraction
  since this in now done in `org-element-link-parser'.
* testing/lisp/test-org-element.el: Add tests.
2012-08-25 10:38:25 +02:00
Bastien Guerry d09a6b3db5 Merge branch 'maint' 2012-08-25 10:29:09 +02:00