0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-08-26 08:02:52 +00:00
Commit graph

7771 commits

Author SHA1 Message Date
Achim Gratz 19460418a0 Merge branch 'maint' 2013-01-06 18:33:16 +01:00
Achim Gratz 305f29776f Compatibility: Use org-define-obsolete-{function,variable}-alias
* lisp/org-compat.el (org-define-obsolete-function-alias,
  org-define-obsolete-variable-alias): Introduce new compatibility
  macros to obsolete functions and variables.

* lisp/org-agenda.el, lisp/org-clock.el, lisp/org-id.el,
  lisp/org-lparse.el, lisp/org-protocol.el lisp/org.el: Use
  `org-define-obsolete-{function,variable}-alias´instead of
  `define-obsolate{function,variable}-alias´.
2013-01-06 18:29:05 +01:00
Achim Gratz d524e7d611 Compatibility: Define face alias mode-line for XEmacs
* lisp/org-faces.el: Define face alias mode-line for XEmacs (it's
  called modeline there).
2013-01-06 18:28:24 +01:00
Bastien Guerry 8c5b47935f Merge branch 'maint' 2013-01-06 12:46:33 +01:00
Bastien Guerry 7b26ec60a9 Merge branch 'maint-agenda-optimization' into maint 2013-01-06 12:46:25 +01:00
Bastien Guerry b75b46620b org-entities.el (org-entities): Add the "neg" entity
* org-entities.el (org-entities): Add the "neg" entity.

Thanks to Florian beck for triggering this issue.
2013-01-06 12:38:45 +01:00
Bastien Guerry 47583ba1e4 org.el (org-read-date): Let-bind `mouse-autoselect-window' to nil
* org.el (org-read-date): Let-bind `mouse-autoselect-window'
to nil so that the mouse doesn't jump when the option is set
to t globally.

Thanks to E Sabof for reporting this.
2013-01-06 12:37:18 +01:00
Bastien Guerry d621d2eac3 New default value nil for `org-agenda-dim-blocked-tasks'
* org-agenda.el (org-agenda-dim-blocked-tasks): Default to
nil.
(org-agenda-dim-blocked-tasks): Make interactive and allow an
optional parameter 'invisible to hide blocked tasks instead of
just dimming them.
(org-agenda-mode-map): Bind `org-agenda-dim-blocked-tasks' to
"#".

With a default value of t for `org-agenda-dim-blocked-tasks',
any non-nil value for `org-enforce-todo-checkbox-dependencies' or
`org-enforce-todo-dependencies' (or both) will slow down the
agenda generation too much, which might surprise the user.
2013-01-06 12:31:20 +01:00
Bastien Guerry 806a141f1e org-agenda.el (org-agenda-finalize): Don't try to align tags when there are no tags
* org-agenda.el (org-agenda-finalize): Don't try to align tags
when there are no tags.
2013-01-06 09:20:30 +01:00
Bastien Guerry cd00d36ca2 org-agenda.el (org-agenda-finalize): Only try to draw the habit consistency graph when there is a habit in the buffer
* org-agenda.el (org-agenda-finalize): Only try to draw the
habit consistency graph when there is a habit in the buffer.
2013-01-06 09:14:54 +01:00
Bastien Guerry f1191b86e3 org-agenda.el (org-agenda-finalize): Only mark clocking task when there is one
* org-agenda.el (org-agenda-finalize): Only mark clocking task
when there is one.
2013-01-06 09:11:08 +01:00
Bastien Guerry 8d7990acfa Merge branch 'maint'
Conflicts:
	lisp/org.el
2013-01-05 17:29:06 +01:00
Bastien Guerry cad0b388dd org.el (org-adaptive-fill-function): DTRT in `message-mode'
* org.el (org-adaptive-fill-function): DTRT in `message-mode'.

This is too hackish, but do the job for now.  Instead of
having exceptions for `message-mode' filling wrapped into
org-*-fill* functions, we should let orgstruct++-mode do
this job.
2013-01-05 17:23:34 +01:00
Bastien Guerry 5c2dd988a5 Merge branch 'maint' 2013-01-04 18:15:56 +01:00
Bastien Guerry 6a0c650dd2 org.el (org-get-priority): Save match data even when using `org-get-priority-function'
* org.el (org-get-priority): Save match data even when using
`org-get-priority-function'.
2013-01-04 18:15:51 +01:00
Bastien Guerry 576f43b743 Merge branch 'maint' 2013-01-04 17:23:27 +01:00
Henning Weiss f90bc18561 org-mobile.el: Remove match description from block agendas when they have a title
* org-mobile.el (org-mobile-sumo-agenda-command): Remove match
description from block agendas when they have a title.

