Commit Graph

6675 Commits

Author SHA1 Message Date
Max Mikhanosha 2443318f18 Fix undefined org-habit-show-all-today variable when org-habit is not loaded
* lisp/org-agenda.el (defvar org-habit-show-habits-only-for-today): initialize to nil

TINYCHANGE
2012-05-29 16:39:54 -04:00
Mark Shoulson b87ca833b3 Add \asciicirc entity
* org-entities.el (org-entities): Added \asciicirc entity for ^;
  also fixed \circ expansion in latex.

TINYCHANGE
2012-05-29 08:23:55 +02:00
Max Mikhanosha e67734fe8e Add ability to show all (even unscheduled) habits on today agenda, by
setting `org-habit-show-all-today' to t.

* lisp/org-agenda.el (defvar org-habit-show-all-today): new variable
(org-agenda-get-scheduled): show all habits if user wants it
* lisp/org-habit.el (defcustom org-habit-show-all-today): new variable
2012-05-28 14:56:23 -04:00
Bastien Guerry 2a7321f70a Revert "Let org-agenda-time-grid control if the grid is displayed"
This reverts commit 993dd076fb.
2012-05-26 06:22:51 +02:00
Christophe Junke 993dd076fb Let org-agenda-time-grid control if the grid is displayed
* lisp/org-agenda.el (org-agenda-list): Ensures that the
list returned by `org-agenda-add-time-grid-maybe' is appended
to ̀rtnall' before checking if the latter is emtpy.

In the case where `rtnall' is empty (no item for current day),
we do not call `org-agenda-add-time-grid-maybe'.  This seems
bogus because that function is already computing whether the
time grid must be included, and does so according to the
user's preferences.

In particular, the `org-agenda-time-grid' variable has a
`require-timed' parameter controlling the visibility of the
time grid.

So, this patch :

 - removes the premature check for `rtnall' being empty,
 - inconditionally calls `org-agenda-add-time-grid-maybe',
 - appends the result to `rtnall',
 - and finally checks the emptiness of the resulting list
   before pretty printing.

TINYCHANGE
2012-05-26 00:19:01 +02:00
Bastien Guerry 8c91f690a5 org.el (org-return): Follow time-stamp links when point is an a time-stamp.
* org.el (org-return): Follow time-stamp links when point is
an a time-stamp.

Thanks to Samuel Wales for suggesting this.
2012-05-26 00:15:06 +02:00
Bastien Guerry f71d45a913 New option `org-capture-bookmark' (mentioned in the manual.)
* org.texi (Using capture): Mention the
`org-capture-last-stored' bookmark as a way to jump to the
last stored capture.

* org-capture.el (org-capture-bookmark): New option.
(org-capture-finalize): Use it.
2012-05-25 23:45:31 +02:00
Matt Lundin 8f2a921cf9 Allow datetree to find years with trailing whitespace.
* lisp/org-datetree.el: Fix regexp to allow datetree to find headings
  with trailing whitespace.  This fixes a bug in which an existing
  datetree heading (e.g., "* 2012 ") would not be found by
  org-datetree-find-year-create if it had trailing whitespace.  This can
  cause problems, for instance, if one is using column view on the date
  tree, since editing subheadings with column view adds whitespace at
  the end of the top heading.
2012-05-25 23:22:09 +02:00
Nicolas Goaziou 6cddf74250 Merge branch 'maint' 2012-05-25 20:24:58 +02:00
Nicolas Goaziou 8b46521211 Restrict priorities fontification to headlines and inlinetasks
* lisp/org.el (org-font-lock-add-priority-faces): Restrict priorities
  fontification to headlines and inlinetasks.
2012-05-25 20:23:43 +02:00
Mark Shoulson 4e4e161f8f Fix for displaying entities ending in a number
* lisp/org.el (org-fontify-entities): Fix bug: The entities \sup[123] and
  \there4 were not "prettified" when org-pretty-entities was enabled.

TINYCHANGE
2012-05-25 16:56:57 +02:00
Mark Shoulson 8640e2a73a Add entities for /, +, _, =
* org-entities.el (org-entities): Add new entities for characters
  which could cause formatting changes if typed directly.
2012-05-25 16:50:15 +02:00
Mark Shoulson bde1b2f942 Fix for displaying entities ending in a number
* lisp/org.el (org-fontify-entities): Fix bug: The entities \sup[123] and
  \there4 were not "prettified" when org-pretty-entities was enabled.

TINYCHANGE
2012-05-25 16:50:06 +02:00
Jambunathan K 610a00ce2a Merge remote-tracking branch 'origin/maint' 2012-05-25 19:04:02 +05:30
Jambunathan K 35b9556cc3 org-odt.el: Fix previous commit
* lisp/org-odt.el (org-odt-init-outfile): Fix previous commit.
Make sure that nxml-mode is loaded before let-binding
`nxml-auto-insert-xml-declaration-flag'.
2012-05-25 19:02:33 +05:30
Bastien Guerry 60587ea91c Bump to version 7.8.11. 2012-05-25 09:36:15 +02:00
Jambunathan K d4b3c199f3 Merge remote-tracking branch 'origin/maint' 2012-05-24 21:45:28 +05:30
Jambunathan K 1e811161c5 org-odt.el: Fix corruption due to multiple XML declarations
* lisp/org-odt.el (org-odt-init-outfile)
(org-odt-write-manifest-file): Disable
`nxml-auto-insert-xml-declaration-flag'.

* lisp/org-lparse.el (org-do-lparse): Don't trigger auto-mode
processing.

Guard against insertion of multiple XML declarations within
component XML files when
`nxml-auto-insert-xml-declaration-flag' is on.

