ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of orgmode.org:org-mode

This commit is contained in:
Bastien Guerry 2014-08-25 06:06:47 +02:00
parent cad2400443 4dd9f392c1
commit facff6f605
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/orgguide.texi
View File

@ -1498,7 +1498,7 @@ the resulting time in inserts it after the time range as @samp{=>
HH:MM}.
@item C-c C-x C-e
Update the effort estimate for the current clock task.
@item C-c C-x C-x
@item C-c C-x C-q
Cancel the current clock. This is useful if a clock was started by
mistake, or if you ended up working on something else.
@item C-c C-x C-j

2
lisp/org-element.el
View File

@ -2450,7 +2450,7 @@ Assume point is at the beginning of the table."
(defun org-element-table-interpreter (table contents)
"Interpret TABLE element as Org syntax.
CONTENTS is nil."
CONTENTS is a string, if table's type is `org', or nil."
(if (eq (org-element-property :type table) 'table.el)
(org-remove-indentation (org-element-property :value table))
(concat (with-temp-buffer (insert contents)