81dad90342
Merge branch 'maint'
2014-01-16 12:07:37 +01:00
d16477913d
Fix ff902c
2014-01-16 12:07:27 +01:00
c7408a2bd7
Merge branch 'maint'
2014-01-16 01:19:49 +01:00
d4b653656e
org.el (org-mode-restart): Fix turning off `org-indent-mode' when necessary
...
* org.el (org-mode-restart): Fix turning off `org-indent-mode'
when necessary.
2014-01-16 01:18:30 +01:00
a4a2935c3f
org.el (customize-package-emacs-version-alist): Fix Org version for Emacs 24.4
...
* org.el (customize-package-emacs-version-alist): Fix Org
version for Emacs 24.4.
2014-01-16 01:13:15 +01:00
73a6aba4b7
org.el (customize-package-emacs-version-alist): Fix Org version for Emacs 24.4
...
* org.el (customize-package-emacs-version-alist): Fix Org
version for Emacs 24.4.
2014-01-16 01:12:51 +01:00
c31782d903
org.el (org-src-fontify-natively): Default to `t'
...
* org.el (org-src-fontify-natively): Default to `t'.
Thanks to Sébastien Vauban for pushing this.
2014-01-16 01:11:33 +01:00
a5a7231304
Merge branch 'maint'
2014-01-16 00:55:46 +01:00
ff902c4429
Remove spurious defvar
...
Thanks to Nicolas Goaziou for reporting this.
2014-01-16 00:52:46 +01:00
27ab61acd0
Fix 4a9820
2014-01-16 00:35:12 +01:00
8898c380ab
Merge branch 'maint'
...
Conflicts:
lisp/org.el
2014-01-15 09:22:59 +01:00
0a8fe04a9d
Merge branch 'maint' of orgmode.org:org-mode into maint
2014-01-15 09:21:59 +01:00
947c3f5c2a
Fix 035087777
2014-01-15 09:21:44 +01:00
d9797ca17e
Revert "org.el (org-store-link): When a link has been stored, always returns it"
...
This reverts commit 035087777d
2014-01-15 09:19:30 +01:00
723306d6e7
Fix mode reset
2014-01-14 20:45:54 +01:00
5cd6b30182
Merge branch 'maint'
2014-01-14 12:39:01 +01:00
4a9820067a
Fix bug when demoting invisible headlines
...
* org.el (org-demote): Ignore invisible text when aligning
tags.
(org-set-tags): When JUST-ALIGN is 'ignore-column, ignore
invisible text when restoring the cursor to the correct
column.
This fixes a bug about demoting hidden headlines.
If org-move-to-column temporarily ignore visibility
specs, this will prevent org-demote to work correctly
in hidden regions.
Thanks to Susan Cragin for reporting this bug.
2014-01-14 12:38:50 +01:00
ae0f1c56a7
Small refactoring
...
* lisp/org.el (org-toggle-item): Do not call `org-list-struct' twice
and fix checkboxes after modifying one of them.
This patch is relative to 213c2a6aa0
2014-01-13 17:58:16 +01:00
6ea3dee45d
org.el (org-edit-special): Use `find-file-other-window'
...
* org.el (org-edit-special): Use `find-file-other-window' when
visiting included files.
2014-01-13 01:11:53 +01:00
213c2a6aa0
org.el (org-toggle-item): Handle TODO and DONE keywords
...
* org.el (org-toggle-item): When an entry has a TODO or a DONE
keyword, add an empty or a checked checkbox.
2014-01-13 00:02:42 +01:00
90884b9748
Merge branch 'master' of orgmode.org:org-mode
2014-01-12 10:03:38 +01:00
72b8a86d9c
Merge branch 'maint'
2014-01-12 10:03:17 +01:00
035087777d
org.el (org-store-link): When a link has been stored, always returns it
...
* org.el (org-store-link): When a link has been stored, always
returns it.
(Storing links from the agenda are broken otherwise.)
2014-01-12 09:56:41 +01:00
cad81696b8
Change no brace sub/superscript syntax
...
* lisp/org.el (org-match-substring-regexp): Simplify syntax when not
using braces. Also make the variable a defconst.
(org-match-substring-with-braces-regexp): Make the variable a defconst
and remove a useless group in regexp.
* lisp/org-element.el (org-element-subscript-parser,
org-element-superscript-parser): Adapt to group changes.
2014-01-11 23:54:22 +01:00
525304cbda
Merge branch 'maint'
2014-01-11 01:35:18 +01:00
21472107fa
org.el (org-ellipsis): Small docstring enhancement
...
* org.el (org-ellipsis): Small docstring enhancement.
2014-01-11 01:34:44 +01:00
f5380d1221
Merge branch 'maint'
2014-01-10 11:25:15 +01:00
8720c49807
Speed improvement
...
* lisp/org.el (org-get-previous-line-level): Do not call
`org-current-level' twice unless necessary. Also, avoid using
`line-number-at-pos' when the information needed is to know if point
is in the first line of the visible part of the buffer.
2014-01-10 11:22:49 +01:00
ccbe3965b1
Merge branch 'maint'
2014-01-07 13:26:12 +01:00
152712a7c8
Backport change from Chong on 2013-12-23
2014-01-07 13:25:30 +01:00
e4a013fcf3
Merge branch 'maint'
2014-01-05 14:21:51 +01:00
66fd521264
org.el (org-set-tags): Ignore invisible text when restoring cursor position
...
* org.el (org-set-tags): Ignore invisible text when restoring
cursor position.
2014-01-05 14:21:38 +01:00
3737676632
Update copyright year for files changed since 2013
2014-01-05 06:35:21 +01:00
0beda99171
Revert "Update copyright years."
...
This reverts commit 21105594fc
2014-01-05 06:28:07 +01:00
096ff7e078
Merge branch 'maint'
...
Conflicts:
contrib/lisp/org-favtable.el
2014-01-04 18:58:12 +01:00
21105594fc
Update copyright years.
2014-01-04 18:56:11 +01:00
d09088ca17
Merge branch 'maint'
2014-01-04 15:05:13 +01:00
45b0d23b0c
Fix creation of parent nodes when refiling.
...
* org.el (org-refile-get-location): Check for a refile
position when the position is not nil, otherwise allow to
create the parent node if the user requests it.
Thanks to Li Zhuo for reporting this bug and for providing
a preliminary patch.
2014-01-04 15:05:01 +01:00
c36ab62b11
Merge branch 'maint'
2014-01-04 14:53:10 +01:00
857cf28a90
org.el (org-refile-allow-creating-parent-nodes): Fix typo in docstring
...
* org.el (org-refile-allow-creating-parent-nodes): Fix typo in
docstring.
2014-01-04 14:53:00 +01:00
31c5e3dc8c
Merge branch 'maint'
2014-01-04 14:49:07 +01:00
597a7e65f0
org.el (org-entry-get): Minor docstring enhancement
...
* org.el (org-entry-get): Minor docstring enhancement.
2014-01-04 14:48:39 +01:00
02078833e0
Merge branch 'maint'
2014-01-04 12:23:27 +01:00
44acd00049
org.el (org-set-startup-visibility): Bugfix
...
* org.el (org-set-startup-visibility): Bugfix.
See http://article.gmane.org/gmane.emacs.orgmode/79905
2014-01-04 12:22:50 +01:00
914f3f88a7
Merge branch 'maint'
2014-01-03 17:38:19 +01:00
bee871762c
org.el (org-shiftcontrolup, org-shiftcontroldown): Ignore `org-support-shift-select' when point is on a clock log
...
* org.el (org-shiftcontrolup, org-shiftcontroldown): When
`org-support-shift-select' is not `nil', let-bind it to nil
if point is on a clock log. Otherwise throw an error.
2014-01-03 17:38:02 +01:00
f531d06f80
Merge branch 'maint'
2014-01-03 11:16:30 +01:00
f21150f185
org.el (org-do-emphasis-faces): Fix false positives handling
...
* org.el (org-do-emphasis-faces): Handle false positives by
restarting the re-search one char after the beginning of the
match, not one char before its ending.
Before this fix, consider this buffer
** Headline
- *Bold* non-bold
- *Bold* non-bold
The first false positive is "** Headline\n - *Bold*"
Starting the search again from the last "*" will skip
the "*Bold*" string. Starting again at "* Headline" will
find it.
2014-01-03 11:16:14 +01:00
af97893516
Merge branch 'maint'
2014-01-03 10:07:31 +01:00
9758f203fb
org.el (org-entry-put): Check that the value provided is a string
...
* org.el (org-entry-put): Check that the value provided is a
string. If it is nil, convert it to the empty string.
2014-01-03 10:07:09 +01:00
Bastien Guerry
Nicolas Goaziou
Carsten Dominik