Bastien Guerry
5adb7638fe
Merge branch 'master' of orgmode.org:org-mode
2012-04-11 00:44:05 +02:00
Bastien Guerry
c836b05084
Merge branch 'hotfix'
2012-04-11 00:43:48 +02:00
Bastien Guerry
7d8c5c66e9
org-table.el: Fix bug about handling remote references as durations.
...
* org-table.el (org-table-eval-formula): Fix bug about
handling remote references as durations.
Thanks to Sébastien Vauban for reporting this.
2012-04-11 00:43:05 +02:00
Bastien Guerry
f42e40d978
Merge branch 'hotfix'
2012-04-10 23:39:16 +02:00
Bastien Guerry
9586c880b7
org-pcomplete.el: Fix bug in `pcomplete/org-mode/file-option'.
...
* org-pcomplete.el (pcomplete/org-mode/file-option): Fix bug
in `pcomplete/org-mode/file-option'.
Before this fix, completing #+ATTR worked only once, as
`org-additional-option-like-keywords' was modified.
2012-04-10 23:39:09 +02:00
Bastien Guerry
dbd8745c29
Fix bug in org-pcomplete.el.
...
* org-pcomplete.el (org-thing-at-point): Also match line
options like LATEX_CLASS when pcompleting from LATEX_.
2012-04-10 23:37:12 +02:00
Bastien Guerry
990558eb21
Merge branch 'hotfix'
2012-04-10 22:26:18 +02:00
Bastien Guerry
bfe8ec1fce
org-agenda.el: Fix inconsistency in `org-agenda-filter-apply' for category filters.
...
* org-agenda.el (org-agenda-filter-make-matcher)
(org-agenda-filter-apply): Allow filtering entries out by
category. Using `C-u <' from the agenda view will redisplay
the agenda without entries from categories of the current
line.
Thanks to John Wiegley for pointing this out.
2012-04-10 22:25:53 +02:00
Eric Schulte
c8294348ef
Merge branch 'origin-hotfix-7.8.06'
2012-04-10 16:02:16 -04:00
Eric Schulte
6c1b38182b
better wrapping of main C function
...
Thanks to Dov Grobgeld for pointing out this fix.
* lisp/ob-C.el (org-babel-C-ensure-main-wrap): Add an explicit return
to automatically generated main methods.
2012-04-10 16:01:54 -04:00
Bastien Guerry
5841dbd5ec
Merge branch 'hotfix'
2012-04-10 20:23:29 +02:00
Bastien Guerry
3ec180b88f
Revert "org-agenda.el: Remove useless prefix argument."
...
This reverts commit 346907b996
.
2012-04-10 20:23:15 +02:00
Bastien Guerry
4611adac23
Merge branch 'hotfix'
2012-04-10 20:09:33 +02:00
Bastien Guerry
346907b996
org-agenda.el: Remove useless prefix argument.
...
* org-agenda.el (org-agenda-filter-by-category): Remove
useless prefix argument.
Thanks to John Wiegley for spotting this.
2012-04-10 20:09:28 +02:00
Bastien Guerry
4f4b817315
Merge branch 'hotfix'
2012-04-10 18:32:54 +02:00
Bastien Guerry
d4ddcbb8b3
Revert "org.el: Include tags from `org-tag-alist' when completing with the TAB key."
...
This reverts commit 647396464d
.
2012-04-10 18:20:04 +02:00
Bastien Guerry
1f80206166
Revert "org.el (org-fast-tag-selection): Fix an bug when listing tags for completion."
...
This reverts commit dca5af369c
.
2012-04-10 18:10:30 +02:00
Bastien Guerry
b05cbf73a0
Revert "org.el: Fix bug when gathering tag completion options."
...
This reverts commit e48d67ed6d
.
This commit doesn't take care of tag groups.
2012-04-10 18:04:28 +02:00
Bastien Guerry
6c67af5627
Revert "org.el: Include `org-tag-alist' in the list for tag completions."
...
This reverts commit acc7a0b2bb
.
See http://article.gmane.org/gmane.emacs.orgmode/54406
2012-04-10 18:03:39 +02:00
Bastien Guerry
4a6f76bab8
Merge branch 'hotfix'
2012-04-09 20:48:51 +02:00
Bastien Guerry
6144a83c5d
Fix bug in using ̀org-cycle-level' in non-org modes.
...
* org.el (org-point-at-end-of-empty-headline): Only try to
match ̀org-todo-line-regexp' when the value is non-nil, e.g.
in non-org modes.
Thanks to Jambunathan for bringing this up.
2012-04-09 20:48:43 +02:00
Bastien Guerry
8ab0dedc4e
Merge branch 'hotfix'
2012-04-09 20:06:21 +02:00
Bastien Guerry
bf4d38b1fb
org-table.el: Fix bug: make sure references to $0 are correctly handled.
...
* org-table.el (org-table-get-range): Fix bug: make sure
references to $0 are correctly handled.
Thanks to Nick Dokos for the suggestion.
This fixes the computation of values in this table:
| Record | Slope | ConfLower | ConfUpper |
|----------+--------------+--------------+--------------|
| GISTEMP | 0.0173837600 | 0.0133209130 | 0.0214466060 |
| HadCrut3 | 0.0158602890 | 0.0118664610 | 0.0198541180 |
See this message/thread:
http://article.gmane.org/gmane.emacs.orgmode/54341
2012-04-09 20:04:22 +02:00
Bastien Guerry
a1c3723b05
Merge branch 'hotfix'
2012-04-09 19:20:47 +02:00
Bastien Guerry
e6f5c4f1be
org.el: Prevent more fontification errors.
...
* org.el (org-fontify-meta-lines-and-blocks-1): Prevent more
fontification errors.
Thanks to Henning Redestig for reporting this and to Nick Dokos for
digging further.
2012-04-09 19:20:37 +02:00
Bastien Guerry
17443083c0
org-table.el: Add two autoload cookies.
...
* org-table.el (org-table-recalculate-buffer-tables)
(org-table-iterate-buffer-tables): Add autoload cookie.
Thanks to Sébastien Vauban who suggested adding an autoload
cookie for `org-table-iterate-buffer-tables'.
2012-04-09 17:32:18 +02:00
Bastien Guerry
c3cf7b1476
org.el: Exclude tables in src and example blocks.
...
* org.el (org-table-map-tables): Exclude tables in src and
example blocks.
Thansk to Sebastian for reporting this.
2012-04-09 17:27:32 +02:00
Bastien Guerry
1a8a39d2df
Merge branch 'hotfix'
2012-04-09 16:57:19 +02:00
Matt Lundin
275905ed8d
Fix hook docstring to reflect renaming of state to org-state.
...
* lisp/org.el: (org-after-todo-state-change-hook): Fix docstring to
reflect name change of state to org-state.
The renamed variable can cause user hooks added to
org-after-todo-state-change-hook to break, so it is essential to have
the correct variable name in the docstring.
2012-04-09 16:57:11 +02:00
Matt Lundin
76503ed1b4
Fix org-bbdb anniversaries to work with the new BBDB
...
* org-bbdb.el (org-bbdb-anniv-extract-date, org-bbdb-make-anniv-hash):
Fix org-bbdb anniversary functionality to accommodate bbdb 3.x.
There are two major changes in bbdb 3.x that need to be taken into
account. The first is that `bbdb-split' reverses the order of its
parameters in 3.x. The second is that `bbdb-record-getprop' is
replaced by bbdb-record-note in 3.x.
2012-04-09 12:53:08 +02:00
Bastien Guerry
14e4d7ece9
Merge branch 'hotfix'
2012-04-09 12:47:58 +02:00
Mike Sperber
8dda2fc1ee
Fix bug ion `org-footnote-normalize'.
...
* org-footnote.el (org-footnote-normalize): Correctly pass keyword
arguments to `org-export-preprocess-string'.
TINYCHANGE
2012-04-09 12:47:44 +02:00
Mike Sperber
872a6f75c9
Only use `visual-line-mode' if it's bound.
...
* org.el (org-kill-line): Access `visual-line-mode' only if it's
bound.
TINYCHANGE
2012-04-09 12:46:23 +02:00
Nicolas Goaziou
d6faea24d4
org-footnote: Fix bug related to sorting and folded view
...
* lisp/org-footnote.el (org-footnote-delete-definitions): Remove blank
lines before the footnote definition instead of removing those after
it.
* testing/lisp/test-org-footnote.el: Adapt tests.
2012-04-08 12:01:57 +02:00
Nicolas Goaziou
4019559ee2
org-footnote: Don't grab trailing blank lines in a footnote definition
...
* lisp/org-footnote.el (org-footnote-at-definition-p): Don't grab
trailing blank lines in a footnote definition.
(org-footnote-delete-definitions): Remove both footnote definition and
trailing blank lines.
* testing/lisp/test-org-export.el (test-org-export/fuzzy-links): Fix
a docstring.
* contrib/lisp/org-element.el (org-element-footnote-definition-parser):
Apply change to footnote definitions.
2012-04-06 19:14:51 +02:00
Bastien Guerry
e6fdf918a4
Merge branch 'hotfix'
2012-04-06 10:53:24 +02:00
Bastien Guerry
35a5f069d8
Revert "Fix global dynamic variables in org-special-blocks.el."
...
This reverts commit 9054ba39d0
.
The variable `line' is dynamically scoped in org-html and should
not be renamed here.
2012-04-06 10:52:34 +02:00
Stephen Eglen
76e7b07872
org-icalendar-timezone: doc string fix
...
* lisp/org-icalendar.el (org-icalendar-timezone): Fix typo and clarify
meaning.
Small typo (of -> or); clarify meaning of how timezone is calculated if
this variable is left as nil.
TINYCHANGE
2012-04-04 09:20:36 +02:00
Chris Gray
6fabe46cc7
Export: Allow for TOC generation if body-only is set
...
* lisp/org-html.el (org-export-as-html): Remove the check for
body-only in the code for generating tables of contents.
The docstring for org-export-as-html states that the body-only flag
removes everything outside the <body></body> tags (inclusive). Since
the table of contents is inside these tags, it should be exported when
requested even if the body-only flag is set.
2012-04-04 08:54:14 +02:00
Bastien Guerry
187f77a20a
org.el: Leave scheduled/deadline lines untouched when filling an adjacent paragraph.
...
* org.el (org-fill-paragraph): Leave scheduled/deadline lines
untouched when filling an adjacent paragraph.
Thanks to Stuart McLean for suggesting this.
2012-04-04 08:51:20 +02:00
Bastien Guerry
ce06791334
Merge branch 'hotfix'
2012-04-04 08:28:45 +02:00
Bastien Guerry
fc374109cd
org.el: Prevent an error when trying to fontify beyond (point-max).
...
* org.el (org-fontify-meta-lines-and-blocks-1): Prevent an
error when trying to fontify beyond (point-max).
TINYCHANGE
Thanks to Leo and Henning for reporting this, and to Nick Dokos
for providing the fix.
2012-04-04 08:28:17 +02:00
Bastien Guerry
72d911cfa2
Merge branch 'hotfix'
...
Conflicts:
lisp/org-capture.el
lisp/org-clock.el
2012-04-03 14:09:12 +02:00
Bastien Guerry
e48d67ed6d
org.el: Fix bug when gathering tag completion options.
...
* org.el (org-fast-tag-selection): Fix bug when gathering tag
completion options.
TINYCHANGE
Thanks to Noorul Islam K M for the patch.
2012-04-03 14:07:26 +02:00
Bastien Guerry
c55604074d
Add :version to org.el options.
2012-04-03 13:53:49 +02:00
Bastien Guerry
38e95cd088
Add :version to org-timer.el option.
2012-04-03 13:48:32 +02:00
Bastien Guerry
1d98ecf980
Add :version to org-src.el option.
2012-04-03 13:44:58 +02:00
Bastien Guerry
7a6b863a76
Add :version to ob-scheme.el option.
2012-04-03 13:44:15 +02:00
Bastien Guerry
6e2207fc0a
Add :version to org-attach.el option.
2012-04-03 13:43:54 +02:00
Bastien Guerry
a0d59ff6a3
Add :version to ob-plantuml.el option.
2012-04-03 13:43:36 +02:00
Bastien Guerry
8ca9c1b195
Add :version to org-capture.el options.
2012-04-03 13:43:06 +02:00
Bastien Guerry
117f14d345
Add :version to ob-exp.el option.
2012-04-03 13:41:59 +02:00
Bastien Guerry
7ffea1b7b9
Add :version to ob-js.el option.
2012-04-03 13:41:37 +02:00
Bastien Guerry
198f585350
Add :version to org-icalendar.el options.
2012-04-03 13:41:12 +02:00
Bastien Guerry
ae4ba1b35c
Add :version to org-agenda.el options.
2012-04-03 13:40:11 +02:00
Bastien Guerry
08ba2acbb3
Add :version to org-taskjuggler.el options.
2012-04-03 13:35:41 +02:00
Bastien Guerry
e77534b8b4
Add :version to org-exp-blocks.el option.
2012-04-03 13:33:59 +02:00
Bastien Guerry
c19f5c3c0d
Add :version to org-list.el options.
2012-04-03 13:32:23 +02:00
Bastien Guerry
cbd1a12295
Add :version to org-archive.el options.
2012-04-03 13:31:35 +02:00
Bastien Guerry
db138ea1f9
Add :version to org-wl.el options.
2012-04-03 13:31:06 +02:00
Bastien Guerry
5bb982881a
Add :version to ob-lisp.el option.
2012-04-03 13:30:07 +02:00
Bastien Guerry
e97aec45a4
Add :version to org-gnus.el option.
2012-04-03 13:29:41 +02:00
Bastien Guerry
346dc97753
Add :version to ob-picolisp.el option.
2012-04-03 13:29:15 +02:00
Bastien Guerry
5e3cf1bd26
Add :version to org-entities.el options.
2012-04-03 13:28:51 +02:00
Bastien Guerry
b846a86cfa
Add :version to ob.el options.
2012-04-03 13:28:23 +02:00
Bastien Guerry
bdd922e3f7
Add :version to org-clock.el options.
2012-04-03 13:27:34 +02:00
Bastien Guerry
d5220e906f
Add :version to org-exp.el options.
2012-04-03 13:26:05 +02:00
Bastien Guerry
8275726e7e
Add :version to org-habit.el options.
2012-04-03 13:24:40 +02:00
Bastien Guerry
cd2f395416
Add :version to org-table.el options.
2012-04-03 13:24:12 +02:00
Bastien Guerry
2894045bba
Add :version to org-docbook.el options.
2012-04-03 13:23:15 +02:00
Bastien Guerry
18a0b31022
Add :version to org-inlinetask.el option.
2012-04-03 13:22:38 +02:00
Bastien Guerry
4b849731f3
Add :version to org-faces.el options.
2012-04-03 13:22:15 +02:00
Bastien Guerry
b74be30199
Add :version to org-bibtex.el options.
2012-04-03 13:21:04 +02:00
Bastien Guerry
b0c26bd967
Add :version to org-html.el options.
2012-04-03 13:17:00 +02:00
Bastien Guerry
1755b53625
Add :version to ob-tangle.el options.
2012-04-03 13:14:06 +02:00
Bastien Guerry
f117fcb98b
Add :version to org-mobile.el options.
2012-04-03 13:12:47 +02:00
Bastien Guerry
a7076d693d
Add :version to ob-lob.el option.
2012-04-03 13:11:32 +02:00
Bastien Guerry
d5579cb431
Add :version to org-publish.el options.
2012-04-03 13:10:55 +02:00
Bastien Guerry
b2500c21b1
Add :version to org-freemind.el option.
2012-04-03 13:09:15 +02:00
Bastien Guerry
9b40893709
Add :version to org-beamer.el options.
2012-04-03 13:08:32 +02:00
Bastien Guerry
6d1ec16a5a
Add :version to org-ctags.el option.
2012-04-03 13:05:23 +02:00
Bastien Guerry
6c70ecffa7
Fix previous merge: add :version back to `org-use-effective-time'.
2012-04-03 09:48:48 +02:00
Bastien Guerry
2da8a36229
Merge branch 'hotfix'
...
Conflicts:
lisp/org.el
2012-04-03 09:46:34 +02:00
Bastien Guerry
a8c6802345
org.el (org-use-effective-time): Fix group and type.
...
* org.el (org-use-effective-time): Fix group and type.
2012-04-03 09:45:42 +02:00
Bastien Guerry
bbfd7881be
org.el (org-todo): Fix regression: rename `state' to `org-state'.
...
* org.el (org-todo): Fix regression: rename `state' to
`org-state'.
2012-04-03 09:43:20 +02:00
Bastien Guerry
3b04635542
Small doc improvement about HTML pre/postamble.
...
* org-html.el (org-export-html-preamble-format)
(org-export-html-postamble-format): Improve the docstring.
* org.texi (HTML preamble and postamble): Small doc improvement.
Thanks to Zachary Jones who asked for this.
2012-04-02 23:28:52 +02:00
Bastien Guerry
11a4749353
Merge branch 'hotfix-7.8.06'
2012-04-02 23:05:19 +02:00
Bastien Guerry
be07df1a49
org.el (org-todo): Fix regression: rename `state' to `org-state'.
...
* org.el (org-todo): Fix regression: rename `state' to
`org-state'.
2012-04-02 23:05:06 +02:00
Bastien Guerry
c187c512af
Merge branch 'hotfix-7.8.06'
2012-04-02 17:58:01 +02:00
Bastien Guerry
60b6f60dfe
Bump to version number 7.8.08.
2012-04-02 17:57:49 +02:00
Bastien Guerry
7d64e883b0
org-clock.el (org-show-notification): Use `fboundp' instead of `featurep' and the additional `require'.
...
* org-clock.el (org-show-notification): Use `fboundp' instead
of `featurep' and the additional `require'.
Thanks to Peter Münster for reporting this.
2012-04-02 16:52:16 +02:00
Bastien Guerry
a5774431b3
Merge branch 'hotfix-7.8.06'
2012-04-02 16:46:02 +02:00
Bastien Guerry
7ea4efd411
Don't rename `entry' to `org-entry'.
...
This issue should be handled more carefully.
2012-04-02 16:45:47 +02:00
Bastien Guerry
88b2228297
Merge branch 'hotfix-7.8.06'
2012-04-02 11:27:48 +02:00
Bastien Guerry
e74121b0cc
Fix bug in `org-todo'.
...
s/state/org-state.
2012-04-02 11:27:41 +02:00
Yury Bulka
9d6e554e1e
org-exp.el: Add ukrainian language.
2012-04-02 10:01:23 +02:00
Bastien Guerry
42d60368a3
Merge branch 'hotfix-7.8.06'
2012-04-02 08:07:57 +02:00
Bastien Guerry
3658686f59
Fix name of dynamically bound variable in org-clock.el.
2012-04-02 08:07:52 +02:00
Bastien Guerry
5651adb133
Merge branch 'hotfix-7.8.06'
2012-04-02 07:52:09 +02:00
Bastien Guerry
ccd84a9f63
Fix spelling mistakes.
...
Thanks to Paul Eggert for spotting these.
2012-04-02 07:51:52 +02:00