Commit Graph

13536 Commits

Author SHA1 Message Date
Bastien Guerry 5e8f30f61e org-table.el (orgtbl-apply-fmt): Enhance docstring
* ox.el (org-export-table-row-group): Fix typo in docstring.
2013-04-07 10:05:13 +02:00
Bastien Guerry 3f4028312e ox.el: Fix typos
* org-table.el (orgtbl-apply-fmt): Enhance docstring.
2013-04-07 10:03:37 +02:00
Rémi Vanicat 1f8822101b Correctly format orgtbl line when there is a :lfmt argument.
* org-table.el (orgtbl-format-line): Fix bug when formatting
line.

TINYCHANGE
2013-04-07 09:41:00 +02:00
Bastien Guerry 0625b53a07 org-table.el (orgtbl-apply-fmt): Enhance docstring
* org-table.el (orgtbl-apply-fmt): Enhance docstring.
2013-04-07 09:36:52 +02:00
Feng Shu ef8e4b57ed org-contacts.el , fix bugs about 'tel and 'note properties
* contrib/lisp/org-contacts.el (org-contacts-vcard-format): Fix bug by
taking the "tel" and "note" properties into account.
2013-04-07 08:07:23 +02:00
Nicolas Goaziou 40f390574c org.texi: Update internal links documentation
* doc/org.texi (Internal links): Document #+NAME keyword and
  cross-referencing during export.
* doc/orgguide.texi (Internal links): Add a note about
  cross-referencing.
2013-04-07 01:21:43 +02:00
Nicolas Goaziou 0ed17115a1 org.texi: Update documentation about included files
* doc/org.texi (Include files): Remove reference to :prefix1
  and :prefix.  Give more details for :minlevel.
2013-04-07 00:14:55 +02:00
Bastien Guerry 227bc3b702 Merge branch 'master' of orgmode.org:org-mode 2013-04-06 23:17:41 +02:00
Bastien Guerry 46cca57cb9 org-contacts.el (org-contacts-matcher): Better matcher
* contrib/lisp/org-contacts.el (org-contacts-matcher): Better matcher.

