Commit Graph

1450 Commits

Author SHA1 Message Date
Bastien Guerry 747d71675c Merge branch 'maint'
Conflicts:
	doc/org.texi
	doc/orgguide.texi
	lisp/org.el
2012-05-25 09:42:02 +02:00
Bastien Guerry 60587ea91c Bump to version 7.8.11. 2012-05-25 09:36:15 +02:00
Adam Spiers b57e23694f Fix typo in manual index's description of the 'Hooks' section
* doc/org.texi: Fix typo in description of the 'Hooks' section
2012-05-18 08:30:00 +02:00
Adam Spiers 677a94a961 Document ID special property.
* doc/org.texi: add ID to the list of special properties.
2012-05-18 08:29:57 +02:00
Achim Gratz a0a344bff1 inject version strings into orgguide
* doc/orgguide.texi: Include version strings from "org-version.inc".

* doc/Makefile: Make "org-version.inc" a dependency of "guide".
2012-05-18 07:45:46 +02:00
Achim Gratz b4693de937 clean up server targets in doc/Makefile and make sure they are working
* doc/Makefile: ignore errors from removing directory (may not exist),
  manual depends on 'org-version.inc'.
2012-05-18 07:45:46 +02:00
Achim Gratz bcced6a51d Makefile: avoid spurious recompilations of documentation
* doc/Makefile: org-version.inc is again dependent on org.texi.  This
  avoids recompilation when nothing has been changed; target "clean"
  still removes orgversion.texi to produce a consistent set of
  documentation and code after a "make clean" on toplevel

* targets.mk: add "doc" as prerequisite to "all" and "compile" to have
  it call "clean" in the doc subdir.
2012-05-18 07:45:45 +02:00
Bastien Guerry 9212ff07de Merge branch 'maint'
Conflicts:
	doc/org.texi
	lisp/org.el
2012-05-16 19:21:33 +02:00
Bastien Guerry 429e6aafa6 Bump to version 7.8.10. 2012-05-16 19:20:07 +02:00
Bastien Guerry cb23085ac2 Merge branch 'maint' 2012-05-16 19:08:48 +02:00
Bastien Guerry e6560f2528 Backport change in org.texi by Glenn Morris.
See http://git.savannah.gnu.org/cgit/emacs.git/commit/?id=d38a0a
2012-05-16 19:08:29 +02:00
Bastien Guerry e70068feed org.texi (Uploading files): Fix typo.
* org.texi (Uploading files): Fix typo.

Thanks to François Pinard for spotting this.
2012-05-06 00:53:42 +02:00
Jason Dunsmore 6a38c1fac3 Fixed indentation in capture template doc. 2012-05-04 14:57:34 -05:00
Jason Dunsmore 67f9bbb7fa Clarified to capture template expansion doc. 2012-05-04 14:47:40 -05:00
Bastien Guerry 1c4ac932f3 Merge branch 'maint' 2012-05-01 18:43:41 +02:00
Bastien Guerry 9fa0b5e794 org.texi (Durations and time values): Fix typo.
* org.texi (Durations and time values): Fix typo.
2012-05-01 18:43:28 +02:00
Bastien Guerry d6e56bce71 org.texi: Document `C-0' as a prefix argument for `org-capture'.
* org.texi (Using capture): Document `C-0' as a prefix
argument for `org-capture'.

Thanks to Charles for this.
2012-04-29 10:58:36 +02:00
Brian van den Broek a178bc9d84 Small grammar tweaks in export sections of org.texi
* org.texi The sections in the Exporting section of the manual left
out articles in the description of the org-export-as-* commands, among
other places. This patch adds them, adds a few missing prepositions,
and switches instances of "an HTML" to "a html" for internal
consistency.

