d1f1c586d5
Fix merge conflict.
2012-04-20 11:43:27 +02:00
7d7144819f
org.el (org-mode): Don't use `buffer-face-mode' by default.
...
* org.el (org-mode): Don't use `buffer-face-mode' by default.
Still set `org-default' as the face for `buffer-face-mode-face' in
case the user turn `buffer-face-mode' on.
2012-04-20 11:41:24 +02:00
963f5968d3
org.el (org-read-date-display): Fix bug when displaying the overlay.
...
* org.el (org-read-date-display): Fix bug when displaying the
overlay.
TINYCHANGE
2012-04-20 11:38:27 +02:00
dbc6fd1ebf
Merge branch 'hotfix'
2012-04-18 13:02:09 +02:00
7d6309f132
org-list: Fix bugs relative to item indentation
...
* lisp/org-list.el (org-list-struct-indent): Follow
`org-list-demote-modify-bullet' specifications for ordered bullets.
(org-list-indent-item-generic, org-indent-item-tree,
org-outdent-item-tree): Fix bug when operating on a region.
(org-outdent-item, org-indent-item): Allow to operate on a region.
* lisp/org.el (org-shiftmetaleft, org-shiftmetaright): Allow to
operate on a region.
* testing/lisp/test-org-list.el: Add tests.
2012-04-18 13:01:44 +02:00
fe5e004e39
Merge branch 'hotfix'
2012-04-11 12:30:55 +02:00
148e8c7724
Bump to version 7.8.09.
2012-04-11 12:30:40 +02:00
4f4b817315
Merge branch 'hotfix'
2012-04-10 18:32:54 +02:00
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
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
b05cbf73a0
Revert "org.el: Fix bug when gathering tag completion options."
...
This reverts commit e48d67ed6d
2012-04-10 18:04:28 +02:00
6c67af5627
Revert "org.el: Include `org-tag-alist' in the list for tag completions."
...
This reverts commit acc7a0b2bbhttp://article.gmane.org/gmane.emacs.orgmode/54406
2012-04-10 18:03:39 +02:00
4a6f76bab8
Merge branch 'hotfix'
2012-04-09 20:48:51 +02:00
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
a1c3723b05
Merge branch 'hotfix'
2012-04-09 19:20:47 +02:00
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
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
1a8a39d2df
Merge branch 'hotfix'
2012-04-09 16:57:19 +02:00
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
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
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
ce06791334
Merge branch 'hotfix'
2012-04-04 08:28:45 +02:00
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
72d911cfa2
Merge branch 'hotfix'
...
Conflicts:
lisp/org-capture.el
lisp/org-clock.el
2012-04-03 14:09:12 +02:00
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
c55604074d
Add :version to org.el options.
2012-04-03 13:53:49 +02:00
6c70ecffa7
Fix previous merge: add :version back to `org-use-effective-time'.
2012-04-03 09:48:48 +02:00
2da8a36229
Merge branch 'hotfix'
...
Conflicts:
lisp/org.el
2012-04-03 09:46:34 +02:00
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
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
11a4749353
Merge branch 'hotfix-7.8.06'
2012-04-02 23:05:19 +02:00
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
c187c512af
Merge branch 'hotfix-7.8.06'
2012-04-02 17:58:01 +02:00
60b6f60dfe
Bump to version number 7.8.08.
2012-04-02 17:57:49 +02:00
a5774431b3
Merge branch 'hotfix-7.8.06'
2012-04-02 16:46:02 +02:00
7ea4efd411
Don't rename `entry' to `org-entry'.
...
This issue should be handled more carefully.
2012-04-02 16:45:47 +02:00
88b2228297
Merge branch 'hotfix-7.8.06'
2012-04-02 11:27:48 +02:00
e74121b0cc
Fix bug in `org-todo'.
...
s/state/org-state.
2012-04-02 11:27:41 +02:00
42d60368a3
Merge branch 'hotfix-7.8.06'
2012-04-02 08:07:57 +02:00
3658686f59
Fix name of dynamically bound variable in org-clock.el.
2012-04-02 08:07:52 +02:00
5651adb133
Merge branch 'hotfix-7.8.06'
2012-04-02 07:52:09 +02:00
ccd84a9f63
Fix spelling mistakes.
...
Thanks to Paul Eggert for spotting these.
2012-04-02 07:51:52 +02:00
e3913a2ab5
Merge branch 'hotfix-7.8.06'
2012-04-02 00:53:37 +02:00
5c38bf0ef7
Fix copyright and authors lines.
2012-04-02 00:53:28 +02:00
63fdc375a3
Merge branch 'hotfix-7.8.06'
...
Conflicts:
lisp/ob-exp.el
2012-04-01 21:52:01 +02:00
560cbe1c38
org.el: Fix bug in `org-todo'.
...
* org.el (org-todo): Fix bug in `org-todo'.
Thanks to Moritz Ulrich for this patch.
2012-04-01 20:35:21 +02:00
61106491b3
Merge branch 'hotfix-7.8.06'
2012-03-31 11:25:28 +02:00
a3ca0e43e5
Update version to 7.8.07 from hotfix.
2012-03-31 11:24:57 +02:00
22427a66ff
org.el (org-read-date): Fix bug from the last merge.
2012-03-31 11:09:25 +02:00
967783215b
Merge branch 'hotfix-7.8.06'
...
Conflicts:
lisp/org.el
2012-03-31 11:04:40 +02:00
Bastien Guerry
Zachary Kanfer
Nicolas Goaziou
Matt Lundin
Mike Sperber