Commit Graph

11330 Commits

Author SHA1 Message Date
Nicolas Goaziou 4d789f4c30 org-export: Fix filters returning a nil value
* contrib/lisp/org-export.el (org-export-filter-apply-functions): If
  a filter returns nil, return last non-nil value.
2012-08-27 14:35:54 +02:00
Nicolas Goaziou dc116caf10 Merge branch 'maint' 2012-08-27 12:14:15 +02:00
Nicolas Goaziou 857b980515 Fix commit 40084a55d1
* lisp/org-exp.el (org-export-handle-comments): Also remove comments
  at column 0.
2012-08-27 12:13:25 +02:00
Nicolas Goaziou b37b95724c Merge branch 'maint' 2012-08-27 11:22:47 +02:00
Nicolas Goaziou 40084a55d1 org-exp: Handle inline comments with new syntax
* lisp/org-exp.el (org-export-handle-comments): Handle inline comments
  with new syntax.
2012-08-27 11:21:52 +02:00
Nicolas Goaziou ab744c2dc3 Merge branch 'maint' 2012-08-27 09:11:39 +02:00
Nicolas Goaziou 805a9f019d Add missing colon to #+INCLUDE in structure template
* lisp/org.el (org-structure-template-alist): Add missing colon to
  #+INCLUDE.
2012-08-27 09:11:01 +02:00
Nicolas Goaziou f29660fe7a Merge branch 'maint' 2012-08-26 23:45:32 +02:00
Bastien Guerry 2d40aca20c Merge branch 'maint' 2012-08-26 23:44:57 +02:00
Nicolas Goaziou 664132667b Fix org-backward-element with point on first element in section
* lisp/org.el (org-backward-element): When called at the beginning of
  first element in section, the function shouldn't return an error but
  move point to headline or point-min instead.
* testing/lisp/test-org.el: Add test.
2012-08-26 23:44:51 +02:00
Bastien Guerry 3404ac84ec Move `org-toggle-sticky-agenda' again and autoload it
The previous related commit was to prevent an error
when M-x org-reload RET was reloading org files from
an ELPA directory.  We now autoload the function so
that it is know by the time org-reload might be called.
2012-08-26 23:44:49 +02:00
Bastien Guerry 290a035bfc Fix compiler warning. 2012-08-26 23:43:30 +02:00
Bastien Guerry 7f01035de0 Merge branch 'maint' 2012-08-26 23:24:50 +02:00
Bastien Guerry d832837693 org-agenda.el: Define `org-toggle-sticky-agenda' before calling it 2012-08-26 23:24:40 +02:00
Achim Gratz bb1c99a470 Merge branch 'maint' 2012-08-26 20:45:03 +02:00
Achim Gratz fb2af507f0 server.mk: do not prevent proper customization
* mk/server.mk: Do not prevent proper customization, so do not
  overwrite existing variables.
2012-08-26 20:44:24 +02:00
Achim Gratz a161c0ebe5 server.mk: do not prevent proper customization
* mk/server.mk: Do not prevent proper customization, so do not
  overwrite existing variables.
2012-08-26 20:42:38 +02:00
Bastien Guerry 6dc409c2bb Merge branch 'maint' 2012-08-26 20:29:14 +02:00
Bastien Guerry 4de217ab2f server.mk (elpa): Do not make PDF and card documentation for the ELPA archive
Info is enough.
2012-08-26 20:29:06 +02:00
Bastien Guerry a388442557 Merge branch 'maint' 2012-08-26 20:23:21 +02:00
Bastien Guerry effa8d07b1 mk/server.mk: More compact help. 2012-08-26 20:23:11 +02:00
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