TINYCHANGE
2012-04-24 23:27:59 +02:00
Bastien Guerry 5add9cdef0 org-agenda.el: Implement `org-agenda-persistent-marks' for bulk actions.
* org-agenda.el (org-agenda-persistent-marks): New option to
keep marks after a bulk action.  The option defaults to nil.
(org-agenda-bulk-action): Use the new option.

* org.texi (Agenda commands): Document persistent marks.
2012-04-24 18:10:55 +02:00
Bastien Guerry 1666b910fe org-capture.el: Use %\n instead of %n.
* org-capture.el (org-capture-fill-template): Use %\n instead of %n as a
template element to be replaced with the nth prompted string.
(org-capture-templates): Update docstring.

* org.texi (Template expansion): Update doc to reflect change.

Using %n triggers errors when the template contains escaped strings,
which happens a lot with links.
2012-04-24 11:54:16 +02:00
Bastien Guerry e9d34dcd72 org.texi: Fix insertion of {} chars.
Thanks to Richard Stanton for spotting this.
2012-04-23 19:24:04 +02:00
Toby S. Cubitt b7982a0024 org-capture.el: Fixed bug in org-capture-templates %<n> expandos
* lisp/org-capture.el (org-capture-fill-template): Fixed regexp for
  %<n> expandos to match any positive integer.
  (org-capture-templates): Updated docstring accordingly.

* doc/org.texi: Updated documentation accordingly.
2012-04-23 17:34:15 +02:00
Bastien Guerry b1618e2d69 Fix missing } in org.texi. 2012-04-23 12:59:32 +02:00
Toby Cubitt e13d182ce8 Allow %<num> escapes to capture templates, expanded to text entered in <num>'th prompt
* org-capture.el (org-capture-fill-template): Expand %<num>
escape sequences into text entered for <num>'th %^{PROMPT} escape.
2012-04-23 12:48:40 +02:00
Bastien Guerry e9dec29bb1 org-table.el: Escape some special characters when sending radio tables.
* org-table.el (orgtbl-send-table): Escape special characters.
Introduce a new parameter :no-escape to prevent escaping.

* org.texi (Radio tables): Document the :no-escape parameter.

Thanks to Alexander Willand for raising this issue.
2012-04-23 00:09:35 +02:00
Achim Gratz 0a9c29d305 allow customization of the "doc" target to skip certain types of documentation
* doc/Makefile: read targets to make for "doc" from $(ORG_MAKE_DOC),
  defaults to "info html pdf"; can be overridden by the user in
  local.mk.

* targets.mk: read targets to make for "doc" and "docs" from
  $(ORG_MAKE_DOC), defaults to "info html pdf"; can be overridden by
  the user in local.mk.

* default.mk: document ORG_MAKE_DOC and provide a (commented) example
  of how to have make only produce info documentation.
2012-04-22 10:51:29 +02:00
Achim Gratz 22447fe485 fix typo
* doc/Makefile: fix typo, it is org-version.inc, not org-version.texi
2012-04-22 10:51:21 +02:00
Achim Gratz c5377f6034 always make version files
* doc/Makefile: make org-version.inc .PHONY so that it is always re-made.

* lisp/Makefile: make org-version.el .PHONY so that it is always re-made.
2012-04-21 17:38:43 +02:00
Andrew Hyatt 44e7ed1a59 Allow archiving to a datetree.
* org-archive.el (org-archive-subtree): Allow archiving to a
datetree.

* org.el (org-archive-location): Ditto.

* org.texi (Moving subtrees): Document the ability to archive
to a datetree.

TINYCHANGE
2012-04-21 17:37:48 +02:00
Achim Gratz f6c2848dfb * add missing dependencies on org-version.inc
* doc/Makefile: org-version.inc must be a dependency of "pdf" and "html"
2012-04-21 16:09:02 +02:00
Ippei FURUHASHI 32bd764573 org.texi: Fix typos of function names in Agenda commands
* org.texi (Agenda commands): Fix two typos by giving corresponding
function names, according to `org-agenda-view-mode-dispatch'.

TINYCHANGE
2012-04-21 12:13:25 +02:00
Bastien Guerry 08bd0b8892 Merge branch 'local-Makefile' into test-makefile-merge 2012-04-21 10:02:28 +02:00
Brian van den Broek 8f3dc945b2 Change example timestamps to not occur in headlines.
* org.texi: Alter several examples of headings with timestamps
in them to include the timestamps in the body instead of the heading.

* orgguide.texi: Alter the same examples in the same way as for
org.texi.

The Org-mode manual explicitly discourages the inclusion of timestamps
in headlines, yet examples do just that. These changes make the manual
consistent with its own advice.