Thanks to Simon Thum for suggesting this.
2013-04-06 22:58:03 +02:00
Bastien Guerry 4a8f81153a org-contacts.el (org-contacts-export-as-vcard): Don't use non-existent function `org-install-letbind'
* contrib/lisp/org-contacts.el (org-contacts-export-as-vcard): Don't use
non-existent function `org-install-letbind'.

Thanks to Simon Thum for reporting this.
2013-04-06 22:51:17 +02:00
Bastien Guerry 591d377e78 org.el (org-file-contents): Make the message more prominent
* org.el (org-file-contents): Make the message more prominent.
2013-04-06 22:31:13 +02:00
Eric Schulte 09cb6d3f21 use org-babel-result-cond in Ruby code blocks
* lisp/ob-ruby.el (org-babel-execute:ruby): Use org-babel-result-cond in
  Ruby code blocks.
  (org-babel-ruby-evaluate): Delay table processing.
2013-04-06 12:59:04 -06:00
Eric Schulte fe93daa72a use org-babel-result-cond in JavaScript code blocks
* lisp/ob-js.el (org-babel-execute:js): Use org-babel-result-cond in
  JavaScript code blocks.
2013-04-06 11:39:23 -06:00
Eric Schulte 92e32755fd use org-babel-result-cond in scheme code blocks
* lisp/ob-scheme.el (org-babel-execute:scheme): Use
  org-babel-result-cond in scheme code blocks.
2013-04-06 11:39:23 -06:00
Eric Schulte f58889f0c1 use org-babel-result-cond in OCaml code blocks
* lisp/ob-ocaml.el (org-babel-execute:ocaml): Use org-babel-result-cond
  in OCaml code blocks.
2013-04-06 11:39:23 -06:00
Eric Schulte 4b51984fe7 use org-babel-result-cond in Haskell code blocks
* lisp/ob-haskell.el (org-babel-execute:haskell): Use
  org-babel-result-cond in Haskell code blocks.
2013-04-06 11:39:23 -06:00
Eric Schulte 7117ad4f92 raw org and drawer imply verbatim results
This unifies the results handling across a number of different
  languages.  It is still possible to force tabular output by adding the
  ":results table" argument.

The following example demonstrates the results in shell python and perl.

** drawer and table
#+begin_src sh :results drawer table
 echo -e "1\n2\n3"
#+end_src

#+RESULTS:
:RESULTS:
| 1 |
| 2 |
| 3 |
:END:

#+begin_src perl :results drawer table
"1\n2\n3"
#+end_src

#+RESULTS:
:RESULTS:
| 1 |
| 2 |
| 3 |
:END:

#+begin_src python :results drawer table
return "1\n2\n3"
#+end_src

#+RESULTS:
:RESULTS:
| 1\n2\n3 |
:END:

** drawer
#+begin_src sh :results drawer
 echo -e "1\n2\n3"
#+end_src

#+RESULTS:
:RESULTS:
1
2
3
:END:

#+begin_src perl :results drawer
"1\n2\n3"
#+end_src

#+RESULTS:
:RESULTS:
1
2
3
:END:

#+begin_src python :results drawer
return "1\n2\n3"
#+end_src

#+RESULTS:
:RESULTS:
1
2
3
:END:

** raw
#+begin_src sh :results raw
 echo -e "1\n2\n3"
#+end_src

#+RESULTS:
1
2
3

#+begin_src perl :results raw
"1\n2\n3"
#+end_src

#+RESULTS:
1
2
3

#+begin_src python :results raw
return "1\n2\n3"
#+end_src

#+RESULTS:
1
2
3

* lisp/ob-core.el (org-babel-result-cond): The "raw", "org" and "drawer"
  :results header argument values preclude table processing unless the
  "table" argument is given as well.
2013-04-06 11:39:23 -06:00
Bastien Guerry 52ba37b8c8 Merge branch 'master' of orgmode.org:org-mode 2013-04-06 19:11:57 +02:00
Bastien Guerry 1e496cc8f9 ox.el (org-export-replace-region-by): New function
* ox.el (org-export-replace-region-by): New function.
* ox-texinfo.el (org-texinfo-convert-region-to-texinfo):
* ox-md.el (org-md-convert-region-to-md):
* ox-latex.el (org-latex-convert-region-to-latex):
* ox-html.el (org-html-convert-region-to-html): New functions
to replace the active region by its export into various
backends.
2013-04-06 19:09:38 +02:00
Nicolas Goaziou f2fd185175 ox: Inhibit startup process when calling `org-mode'
* lisp/ox.el (org-export--get-inbuffer-options,
  org-export--list-bound-variables, org-export--generate-copy-script,
  org-export-string-as, org-export-expand-include-keyword,
  org-export--prepare-file-contents): Inhibit startup process when
  calling `org-mode'.
2013-04-06 17:31:56 +02:00
Bastien Guerry 133afe8915 Cosmetic change in messages. 2013-04-06 16:49:10 +02:00
Ippei FURUHASHI 67a55acb39 org-table.el: Fix a bug of leaving the inserted TBLFM line
* org-table.el (org-calc-current-TBLFM): Ensure to remove the
currently inserted TBLFM line, when calling `org-table-recalculate'
returns an error and the processing stops.

* testing/lisp/test-org-table.el: Add test.

When you hit =C-c C-c= at the line of "#+TBLFM: $2=$1*2::$2=$1**2" in

    | 1 |   |
    | 2 |   |
    #+TBLFM: $2=$1*1
    #+TBLFM: $2=$1*2::$2=$1**2

you got:

    | 1 |   |
    | 2 |   |
    #+TBLFM: $2=$1*2::$2=$1**2
    #+TBLFM: $2=$1*1
    #+TBLFM: $2=$1*2::$2=$1**2