Fixes bug
http://lists.gnu.org/archive/html/emacs-orgmode/2012-05/msg00510.html.
2012-05-24 21:41:38 +05:30
Bastien Guerry be8d545092 Allow to open the agenda from a timestamp in a headline.
* org.el (org-open-at-point): Allow to open the agenda from an
active or inactive timestamp in a headline.

TINYCHANGE

Thanks to Ingo Lohmar for this patch.
2012-05-24 11:33:00 +02:00
Bastien Guerry 31aa82c998 Merge branch 'maint' 2012-05-23 12:13:39 +02:00
Bastien Guerry 141d0fd24b org.el (org-scan-tags): Fix bug when building the scanner regexp.
* org.el (org-scan-tags): Fix bug when building the scanner regexp.

Thanks to Mike McLean, who first reported this issue and provided a
reproducible recipe.  Thanks to Laurynas Biveinis and Loris Bennett
who provided complementary feedback on this.
2012-05-23 12:13:21 +02:00
Bastien Guerry b62b49bc2b Make the column mandatory after #+include:.
* org-publish.el (org-publish-cache-file-needs-publishing):
Make the column mandatory after #+include:.

* org-exp.el (org-export-handle-include-files): Ditto.
2012-05-23 01:26:45 +02:00
Bastien Guerry 937b56ec89 org-bibtex.el: Rename *org-bibtex-entries* to org-bibtex-entries.
* org-bibtex.el (org-bibtex-entries): Rename from
(org-bibtex-read, org-bibtex-write): Use the new name.
2012-05-21 18:30:09 +02:00
Eric Schulte f64a859db8 force cap of auto-inserted begin/end example block
* lisp/ob.el (org-babel-capitalize-examplize-region-markers): Controls
  the capitalization of begin and end example blocks.
  (org-babel-examplize-region): Optionally capitalize example block
  delimiters.
2012-05-21 09:46:47 -04:00
Eric Schulte 793485b07a adding a :java header argument to plantuml
* lisp/ob-plantuml.el (org-babel-execute:plantuml): Adding a :java
  header argument to plantuml.
2012-05-19 20:37:54 -04:00
Achim Gratz 40a789ecd1 fix org-reload and add parameters to customize output from org-version
* org.el(org-version): Add optional parameters 'full and 'message
  to optionally return the full version string and echo to message
  area in non-interactive calls.

* org.el(org-submit-bug-report): Add optional parameter 'full to
  call of (org-version) so that the bug report has all version
  information.