TINYCHANGE
2012-04-21 00:43:24 +02:00
Feng Shu a9d3ce0bcd Allow to use imagemagick for previewing LaTeX fragements.
* org.el (org-latex-create-formula-image-program): New option
to use either dvipng or imagemagick to convert and preview
LaTeX fragments.
(org-preview-latex-fragment, org-format-latex): Handle the new
option.
(org-create-formula-image-with-dvipng): Rename from
`org-create-formula-image'.
(org-create-formula-image-with-imagemagick): New defun to
handle LaTeX preview with imagemagick.
(org-latex-color, org-latex-color-format): New defuns to
handle color conversions.

* org-latex.el (org-latex-to-pdf-process, org-export-as-pdf):
Allow to use imagemagick to convert LaTeX fragments.

* org-html.el (org-export-html-preprocess): Ditto.

* org-exp.el (org-export-with-LaTeX-fragments): Ditto.

* org.texi (@LaTeX{} fragments): Document imagemagick as an
alternative to dvipng.
2012-04-21 00:42:59 +02:00
Bastien Guerry ec921a2a68 Support hourly repeat cookies.
* org.el (org-repeat-re)
(org-clone-subtree-with-time-shift, org-auto-repeat-maybe)
(org-deadline, org-schedule, org-matcher-time)
(org-time-stamp, org-read-date, org-read-date-get-relative)
(org-display-custom-time, org-get-wdays)
(org-time-string-to-absolute, org-closest-date)
(org-timestamp-change): Allow to set hourly repeat cookie.
Send an error when an hourly repeat cookie is set and no hour
is specified in the timestamp.

* org.texi (Repeated tasks): Document repeat cookies for
years, months, weeks, days and hours.

* org-agenda.el (org-agenda-get-timestamps): Match hourly
repeat cookies.

* org-icalendar.el (org-print-icalendar-entries): Handle
hourly repeat cookies.

Thanks a lot to Takafumi Arakaki for this idea and for a preliminary
version of this patch.
2012-04-21 00:42:56 +02:00
Achim Gratz e102e411e4 doc/Makefile: rename/add auto-generated files to be compatible with Emacs
* doc/Makefile: rename auto-generated file "git-describe.texi" to
  "org-version.inc" to allow for easier inclusion into Emacs.

* doc/org.texi: include "org-version.inc" instead of
  "git-describe.texi".

* lisp/Makefile: new auto-generated file org-version.el with autoload
  cookies.  The version strings will be pulled during autoload
  extraction into org-install.el (standalone org-mode) or
  ../loaddefs.el (Emacs).
2012-04-20 21:04:14 +02:00
Achim Gratz 6a3ec67abd Introduce $(datadir), prefix all installation paths with $(DESTDIR)
Makefile: remove includes for maintainer targets, these will go
	into local.mk on the server

	default.mk: introduce $(datadir) to replace $(etcdir) in etc/Makefile

	doc/Makefile: replace $etcdir) with $(datadir)

	lisp/Makefile: record ODT styles location as defconst in org-install

	{doc,etc,lisp}/Makefile: prefix all installation targets with $(DESTDIR)
2012-04-20 21:04:11 +02:00
Achim Gratz 6da2d089b0 move all version strings into org-install.el
* targets.mk: check for release and git version and record this
	into environment variables for use in sub-make invocations; add
	new target "compile-dirty" that does not invoke "make clean" first
	* doc/Makefile, lisp/Makefile: remove git version check, since
	they are now provided by first-level make
	* lisp/Makefile: add insertion of version information into
	org-install.el, have org-install.el depend on LISPF rather than
	LISPC so that autoloads can be produced without compiling
	everything and remove insertion into org.el and re-compilation
	during install; add new target "compile-dirty" to support
	invocation from first-level make
	* lisp/org.el (org-version): remove determination of version
	information, show "N/A" if the information is not provided via
	org-install.el
2012-04-20 21:04:10 +02:00
Achim Gratz 306c748f63 inject git-describe version and date into org manual
* doc/Makefile: introduce target for git-describe.texi, which is an
	  automatically generated file that records the output of git-describe
	  and date; remove this file during make clean
	* doc/org.texi: remove @set for VERSION and DATE and do an @include
	  git-describe.texi instead
2012-04-20 21:04:09 +02:00
Achim Gratz 8bbf77a748 finish cleanup on infodir, some refinements on rules
* doc/Makefile: cleanall additionally removes the directories for
	manual and guide; fix the dir file in infodir after removal of org
	documentation

	* lisp/Makefile: remove debug statement
2012-04-20 21:04:08 +02:00
Achim Gratz 501f9b1741 use sed instead of perl, add target clean-install
* Makefile, lisp/Makefile, doc/Makefile: add target clean-install
	to remove files in install-directories

	* default.mk: add customization variable $(SED)

	* doc/Makefile: do not remove dir while cleaning

	* lisp/Makefile: use sed instead of perl to weave git-status into
	org.el and ignore any errors while doing it.  Keep git status in
	$(GITSTATUS) to make it more clear what happens in the check.
2012-04-20 21:04:08 +02:00
Achim Gratz a5cb04dcd8 hand off ./doc to sub-make
* Makefile: use info function for output and call shell only once
* default.mk: add PDFTEX and RMR variables for customization
* lisp/Makefile: add target 'all' and create $(lispdir) if necessary
* maint-targets.mk: invoke sub-make for HTML manuals
* maint.mk: remove unsused VARIABLES
* targets.mk: invoke sub-make for ./doc and clean up some targets
2012-04-20 21:04:07 +02:00
Bastien Guerry d1f1c586d5 Fix merge conflict. 2012-04-20 11:43:27 +02:00
Ippei FURUHASHI ec7052d1c7 org.texi: Fix typos of function names in Agenda commands
* org.texi (Agenda commands): Fix two typos by giving corresponding
function names, according to `org-agenda-view-mode-dispatch'.

TINYCHANGE
2012-04-20 11:30:13 +02:00
Max Mikhanosha 7212801808 Merged origin/master into max-sticky-agenda 2012-04-13 18:15:18 -04:00
Bastien Guerry ac2cb80ec0 orgcard.tex: Fix copyright year. 2012-04-11 13:01:23 +02:00
Bastien Guerry fd6b2a6b77 orgcard.tex: Fix copyright year. 2012-04-11 13:00:40 +02:00
Bastien Guerry fe5e004e39 Merge branch 'hotfix' 2012-04-11 12:30:55 +02:00
Bastien Guerry 148e8c7724 Bump to version 7.8.09. 2012-04-11 12:30:40 +02:00
Bastien Guerry 49645b6014 org.texi: State that you can use the d: option by specifying a list of drawers.
* org.texi (Export options): State that you can use the d:
option by specifying a list of drawers.

Thanks to François Pinard for requesting this.
2012-04-11 08:17:53 +02:00