This makes the generated agendas.org file more readable, as
complicated block agendas otherwise have long titles.

TINYCHANGE
2013-01-04 17:20:57 +01:00
Bastien Guerry 9c7fa8cca9 Merge branch 'maint' 2013-01-03 13:37:13 +01:00
Bastien Guerry 7716b9c890 org-mobile.el (org-mobile-create-index-file): Possibly normalize `org-todo-keywords'
* org-mobile.el (org-mobile-create-index-file): Possibly
normalize `org-todo-keywords'.

Thanks to Ben Finney (and others) for reporting this.
2013-01-03 13:22:05 +01:00
Bastien Guerry fc65e379b0 org-mobile.el (org-mobile-allpriorities): New option
* org-mobile.el (org-mobile-allpriorities): New option.
(org-mobile-create-index-file): Use the new option.

Thanks to J. David Boyd for pointing this.
2013-01-03 13:07:08 +01:00
Bastien Guerry 3f4ad90975 org-mobile.el (org-mobile-push): Use the correct agenda buffer names
* org-mobile.el (org-mobile-push): Use the correct agenda
buffer names.

Thanks to Ramon Diaz-Uriarte for reporting this issue.
2013-01-03 12:39:58 +01:00
Bastien Guerry ab17f9959e Merge branch 'maint' 2013-01-02 23:54:12 +01:00
Bastien Guerry 56b47cd0fe org-latex.el (org-export-latex-inline-images): New option
* org-latex.el (org-export-latex-inline-images): New option.

This fixes a bug introduced in 4aaf1a, as
`org-export-latex-inline-images' is now needed.
Thanks to Gary Oberbrunner for reporting this
and to Nick Dokos for pointing at the problem.
2013-01-02 23:50:18 +01:00
Bastien Guerry fd0380b52f org.el (org-store-link): Use `org-id-link-to-org-use-id'
* org.el (org-store-link): Use `org-id-link-to-org-use-id'
instead of the obsolete variable name.
2013-01-02 23:46:14 +01:00
Bastien Guerry c1934ccfb4 org.el (org-fontify-meta-lines-and-blocks-1): Fix bug when fontifying keywords with no value
* org.el (org-fontify-meta-lines-and-blocks-1): Fix bug when
fontifying keywords with no value.
2013-01-02 23:43:53 +01:00
Bastien Guerry af5514b848 Merge branch 'maint' 2013-01-02 10:48:06 +01:00
Bastien Guerry 68acb955f1 org.el: Various fixes to the org-goto interface
* org.el (org-goto-auto-isearch): Enhance docstring.
(org-goto-map): Make a defun, so that the customized value of
org-goto-auto-isearch is correctly initialized.
(org-goto): Initialize the keymap with `org-goto-map'.
(org-get-location): Use *Org Help* as a temporary buffer.
Tell whether auto-isearch is on or off.

Thanks to Tyler Smith for reporting this.
2013-01-02 10:47:59 +01:00
Bastien Guerry a584268071 Merge branch 'maint' 2013-01-02 00:32:44 +01:00
Bastien Guerry 6272ff2d18 Fix number of arguments for org-export-as-org/docbook
* org-exp.el (org-export-as-org): Remove useless
argument.

* org-docbook.el (org-export-as-docbook-batch)
(org-export-region-as-docbook, org-export-as-docbook-pdf): Fix
the number of arguments.
(org-export-as-docbook): Remove useless argument.