with the error message of:

    user-error: Double definition `$2=' in TBLFM line, please fix by hand

In this case, you expected:

    | 1 |   |
    | 2 |   |
    #+TBLFM: $2=$1*1
    #+TBLFM: $2=$1*2::$2=$1**2
2013-04-06 15:15:44 +02:00
Nicolas Goaziou e01daa00be ox-publish: Fix "bad timestamp" error with some DATE values
* lisp/ox-publish.el (org-publish-find-date): Fix "bad timestamp"
  error with some DATE values: :date property in communication channel
  is no longer a string.
2013-04-06 14:17:26 +02:00
Nicolas Goaziou 67cf80ae9a ox: Add a command to insert a default export template
* lisp/ox.el (org-export-insert-default-template): New function.
(org-export--dispatch-ui, org-export--dispatch-action): Access to the
function through the dispatcher.

From the dispatcher, if subtree export is selected, options will be
installed as node properties in current subtree.
2013-04-06 13:34:41 +02:00
Carsten Dominik d1c940fe5c org.el (org-show-siblings): By default, also show siblings from a bookmark jump
* org.el (org-show-siblings): By default, also show siblings
from a bookmark jump.
2013-04-06 03:02:31 +02:00
Nicolas Richard 61f8870eb4 contrib/lisp/ob-maxima.el (org-babel-execute:maxima): Ignore lines with ";;; Loading #P"
* contrib/lisp/ob-maxima.el (org-babel-execute:maxima): Ignore
lines with ";;; Loading #P".

TINYCHANGE
2013-04-06 02:23:59 +02:00
Bastien Guerry bcc7a9cadf Merge branch 'master' of orgmode.org:org-mode 2013-04-06 01:52:02 +02:00
Bastien Guerry b37e27edb5 org-agenda.el (org-agenda-restriction-lock-highlight-subtree): New option
* org-faces.el (org-agenda-restriction-lock): Use less flashy
colors.

* org-agenda.el
(org-agenda-restriction-lock-highlight-subtree): New option.
2013-04-06 01:51:29 +02:00
Nicolas Goaziou 3d3465069b ox-icalendar: Fix DTSTAMP property value
* lisp/ox-icalendar.el (org-icalendar-convert-timestamp): Update
  docstring.
(org-icalendar-dtstamp): New function.
(org-icalendar--vevent, org-icalendar--vtodo): Use new function.
2013-04-05 21:28:35 +02:00
Bastien Guerry 5fc6764c1f org.texi (System-wide header arguments): Don't use "customizing" for setting a variable
* org.texi (System-wide header arguments): Don't use
"customizing" for setting a variable.  Also remove comments.

Thanks to Andreas Röhler for reporting this.
2013-04-05 20:08:16 +02:00
Bastien Guerry c61303ed3d org-agenda.el: Rename the "top-category" filter as "top-headline"
* org-agenda.el (org-agenda-top-headline-filter): Rename from
`org-agenda-top-headline-filter'.
(org-find-top-headline): Rename from `org-find-top-category'.
Add a docstring.
(org-agenda-filtered-by-top-headline): Rename from
`org-agenda-filtered-by-top-category'.
(org-agenda-filter-by-top-headline): Rename from
`org-agenda-filter-by-top-category'.  Fix docstring.
(org-agenda-filter-top-headline-apply): Rename from
`org-agenda-filter-top-category-apply'.  Fix docstring.
(org-agenda-mode-map): Update binding.

Using category here was confusing, because there is no Org
category involved, the filtering is really against a headline.
Since category filtering also exists, the confusion was bad.
2013-04-05 19:46:02 +02:00
Bastien Guerry 889b7e507c org-agenda.el (org-agenda-get-todos): Set `todo-state' earlier so that we can skip false-positives in time
* org-agenda.el (org-agenda-get-todos): Set `todo-state'
earlier so that we can skip false-positives in time.

For example, when searching for a TODO headline with "* NEXT bla"
in a buffer where (1) there is such a headline but (2) "NEXT" is
not in the list of known TODO keywords, then we skip this match.

The earlier behavior threw an error.
2013-04-05 19:46:02 +02:00
Bastien Guerry 428f12841f org.el (org-get-todo-state): Add a docstring
* org.el (org-get-todo-state): Add a docstring.
2013-04-05 19:46:02 +02:00
Carsten Dominik a5d6548a57 Highlight only headline with agenda subtree restriction
* lisp/org-agenda.el (org-agenda-set-restriction-lock): Highlight only
  the headline when agenda is restricted to a subtree.  Do not
  highlight the entire subtree.
