Rasmus
cadb9f3603
Merge branch 'maint'
2015-08-14 02:04:49 +02:00
Nicolas Goaziou
f6be2b5aa3
Merge branch 'maint'
2015-08-14 02:04:13 +02:00
Rasmus
182552ee75
org.el: Add version header
...
* org.el: Add version header.
* README_maintainer: Mention Version header.
2015-08-14 02:03:54 +02:00
Matt Lundin
a3eeddefce
Fix completion when selecting more than one tag
...
* lisp/org.el (org-fast-tag-selection): Make sure to set local variable
buffer-tags to actual buffer-tags before pushing selected tag to the
list; otherwise, the subsequent completion list will be limited to the
one selected tag.
2015-08-14 01:58:49 +02:00
Nicolas Goaziou
d7c6d92166
Merge branch 'maint'
2015-08-14 01:07:52 +02:00
Nicolas Goaziou
f8c4102cc6
org-footnote: Fix positioning when inserting footnotes
...
* lisp/org-footnote.el (org-footnote-new): Fix point when a new footnote
triggers sorting.
Reported-by: Gerald Wildgruber <Gerald.Wildgruber@unibas.ch>
<http://permalink.gmane.org/gmane.emacs.orgmode/99997 >
2015-08-14 01:05:40 +02:00
Nicolas Goaziou
4ddfa565c9
Merge branch 'maint'
2015-08-14 00:19:39 +02:00
Nicolas Goaziou
719a201c3b
org-src: Fix remote editing
...
* lisp/org-src.el (org-src--contents-area): Make sure buffer is widened
before extracting contents of area.
2015-08-14 00:17:47 +02:00
Nicolas Goaziou
e1e3cf0189
Merge branch 'maint'
2015-08-13 22:53:27 +02:00
Tom Hinton
0500bd09e2
Fix clock in when org-clock-into-drawer is integer
...
* org-clock.el (org-clock-jump-to-current-clock): Fixed a bug wherein
`org-clock-jump-to-current-clock' did not work if
`org-clock-into-drawer' was not either a string or nil.
TINYCHANGE
2015-08-13 22:51:09 +02:00
Nicolas Goaziou
2f2f266c24
Merge branch 'maint'
2015-08-13 22:33:29 +02:00
Nicolas Goaziou
db314d8ad0
Fix table detection in non-Org buffers
...
* lisp/org.el (org-at-table-p): Allow local tables without full valid
syntax when current buffer is not in Org mode.
Reported-by: Benjamin Slade <slade@jnanam.net>
<http://permalink.gmane.org/gmane.emacs.orgmode/99982 >
2015-08-13 22:31:36 +02:00
Kyle Meyer
a97f2c1830
Add org-link-edit.el to contrib
...
* contrib/lisp/org-link-edit.el: New file.
* contrib/README: Add org-link-edit.el entry.
Copy org-link-edit.el from upstream's b3aa4dd.
2015-08-13 01:53:58 -04:00
Kyle Meyer
db4b0e7b9e
Merge branch 'maint'
2015-08-12 23:31:55 -04:00
Archenoth
81a6372947
ob-ruby: Fix double-escaping
...
* lisp/ob-ruby.el (org-babel-ruby-evaluate): Remove second call to
`org-babel-ruby-table-or-string'.
<http://permalink.gmane.org/gmane.emacs.orgmode/99888 >
TINYCHANGE
2015-08-12 22:55:54 -04:00
Nicolas Goaziou
4bb5306f2d
Merge branch 'maint'
2015-08-13 02:44:02 +02:00
Nicolas Goaziou
4dc79cbe9d
Fix splitting headlines with RET
...
* lisp/org.el (org-return): Make sure to keep headline from being
invalidated by restricting positions where it can be split.
* testing/lisp/test-org.el (test-org/return): Add test.
2015-08-13 02:42:08 +02:00
Alexey Lebedeff
997a9a45d9
Make `org-return' follow links in headings again
...
* org.el (org-return): Check for links first when
`org-return-follows-link' is non-nil, before inserting any newlines.
* testing/lisp/test-org.el (test-org/return): Add test.
This patch restores order in which `org-return' perform actions (which
was changed in a7e62499f2
).
TINYCHANGE
2015-08-13 02:25:17 +02:00
Nicolas Goaziou
0461101fbb
Merge branch 'maint'
2015-08-12 15:01:10 +02:00
Nicolas Goaziou
c8e3bc2bbc
org.texi: Fix compilation error
...
* doc/org.texi (Macro replacement): Fix typo.
2015-08-12 15:00:48 +02:00
Nicolas Goaziou
128c132c60
Merge branch 'maint'
2015-08-12 14:53:56 +02:00
Nicolas Goaziou
1e268ad334
org-colview: Fix column view area
...
* lisp/org-colview.el (org-columns-goto-top-level): Actually move point.
(org-columns): Adapt to change above.
Reported-by: Johan Sandblom <js@ndblom.se>
<http://permalink.gmane.org/gmane.emacs.orgmode/99892 >
2015-08-12 14:49:02 +02:00
Nicolas Goaziou
252029b10b
Merge branch 'maint'
2015-08-12 01:13:38 +02:00
Nicolas Goaziou
0359f7550a
org-colview: Fix typo in a docstring
...
* lisp/org-colview.el (org-columns--value): Fix typo.
2015-08-12 01:12:43 +02:00
Nicolas Goaziou
36468b90db
Merge branch 'maint'
2015-08-12 00:58:53 +02:00
tsdye
06026a16f9
org.texi: Edit date and time macros
...
* doc/org.texi (Macro replacement): Edit date and time macros.
2015-08-12 00:58:15 +02:00
Nicolas Goaziou
3add787abd
Merge branch 'maint'
2015-08-11 19:12:49 +02:00
Nicolas Goaziou
6116c72975
Fix column view sums
...
* lisp/org.el (org-entry-properties): Remove need for `org-summaries'
property.
* lisp/org-colview.el (org-columns--value): New function.
(org-columns):
(org-agenda-columns): Use new functions.
Reported-by: Johan Sandblom <js@ndblom.se>
<http://permalink.gmane.org/gmane.emacs.orgmode/99865 >
2015-08-11 19:12:17 +02:00
Nicolas Goaziou
05994dc775
Merge branch 'maint'
2015-08-11 14:46:14 +02:00
Nicolas Goaziou
e8253c57f1
org-agenda: Fix slowdown introduced in 570b193
...
* lisp/org-agenda.el (org-agenda-dim-blocked-tasks): Do not check
multiple times the same entry.
Reported-by: Matt Lundin <mdl@imapmail.org>
<http://permalink.gmane.org/gmane.emacs.orgmode/99842 >
2015-08-11 14:42:34 +02:00
Nicolas Goaziou
4a7b2c5072
Merge branch 'maint'
2015-08-11 14:13:46 +02:00
Nicolas Goaziou
9bb87f49f7
org-list: Fix "Invalid search bound" error
...
* lisp/org-list.el (org-update-checkbox-count): Fix "Invalid search
bound" error.
Reported-by: Rasmus <rasmus@gmx.us>
<http://permalink.gmane.org/gmane.emacs.orgmode/99837 >
2015-08-11 14:11:15 +02:00
Nicolas Goaziou
a0c634ba3c
Merge branch 'maint'
2015-08-10 23:24:06 +02:00
Nicolas Goaziou
ac0661189e
org-list: Fix statistics updating with cookie in sublist
...
* lisp/org-list.el (org-update-checkbox-count): Properly update
statistics cookies in a sublist.
* testing/lisp/test-org-list.el (test-org-list/update-checkbox-count):
Add test.
Reported-by: Gerald Wildgruber <Gerald.Wildgruber@unibas.ch>
<http://permalink.gmane.org/gmane.emacs.orgmode/99792 >
2015-08-10 23:23:39 +02:00
Nicolas Goaziou
e658b07c8a
Merge branch 'maint'
2015-08-10 22:36:02 +02:00
Nicolas Goaziou
aa98f7c79a
Edit proper timestamp when on a time range
...
* lisp/org.el (org-time-stamp): Offer appropriate default value
depending on position of point in a time range.
Reported-by: Christoph LANGE <math.semantic.web@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/99783 >
2015-08-10 22:32:24 +02:00
Nicolas Goaziou
a472043b74
Fix ambiguous docstrings
...
* lisp/org.el (org-at-date-range-p):
(org-at-timestamp-p): Make match data explicit when returning a non-nil
value.
2015-08-10 22:31:31 +02:00
Kyle Meyer
caf762e9bc
Merge branch 'maint'
2015-08-10 12:19:59 -04:00
Kyle Meyer
408f6da74d
org-clock: Fix org-add-archive-files call
...
* lisp/org-clock.el (org-dblock-write:clocktable): Check that
buffer-file-name is non-nil before passing to org-add-archive-files.
2015-08-10 12:19:39 -04:00
Kyle Meyer
44c8cd7136
org-map-entries: Fix org-agenda-prepare-buffers call
...
* lisp/org.el (org-map-entries): Check that buffer-file-name is non-nil
before passing to org-agenda-prepare-buffers.
Like 11e8749
, this surfaced as an error when 05efa7a ("Backport commit
3a5f751 from Emacs master branch", 2015-08-08) replaced a
'(while (setq VAR (pop LIST)) BODY)' with '(dolist (VAR LIST) BODY)',
resulting in the body being executed when '(nil)' was passed to
org-agenda-prepare-buffers.
Reported-by: Robert Klein <roklein@roklein.de>
<http://permalink.gmane.org/gmane.emacs.orgmode/99779 >
2015-08-10 12:19:13 -04:00
Nicolas Goaziou
b911f17fc3
Merge branch 'maint'
2015-08-10 13:58:40 +02:00
Nicolas Goaziou
07a2d3d6f5
Fix agenda wrt commented headlines
...
* lisp/org.el (org-agenda-prepare-buffers): Ignore commented headlines
deeper than level 1.
Reported-by: Samuel Wales <samologist@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/99529 >
2015-08-10 13:54:19 +02:00
Nicolas Goaziou
898cfbcac0
Implement faster `show-children' function
...
* lisp/org.el (org-show-children): New function.
(org-cycle-internal-local):
(org-set-visibility-according-to-property):
(org-content):
(org-move-subtree-down):
(orgstruct-setup):
(org-show-set-visibility):
* contrib/lisp/org-toc.el (org-toc-cycle-subtree):
(org-toc-restore-config):
* lisp/org-agenda.el (org-agenda-show-1):
* lisp/org-feed.el (org-feed-update): Use new function.
* etc/ORG-NEWS: Document new function.
Suggested-by: Samuel Wales <samologist@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/99616 >
2015-08-10 13:37:29 +02:00
Nicolas Goaziou
181df8493e
Merge branch 'maint'
2015-08-10 10:05:30 +02:00
Nicolas Goaziou
7204ba0e46
Fix infloop due to wrong angle link regexp
...
* lisp/org.el (org-make-link-regexps): Fix infloop.
Reported-by: Gregor Zattler <telegraph@gmx.net>
<http://permalink.gmane.org/gmane.emacs.orgmode/99779 >
2015-08-10 10:04:09 +02:00
Kyle Meyer
a427dd0f3b
Merge branch 'maint'
2015-08-10 02:21:53 -04:00
Kyle Meyer
8d2c6af7ed
Update remaining copyright years in lisp/
2015-08-10 02:17:52 -04:00
Paul Eggert
ecf3a4af2c
Backport remaining changes from commit 7e09ef0
...
Add changes from Emacs repo that should have been backported with
bb77dd2
.
Update copyright year to 2015
7e09ef09a479731d01b1ca46e94ddadd73ac98e3
Paul Eggert
Thu Jan 1 14:26:41 2015 -0800
2015-08-10 02:17:19 -04:00
Kyle Meyer
326c36b5b4
Merge branch 'maint'
2015-08-09 22:04:51 -04:00
Kyle Meyer
f6aa5341cb
org-cycle-agenda-files: Fix agenda file check
...
* lisp/org.el (org-cycle-agenda-files): Raise error if there are no
agenda files, as intended. Simplify code.
2015-08-09 21:39:18 -04:00