Thanks to George McNinch for reporting this.
2013-01-02 00:32:35 +01:00
Bastien Guerry fb8ba17e69 Merge branch 'maint' 2013-01-01 23:49:16 +01:00
Bastien Guerry 2718888f8e Fix behavior of `org-forward/backward-h-s-l' before first headline
* org.el (org-forward-heading-same-level): Before the first
headline, go to the first headline.
(org-backward-heading-same-level): Before the first headline,
go to the beginning of the buffer, like
`outline-previous-visible-heading' does.
2013-01-01 23:49:12 +01:00
Bastien Guerry a9ece57df8 org.el (org-speed-commands-default): Use ":" instead of ";" for `org-set-tags-command'
* org.el (org-speed-commands-default): Use ":" instead of ";"
for `org-set-tags-command', which is consistent with ":" in
agenda view.  Use "=" for `org-columns".

Thanks to Alan Schmitt for pointing this.
2013-01-01 23:43:34 +01:00
Bastien Guerry bc0b221203 Merge branch 'maint' 2013-01-01 17:40:31 +01:00
Bastien Guerry fc2aae5d81 org.el (org-sparse-tree): Fix redundant information in prompt
* org.el (org-sparse-tree): Fix redundant information in prompt.
2013-01-01 17:40:13 +01:00
Bastien Guerry 55e1489d98 Merge branch 'maint' 2013-01-01 17:35:50 +01:00
Bastien Guerry 0f2bb6a56f org-exp.el (org-export-string): Fix number of arguments passed to the org-export-as-* functions.
* org-exp.el (org-export-string): Fix number of arguments
passed to the org-export-as-* functions.

This fixes commit 43a242, thanks to George McNinch for reporting this.
2013-01-01 17:35:35 +01:00
Bastien Guerry dbd84ad655 org-latex.el (org-export-as-latex): Fix typo in docstring
* org-latex.el (org-export-as-latex): Fix typo in docstring.
2013-01-01 17:29:54 +01:00
Bastien Guerry b6615d0179 Merge branch 'maint' 2013-01-01 17:11:12 +01:00
Bastien Guerry f1067fb47c org-list.el (org-cycle-include-plain-lists): Docstring enhancement
* org-list.el (org-cycle-include-plain-lists): Docstring
enhancement.

Thanks to James Harkins for raising this issue.
2013-01-01 16:31:26 +01:00
Bastien Guerry 4aaf1a4df2 Don't use `org-export-html-inline-images' to set the :inline-images property
* org-exp.el (org-export-plist-vars): Don't use
`org-export-html-inline-images' to set the :inline-images
property, use distinct properties for the various backends.

* org-publish.el (org-publish-project-alist): Ditto.

* org-latex.el (org-export-latex-links): Use
:latex-inline-images instead of :inline-images.
2013-01-01 16:27:15 +01:00
Bastien Guerry 60b23bdeac Merge branch 'maint'
Conflicts:
	contrib/lisp/htmlize.el
	etc/schema/od-manifest-schema-v1.2-os.rnc
	etc/schema/od-schema-v1.2-os.rnc
	lisp/org-exp-blocks.el
2013-01-01 16:06:17 +01:00
Bastien Guerry 98cd4687a2 Update copyright years.
Happy new year!
2013-01-01 16:04:24 +01:00
Bastien Guerry bd7c2a59e8 Merge branch 'maint' 2012-12-31 15:12:16 +01:00
Bastien Guerry 841a81007d Revert "org.el (org-fontify-meta-lines-and-blocks-1): Fix fontification bug"
This reverts commit 001b6d1ebd.
2012-12-31 15:12:09 +01:00
Bastien Guerry bf537b5139 Merge branch 'maint' 2012-12-31 11:29:26 +01:00
Bastien Guerry 001b6d1ebd org.el (org-fontify-meta-lines-and-blocks-1): Fix fontification bug
* org.el (org-fontify-meta-lines-and-blocks-1): Fix
fontification bug when fontifying a keyword with no associated
value.
2012-12-31 11:29:17 +01:00
Bastien Guerry 6fd066fb18 Merge branch 'maint' 2012-12-31 11:07:06 +01:00
Bastien Guerry 61993bc4bf org.el (org-cycle-internal-local): Don't run hooks when cycling a plain list before first headline
* org.el (org-cycle-internal-local): Don't run hooks when
cycling a plain list before first headline.
2012-12-31 11:06:55 +01:00
Bastien Guerry 6a758e26ff Merge branch 'maint' 2012-12-31 09:30:19 +01:00
Bastien Guerry a62beff06d org.el (org-ctrl-c-ctrl-c): Throw a user error when trying to toggle a blocked checkbox
* org.el (org-ctrl-c-ctrl-c): Throw a user error when trying
to toggle a blocked checkbox.
2012-12-31 09:29:45 +01:00