2013-04-05 16:44:57 +02:00
Vladimir Lomov 29a75d0473 org.texi: Fix typo introduced in cf5e96
TINYCHANGE
2013-04-05 11:31:36 +02:00
Bastien Guerry 45d6d8f8a2 org.el: Let `C-o' insert a new row in tables and open a line elsewhere
* org.el (org-ctrl-o): New command to insert a new row in
tables (like `M-S-<down>' does) and open a line elsewhere.
(org-mode-map): Bind the new command to `C-o'.
2013-04-05 11:14:20 +02:00
Bastien Guerry d307657b9d org.el (org-set-regexps-and-options): Process tags from an external setup file
* org.el (org-set-regexps-and-options): Process tags from an
external setup file.

Thanks to Marcel van der Boom for reporting this bug.
2013-04-05 09:19:02 +02:00
Feng Shu bf55024ce0 org-contacts.el, add tel property
* org-contacts.el (org-contacts-tel-property): New variable,
  add tel property
  (org-contacts-vcard-format): Add the ability exporting tel property
2013-04-05 08:40:03 +02:00
Feng Shu 61fab323ec org-contacts.el, add note property
* org-contacts.el (org-contacts-note-property): New varible which add  note property
  (org-contacts-vcard-format): Add the ability  exporting  note property
2013-04-05 08:40:03 +02:00
Feng Shu bb6237c937 Let org-contacts.el has the ability which can export email-address list
* org-contacts.el (org-contacts-vcard-format): let the function
   work with email-address list.

The org-contact file is :

* Name
:PROPERTIES:
:EMAIL:  name1@test.org; name2@test.org, name3@test.org name4@test.org
:END:

The export result is like:

BEGIN:VCARD
VERSION:3.0
N:Name;;;
FN:Name
EMAIL:name1@test.org
EMAIL:name2@test.org
EMAIL:name3@test.org
EMAIL:name4@test.org
END:VCARD
2013-04-05 08:40:03 +02:00
Bastien Guerry c0589aa63a Merge branch 'master' of orgmode.org:org-mode 2013-04-05 08:38:07 +02:00
Bastien Guerry 618277cf93 org-agenda.el (org-agenda-limit-interactively): New command
* org-agenda.el (org-agenda-dim-blocked-tasks): Enhance
docstring.
(org-agenda-finalize-entries): Conditionally apply limits so
that we don't manipulate big lists uselessly.
(org-agenda-limit-entries): Limit exclusively.  E.g., when
limiting to a maximum of "2 tags", don't limit among tagged
entries only, but limit among all entries.
(org-agenda-limit-interactively): New command.
(org-agenda-mode-map): Bind the new command to "~".
(org-agenda-redo): Small fix: don't use `eval'.
2013-04-05 08:37:51 +02:00
Bastien Guerry 3ad43055bf org.el (org-ctrl-c-ctrl-c): Fix bug wrt updating checkboxes
* org.el (org-ctrl-c-ctrl-c): Fix bug wrt updating checkboxes:
the list beginning should be stored using a marker so that
updating [%0] to [%50] will not throw an error.
2013-04-05 08:37:51 +02:00
Ippei FURUHASHI bd8ff1aade doc/org.texi: Document applying current TBLFM to table
* org.texi (Editing and debugging formulas): Add an example
when a table has multiple #+TBLFM lines.
2013-04-05 08:37:51 +02:00
Ippei FURUHASHI 6693456dd7 org-table.el (org-calc-current-TBLFM): Add function
* org-table.el (org-calc-current-TBLFM): New function to
re-calculate the table by applying the #+TBLFM in the line
where the point is.

* org.el (org-ctrl-c-ctrl-c): Call `org-calc-current-TBLFM' when
point is in the #+TBLFM line.

* testing/lisp/test-org-table.el: Add test.
2013-04-05 08:37:51 +02:00
Ippei FURUHASHI c8c17460f1 org-table.el (org-TBLFM-begin): Add function
* org-table.el (org-TBLFM-begin): New defun.
(org-TBLFM-begin-regexp): New variable.

* testing/lisp/test-org-table.el: Add test.
2013-04-05 08:37:51 +02:00
Ippei FURUHASHI a268e33ef0 org.el (org-at-TBLFM-p): Add functon
* org.el (org-at-TBLFM-p): New defun.
(org-TBLFM-regexp): New defconst.

* testing/lisp/test-org-table.el: Add test.
2013-04-05 08:37:51 +02:00
Bastien Guerry 92af40344e Include org-w3m.el back into core.
w3m is the de facto way of browsing the web in GNU Emacs
so org-w3m.el should be kept in core.  The same argument
prevails for org-bbdb.el.
2013-04-05 08:37:51 +02:00
Bastien Guerry d5fd2008e3 org.el (org-babel-load-file): Move `org-babel-load-file' here
* org.el (org-babel-load-file): Move `org-babel-load-file'
from ob-tangle.el to here so that it is correctly autoloaded
by Emacs before Org is required.

Thanks to Eric Schulte for feedback about this.
2013-04-05 08:37:51 +02:00
Bastien Guerry b38036dd66 Move org-mac-message.el to contrib/.
* org-mac-message.el: Move to contrib/.

* org.el (org-modules): org-mac-message.el is now a
contributed package.
2013-04-05 08:37:51 +02:00