Commit Graph

18520 Commits

Author SHA1 Message Date
Nicolas Goaziou ee5d40b001 org-clock: Fix `org-clock-drawer-name'
* lisp/org-clock.el (org-clock-drawer-name): When
  `org-clock-into-drawer' is a number and `org-log-into-drawer' is t,
  default to "LOGBOOK".

* testing/lisp/test-org-clock.el (test-org-clock/into-drawer):
(test-org-clock/drawer-name): New tests.
2016-05-11 18:44:02 +02:00
Charles Berry 779222eba5 ob-comint.el: Require `tramp' and declare tramp functions
* ob-comint.el (org-babel-comint-eval-invisibly-and-wait-for-file):
  The tramp macro `with-parsed-tramp-file-name' invokes a bunch of
  tramp functions.  These are now declared and tramp is explicitly
  required.
2016-05-10 18:22:03 -07:00
Nicolas Goaziou 9210300260 Merge branch 'maint' 2016-05-10 23:08:34 +02:00
Nicolas Goaziou d1786a0908 org-clock: Fix generated drawer when `org-clock-into-drawer' is numerical
* lisp/org-clock.el (org-clock-find-position): Create a default
  "LOGBOOK" drawer when `org-clock-into-drawer' is a numeric value.

Reported-by: Carlos Noguera <carlos.francisco.noguera@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/106886>
2016-05-10 22:42:38 +02:00
Robert Klein 59237bc028 ox-html: Support more programming languages in CSS
* lisp/ox-html.el (org-html-style-default): Add languages.

The standard CSS for HTML export only supported a couple of
programming languages to have a language name "hover" on src
blocks.  This patch adds all languages supported per Org
manual, those from org.el's org-babel-load-languages-alist,
additional language identifiers in ob-*.el and languages
which have a) an emacs mode and b) are supported by the LaTeX
listings package.  Additional a language "conf" is supported
for generic configuraiton files; an emacs mode exists for
this, but for LaTeX listings a language " " has to be faked.
As this patch is for HTML, this is no impediment.

Thanks for reporting the missing support to Tianxian XIONG.
2016-05-10 22:21:21 +02:00
Nicolas Goaziou bc327e0b23 ORG-NEWS: Document new plantuml output formats 2016-05-10 22:19:40 +02:00
Nicolas Goaziou 8127b3c30d Merge branch 'maint' 2016-05-05 13:15:34 +02:00
Nicolas Goaziou 83e373f109 Fix `org-occur' when regexp matches a single char
* lisp/org.el (org-occur): Fix infloop when regexp matches a single
  char.  Improve docstring.

(org-check-before-date):
(org-check-after-date):
(org-check-dates-range): Match correct object since point may be at the
beginning of the next one.

* testing/lisp/test-org.el (test-org/occur): New test.
2016-05-05 12:59:46 +02:00
Nicolas Goaziou 1ca1d52e92 Fix `org-occur' when called non-interactively
* lisp/org.el (org-first-headline-recenter): Check if current buffer is
  actually displayed in a window before trying to recenter view.
2016-05-05 11:55:00 +02:00
Nicolas Goaziou 3308a5ecfe Merge branch 'maint' 2016-05-04 14:23:57 +02:00
Nicolas Goaziou 8638c14fbd org-agenda: Fix error on empty headlines
* lisp/org-agenda.el (org-agenda-get-timestamps):
(org-agenda-get-deadlines):
(org-agenda-get-scheduled):
(org-agenda-get-blocks): Handle empty headlines.
2016-05-04 14:20:09 +02:00
Chunyang Xu b46527a8ba org-capture: Adapt user-error for aborting by user
* lisp/org-capture.el (org-capture):
(org-mks): Replace `error' with `user-error'.

When `org-capture` is aborted by user with 'q' or 'C-g', `user-error' is
better than `error' when exiting.