* org.el(org-reload): Simplify file-re (orgtbl-*.el files do not
  exist anymore).  Keep org-*.el at the end of the files list.
  Explicitely load org-version.el (since it doesn't provide feature
  'org-version) at the very end, but ignore errors when it doesn't
  exist.  Add parameters 'full and 'message to the call
  of (org-version) so that after reload the full version information
  is displayed in the message area again.
2012-05-19 10:52:09 +02:00
Bastien Guerry 584b869d38 org-exp.el: Allow to use #+include with no column.
* org-exp.el (org-export-handle-include-files): Allow to use
#+include with no column.

Thanks to Albert for spotting this.
2012-05-19 10:25:19 +02:00
Achim Gratz 595d451280 use org-no-warnings macro for XEmacs compatibility
* lisp/org-agenda.el: Replace with-no-warnings with
  org-no-warnings (defined in org-macs.el).

* lisp/org-bbdb.el: Replace with-no-warnings with
  org-no-warnings (defined in org-macs.el).

* lisp/org-clock.el: Replace with-no-warnings with
  org-no-warnings (defined in org-macs.el).

* lisp/org.el: Replace with-no-warnings with org-no-warnings (defined
  in org-macs.el).
2012-05-19 09:48:57 +02:00
Eric Schulte fc5d53d910 Merge branch 'origin-maint' 2012-05-18 09:07:05 -04:00
Eric Schulte 038cdffe0c indent block boundaries when body is no-indent
Thanks to Seb and Nick for pointing this out.

* lisp/org-exp-blocks.el (org-export-blocks-preprocess): Even when the
  body of a block is not indented the boundary markers should be
  indented to their original positions so things like list indentation
  still work.
2012-05-18 09:06:42 -04:00
Bastien Guerry 7da0d6b994 org-publish.el: #+INCLUDE now use mandatory quotes, spaces are allowed in file names.
* org-publish.el (org-publish-cache-file-needs-publishing):
Make quotes mandatory around the file name and allow spaces in
it.

Thanks to Albert for this suggestion.
2012-05-18 09:17:58 +02:00
Bastien Guerry 4565bf0630 org-html.el (org-export-as-html): Add link to Org's and Emacs's websites.
* org-html.el (org-export-as-html): Add link to Org's and
Emacs's websites.
2012-05-18 08:32:08 +02:00
Adam Spiers e1630f60c7 Add hyperlink to Org website from HTML export footer
* lisp/org-html.el: add hyperlink to http://orgmode.org/ from export footer
2012-05-18 08:30:02 +02:00
Achim Gratz b3b7769457 guard invocation of org-mode and suppress warning from byte-compiler
* lisp/org.el: Add with-not-warnings around call of (org-fixup).
2012-05-18 07:45:46 +02:00
Achim Gratz 4f29c630d8 XEmacs compatibility improvements
* lisp/org-compat.el (org-find-library-dir): rename
  org-find-library-name (misleading) and implement with a function
  that exists identically in Emacs/XEmacs.

* UTILITIES/org-fixup.el: change calls to org-find-library-dir.
  Simplify invocations of git, use the same arguments as in targets.mk
  and use only functions that work the same in EMacs and XEmacs.

* lisp/org-exp-blocks.el: change calls to org-find-library-dir.

* lisp/org.el: change calls to org-find-library-dir.  Make require for
  noutline fail silently because it is missing from XEmacs.
2012-05-18 07:45:45 +02:00
Achim Gratz e7d2e4e186 ensure that M-x org-version always delivers something useful
* UTILITIES/org-fixup.el (org-make-org-version): change defconst to
  defun for org-release and org-git-version and close over those
  variables (do not make them global anymore).

* UTILITIES/org-fixup.el (org-fixup): check for org-version.el or try
  to use git to get the version from the worktree (code uses parts of
  the former implementation from org.el).

* lisp/org.el (org-version): use functions instead of global variables
  to get the version strings and remove the defvaralias to
  org-version.  Warn when encountering a mixed installation (org and
  org-install.el should be found in the same directory).

Supported use-cases:

1) Org uninstalled (and possibly uncompiled) from Git or tarball.

1a) No org-version.el or org-install.el exists in worktree.  Partially
supported configuration, org version is determined from git if
possible via UTILITIES/org-fixup.el.  However, Emacs versions
delivered with orgmode will provide autoloads that may or may not work
with that version of org (mixed installation).  If such a situation is
encountered, warn the user.  It can work if the autoloads from the
installation match the ones that would be generated for the worktree,
which generelly is only the case if there is a relatively recent
installation in site-lisp.

1b) Autoload file org-install.el exists in worktree.  Fully supported
configuration, org version is determined from git if possible via
UTILITIES/org-fixup.el.

