Commit Graph

11544 Commits

Author SHA1 Message Date
Achim Gratz 82e1c4b3ec Merge branch 'maint' 2012-08-27 19:37:00 +02:00
Achim Gratz e20cb6f92b Makefile: show ORG_MAKE_DOC in `config´
* mk/targets.mk: Show ORG_MAKE_DOC in `config´.

* .gitignore: Add doc/org-version.inc.
2012-08-27 19:19:42 +02:00
Achim Gratz 7fbb387f34 server.mk: shrink ELPA archive, correct documentation dependencies
* mk/server.mk: Drop some documentation files from ELPA archive.
  Correct dependencies for documentation, ORG_MAKE_DOC can not be used
  as a per-target definition because it has been expanded before.
  Directly give the dependencies instead.
2012-08-27 19:19:42 +02:00
Bill Day e1b1046685 org-taskjuggler.el: Add chargeset and charge
* org-taskjuggler.el
(org-export-taskjuggler-valid-task-attributes): Add chargeset
and charge.

TINYCHANGE
2012-08-27 18:10:28 +02:00
Bastien Guerry 74d8424539 Merge branch 'maint' 2012-08-27 18:03:18 +02:00
Bastien Guerry 3013b7c5dc org-table.el: Switch back to the old default for `org-table-number-regexp'
* org-table.el (org-table-number-regexp): Allow the user to
set it to a new regexp, which allows commas as decimal mark.
The default is to not use this setting, but the one before
commit 7ff8c1, which has ben reverted.

See the discussion here:
http://thread.gmane.org/gmane.emacs.orgmode/59389
2012-08-27 18:03:05 +02:00
Bastien Guerry 4a508fdfa4 Revert "org-table: Accept comma as a decimal mark to represent numbers"
This reverts commit 7ff8c166e6.
2012-08-27 17:55:18 +02:00
Bastien Guerry 97e4d643a8 Revert "org-table.el: Minor docstring update"
This reverts commit 5d57364256.
2012-08-27 17:55:05 +02:00
Bastien Guerry 68054d4a37 Merge branch 'maint' 2012-08-27 17:53:10 +02:00
Bastien Guerry 424f3ecedb Fix bug when redoing multiple (agenda) blocks.
* org-agenda.el (org-agenda-overriding-cmd)
(org-agenda-multi-current-cmd)
(org-agenda-multi-overriding-arguments): New variables.
(org-agenda-run-series): `org-agenda-overriding-arguments'
defaults to the last agenda block arguments, so don't use it
globally.
(org-agenda-mark-header-line): Add properties needed so that
`org-agenda-overriding-arguments', `org-agenda-current-span'
and `org-agenda-last-arguments' can be set to their correct
contextual value.
(org-agenda-multi-back-to-pos): New variable.
(org-agenda-later): Retrieve `org-agenda-current-span' and
`org-agenda-overriding-arguments' from text properties.  Also
handle numeric span.
(org-agenda-later, org-agenda-change-time-span): Set
`org-agenda-overriding-cmd' so that we to take overriding
arguments into account for this command only.

The behavior for agenda blocks where there is only one (agenda)
command is not changed.  Changing the time span and redoing with
`g' will keep the new time span.  The behavior changed for blocks
where there are multiples (agenda) blocks.  In this case, redoing
will restore the initial view (before any time span change) and
changing the time span is done independantly for each block.

Thanks to Charles Philip Chan for reporting this nasty bug.
2012-08-27 17:52:22 +02:00
Nicolas Goaziou 4e56f31a24 org-e-ascii: No trailing whitespace in headlines/inlinetasks titles
* contrib/lisp/org-e-ascii.el (org-e-ascii--build-title): Remove
  trailing whitespace in headlines/inlinetasks titles.
2012-08-27 15:35:59 +02:00
Nicolas Goaziou caf2432c52 org-export: Add an option to toggle export of stat cookies
* contrib/lisp/org-export.el (org-export-with-statistics-cookies): New
  variable.
(org-export-options-alist): Use new variable.
(org-export--skip-p): Handle new option.
* testing/lisp/test-org-export.el: Add test.
2012-08-27 15:27:02 +02:00
Nicolas Goaziou 9f2824852c org-export: Objects in secondary strings can also be ignored
* contrib/lisp/org-export.el (org-export--populate-ignore-list): Move
  into secondary strings when looking for objects to ignore in the
  parse tree.
2012-08-27 15:27:02 +02:00
Nicolas Goaziou 86b1be57b9 org-export: Handle "\-" as a special string
* contrib/lisp/org-export.el (org-export-with-special-strings): Fix
  docstring.
* contrib/lisp/org-e-ascii.el (org-e-ascii-plain-text): Remove soft
  hyphens.
* contrib/lisp/org-e-latex.el (org-e-latex-plain-text): Handle soft
  hyphens.
2012-08-27 14:35:54 +02:00
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