TINYCHANGE
2016-05-03 19:17:34 +02:00
Rainer M. Krug d87bf07ea6 ob-plantuml: Add new output formats
* lisp/ob-paltuml (org-babel-execute:plantuml): add new output formats
  of plantuml:
  - pdf : this needs extra java mudules to run which are mentioned on the
    plantml website (http://fr.plantuml.com/pdf.html)
  - vdx
  - xmi
  - scxml
  - html
  - txt (ascii art)
  - utxt (ascii art using unicode)

  The output format is based on the extension of the output file.
2016-05-03 19:13:50 +02:00
Nicolas Goaziou 36dbdb9465 Fix keywords in defcustom
* lisp/org.el (org-show-context-detail): Fix keywords according to
  commit c112f40.
2016-05-01 01:32:16 +02:00
Nicolas Goaziou 590cb1227a Merge branch 'maint' 2016-05-01 01:30:57 +02:00
Nicolas Goaziou af853dd3aa Fix `org-flag-drawer' with optional argument
* lisp/org.el (org-flag-drawer): Do not require point to be at a drawer
  in order to call the function with an optional argument.

* testing/lisp/test-org.el (test-org/flag-drawer): Narrow test.
2016-05-01 01:27:30 +02:00
Nicolas Goaziou bb034dfe04 `org-show-context' always displays point
* lisp/org.el (org-show-set-visibility): Always show point, even when it
  is hidden in a block or a drawer.

* testing/lisp/test-org.el (test-org/show-set-visibility): Add tests.

Reported-by: Derek Feichtinger <dfeich@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/106744>
2016-05-01 01:14:10 +02:00
Nicolas Goaziou c112f40d51 org-agenda: Remove unnecessary visibility modification
* lisp/org.el (org-show-context-detail): Change default visibility span
  for agenda context.

* lisp/org-agenda.el (org-agenda-goto):
(org-agenda-todo):
(org-agenda-add-note):
(org-agenda-priority):
(org-agenda-set-tags):
(org-agenda-set-property):
(org-agenda-set-effort):
(org-agenda-toggle-archive-tag):
(org-agenda-clock-in): Special visibility is taken care of by
`org-show-context'.  Do not hard-code anything else.

* contrib/lisp/org-contacts.el (org-contacts-gnus-article-from-goto):
Special visibility is taken care of by `org-show-context'.  Do not
hard-code anything else.
2016-04-29 11:35:49 +02:00
Nicolas Goaziou 39cbbca8b6 ox-beamer: Fix "apply: Wrong number of arguments: max, 0"
* lisp/ox-beamer.el (org-beamer-select-environment): Use variable
  introduced in 4743d43.

Reported-by: Jarmo Hurri <jarmo.hurri@iki.fi>
<http://permalink.gmane.org/gmane.emacs.orgmode/106705>
2016-04-28 23:29:17 +02:00
Nicolas Goaziou 3baf246f4f Handle correctly `shift-select-mode'
* lisp/org.el (org-beginning-of-line): Handle correctly `shift-select-mode'.

Reported-by: Mathieu Marques <mathieumarques78@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/106783>
2016-04-28 23:28:15 +02:00
Nicolas Goaziou 6ed60a797a Merge branch 'maint' 2016-04-28 22:08:01 +02:00
Nicolas Goaziou c8c2d2b1f7 Fix multiple groups of mutually exclusive tags
* lisp/org.el (org-set-tags): Use a subtler mechansim to remove
  duplicate tags.  This fixes a bug introduced in 77b4fad.

Reported-by: Christoph LANGE <math.semantic.web@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/106763>
2016-04-28 22:04:49 +02:00
Nicolas Goaziou ec615b192d Fix `org-export-babel-evaluate' handling
* lisp/ob-exp.el (org-babel-exp-process-buffer): Handle
  `org-export-babel-evaluate' handling.
(org-babel-exp-results): Ignore `org-export-babel-evaluate' since it is
handled as a higher level.

* lisp/ox.el (org-export-as): Allow to short-circuit babel evaluation if
  `org-export-babel-evaluate' is nil.

* testing/lisp/test-ob-exp.el (ob-export/babel-evaluate): New test.

Reported-by: Nicolas Richard <nrichard@ulb.ac.be>
<http://permalink.gmane.org/gmane.emacs.orgmode/106767>
2016-04-28 17:29:14 +02:00
Nicolas Goaziou f227c2f1af Silence byte-compiler 2016-04-28 17:02:29 +02:00
Nicolas Goaziou bbf5b455c6 Fix failing test
* testing/lisp/test-ox.el (test-org-export/get-reference): Fix failing
  test.
2016-04-28 16:55:24 +02:00
Nicolas Goaziou 9508dc9af2 ox: Internal references are always 10 character long
* lisp/ox.el (org-export-format-reference): Internal references are
  always 10 character long.

This reduces further possible reference clashes with user-defined
labels.
2016-04-26 21:04:41 +02:00
Nicolas Goaziou 1daac70fc5 Merge branch 'maint' 2016-04-26 21:03:45 +02:00
Nicolas Goaziou e818699113 Fix storing links to headlines containing multiple links
* lisp/org.el (org-store-link): Fix storing links to headlines
  containing multiple links.

* testing/lisp/test-org.el (test-org/store-link): New test.

Reported-by: Georgiy Tugai <georgiy.tugai@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/106606>
2016-04-26 20:59:33 +02:00
Nicolas Goaziou 00a8275c62 Fix links to elements with a name
* lisp/org.el (org-store-link): Properly handle elements with a NAME
  keyword.
2016-04-26 18:58:01 +02:00
Nicolas Goaziou ce748a7ed5 Merge branch 'maint' 2016-04-26 18:47:43 +02:00
Nicolas Goaziou 91ea3920df ox-ascii: Fix spurious links
* lisp/ox-ascii.el (org-ascii--unique-links): Fix spurious links.

Reported-by: Samuel Wales <samologist@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/106667>
2016-04-26 18:46:34 +02:00
Charles Berry da4db33132 ob-comint.el: Revert yet another change
* ob-comint.el (org-babel-comint-eval-invisibly-and-wait-for-file):
  Remove the `(ignore v)'.  This creates a byte-compiler warning for
  supposedly unused `v', but allows remote execution.
2016-04-23 17:03:26 -07:00
Charles Berry e1d6a43c8e ob-comint.el: Reinstate let-bound variable from last commit.
* ob-comint.el (org-babel-comint-eval-invisibly-and-wait-for-file):
  Reinstate `let (v)' which `org-babel-evaluate-session' relies on.
2016-04-23 16:33:39 -07:00
Charles Berry e42454088f ob-comint.el: Fix bug and remove unused let binding
* ob-comint.el: (tramp-flush-directory-property declaration): The
  file is now "tramp-cache".

* ob-comint.el (org-babel-comint-eval-invisibly-and-wait-for-file):
  Remove unused let binding for `v' (which is let bound by
  `with-parsed-tramp-file-name').

Bug reported by Vikas Rawal
Subject: Using tramp to run R source code blocks on remote server
Archived-At: <http://permalink.gmane.org/gmane.emacs.orgmode/106557>
2016-04-23 16:07:46 -07:00
Kyle Meyer dfafc869a3 Merge branch 'maint' 2016-04-23 17:40:16 -04:00
Kyle Meyer ae73c75fa6 org-yank: Correct docstring
* lisp/org.el (org-yank): Update docstring for change in default value
  of org-yank-adjusted-subtrees.

The default value was changed to nil in 2949012 (Change default values
of some variables., 2009-02-01).

Reported-by: Jorge Peixoto de Morais Neto <jorge13515@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/106610>
2016-04-23 17:38:45 -04:00
Nicolas Goaziou 7e320e2f1b ob-emacs-lisp: Defaut binding is dynamic
* lisp/ob-emacs-lisp.el (org-babel-default-header-args:emacs-lisp):
  Change default value.

<http://permalink.gmane.org/gmane.emacs.orgmode/106530>
2016-04-20 23:45:32 +02:00
Nicolas Goaziou 466d044a9b org-bibtex: Fix curly braces removal
* lisp/org-bibtex.el (org-bibtex-read): Only remove one level of curly
  braces when parsing an entry.

Reported-by: timor <timor.dd@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/106495>
2016-04-20 22:59:55 +02:00
Oleh Krehel 7dd0d7a567 Avoid "Marker points into wrong buffer"
* lisp/org-indent.el (org-indent-initialize-buffer): Add a check.  The
bug occurred when trying to capture before any Org buffers were open.
2016-04-20 17:22:09 +02:00
Oleh Krehel 8614a2476f Add detailed location to "org-mode fontification error"
* lisp/org.el (org-fontify-meta-lines-and-blocks): Update.
2016-04-20 17:22:09 +02:00
Oleh Krehel e85f80e2f8 lisp/org-agenda.el (org-agenda-run-series): Prettify 2016-04-20 17:22:09 +02:00
John Kitchin 516bbf417c ob-emacs-lisp: Make lexical eval default for elisp src blocks
* lisp/ob-emacs-lisp.el (org-babel-header-args:emacs-lisp):
(org-babel-default-header-args:emacs-lisp): New variables.
(org-babel-execute:emacs-lisp): Add an optional argument to the eval
function.
2016-04-19 21:40:21 +02:00
Nicolas Goaziou b2411769cf Merge branch 'maint' 2016-04-19 21:31:30 +02:00
Nicolas Goaziou 21ef130752 ox-odt: Fix styles location
* lisp/ox-odt.el (org-odt-styles-dir-list): Point to correct location
  for styles.

Reported-by: Colin Baxter <m43cap@yandex.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/106209>
2016-04-19 21:30:39 +02:00
Nicolas Goaziou dbda42010c org-agenda: Fix "Void variable org-clock-current-task"
* lisp/org-agenda.el (org-agenda-mark-clocking-task):
(org-agenda-clock-goto): `org-clock-current-task' may not be defined, so
check that first.

Reported-by: Kyle Meyer <kyle@kyleam.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/106504>
2016-04-19 21:14:54 +02:00
Nicolas Goaziou 7894129841 Merge branch 'maint' 2016-04-19 01:37:50 +02:00
Nicolas Goaziou 77b4fad528 Remove duplicate candidates when setting tags
* lisp/org.el (org-set-tags): Remove duplicate candidates from menu.
2016-04-19 01:34:27 +02:00
Nicolas Goaziou 2a49038fd6 org-pcomplete: Fix TAGS completion
* lisp/org-pcomplete.el (pcomplete/org-mode/file-option/tags):
(pcomplete/org-mode/tag): Use new `org-current-tag-alist' instead of
`org-tag-alist' so as to take `org-tag-persistent-alist' into
consideration.
2016-04-18 19:34:08 +02:00
Nicolas Goaziou 9297757fc0 Fix tag related defcustoms
* lisp/org.el (org-tag-alist):
(org-tag-persistent-alist): Improve docstring. Fix values.
2016-04-18 18:08:53 +02:00
Nicolas Goaziou 4743d43dd8 Properly handle `org-tag-persistent-alist'
* lisp/org.el (org-current-tag-alist): New variable.
(org-set-tags):
(org-global-tags-completion-table):
(org-agenda-prepare-buffers): Use new variable.
(org-set-regexps-and-options): Use new variable.  Handle STARTUP early
so that "#+STARTUP: noptag" is taken into consideration.

* lisp/org-agenda.el (org-agenda-bulk-action): Use new variable.

* lisp/org-mobile.el (org-mobile-create-index-file): `org-tag-alist' is
  no longer buffer-local.

* testing/lisp/test-org.el (test-org/set-regexps-and-options): Add
  tests.
2016-04-18 18:07:40 +02:00