1c) Both org-version.el or org-install.el exist in worktree.
Recommended configuration for 1), org version is taken from
org-version.el (git never gets invoked).

2) Org installed.  Both org-version.el and org-install.el must exist
in install directory.  Only supported configuration for 2), org
version is taken from org-version.el (git never gets invoked since
UTILITIES/org-fixup.el is not available).

Any unsupported configuration should still yield a version string, but
it will contain "N/A" to alert the user about a botched org
installation.
2012-05-18 07:45:45 +02:00
Achim Gratz b567341443 clean up Makefile some more, keep autoloads around
* lisp/Makefile: remove stop targets, make autoloads depend on source
  files again (not .PHONY).  Keep autoload files around after compile,
  but make sure to re-create them before installation and compile.
  Remove autoload files before re-creating them to avoid errors from
  Emacs when saving the buffer.

* targets.mk: remove stop targets and the mess that was necessary to
  support them.

* default.mk: must use $(CURDIR) not $(PWD), $(PWD) is not well
  defined when using sudo.
2012-05-18 07:45:45 +02:00
Achim Gratz df89e3cd0c cleanup in lisp/Makefile, targets; create org-fixup.el, remove version definition
* UTILITIES/org-fixup.el: new file, has functions to create
  org-version.el and org-install.el, now use by the build system.

* lisp/Makefile: delete said definitions, now sourced from toplevel
  make.  "clean" and "cleanall" should do the same thing here, make
  them aliases, ditto for "all" and "compile".  Both autoload files
  must be .PHONY and depend only on each other for correct ordering.
  Make "compile-dirty" actually do that again (i.e. no implied
  "clean", but "cleanauto").  Remove autoload files directly after
  install, so that they will only be present when explicitly requested
  by "autoloads".  Create "org-version.el" before compilation as it is
  mandatory.  Remove $(ORG_MAKE_INSTALL) and $(ORG_MAKE_VERSION),
  source from default.mk/local.mk.

* default.mk: move definitions for $(ORG_MAKE_INSTALL) and
  $(ORG_MAKE_VERSION) here so that they can be more easily configured.
  Remove definition of "org-release" from $(BATCH) and $(BTEST), now
  sourced from "org-version.el".

* targets.mk: target reorganization, introduce "stop" targets to
  prevent cleaning of org-version.el.  Use new targets for "oldorg" to
  make it more robust in case of errors.  New target "cleanutils" to
  remove any "*.elc" files that may have been produced there and add
  this target to "cleanall". Do the same in cleancontrib.
2012-05-18 07:45:44 +02:00
Bastien Guerry 4f60b5f3a5 Use (with-no-warnings ...) construct for `date' and `entry'. 2012-05-17 11:07:19 +02:00
Achim Gratz 71c1cae4a7 suppress byte-compiler warning about unprefixed global variables from calendar.el
* lisp/org.el: add with-no-warning to defvar for two unprefixed global
  variables from calendar.el (there's nothing else we can do inside
  org until it is fixed in calendar.el).
2012-05-17 11:07:15 +02:00
Bastien Guerry e06fff3e50 Remove a blank line causing a merge conflict with patches I want to apply. 2012-05-17 10:12:08 +02:00
Bastien Guerry 443398b766 Merge branch 'master' of orgmode.org:org-mode 2012-05-17 08:16:29 +02:00
Bastien Guerry 872516b8f9 New option `org-export-latex-link-with-unknown-path-format'.
* org-latex.el
(org-export-latex-link-with-unknown-path-format): New option.
(org-export-latex-links): Use it.

Thanks to Sébastien Vauban for a preliminary patch for this.
2012-05-17 08:06:58 +02:00
Rick Frankel eed31ad936 Add dbi support to sql babel mode
* lisp/ob-sql.el: add dbi engine type and pre/post processing
2012-05-16 19:50:43 -04:00
Bastien Guerry c4cad9f80b Fix merge conflict. 2012-05-16 23:46:36 +02:00
Eric Schulte 68c5a2f840 Merge branch 'origin-maint' 2012-05-16 13:15:55 -04: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
Eric Schulte 1b21168d52 save match data during indentation check
Thanks to Karl Berg for pointing out this issue.
2012-05-16 13:15:36 -04:00
Bastien Guerry d34c0b3496 ob-R.el: Fix compiler warning about `org-remove-if-not'. 2012-05-16 16:40:18 +02:00