mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity
20,709 Commits 3 Branches 429 Tags 174 MiB
Commit Graph

20709 Commits

Author SHA1 Message Date
Nicolas Goaziou 0c409d64d0 Merge branch 'maint' 2018-01-10 12:49:23 +01:00
Aliaksey Artamonau 0a8711a0a5 org-clock.el: Fix one time continuous clock in 
* org-clock.el (org-clock-in): Abort after calling `org-clock-in'
  recursively with `org-clock-continuously' set.

Without the change the recursive call to `org-clock-in' would
insert a clock of last clock-out, but then the original call
would continue by inserting another clock at
current-time. As a result of that, clocking out uses the latter
of the two clocks and leaves the other one dangling.

TINYCHANGE
 2018-01-10 12:48:28 +01:00
Marc Ihm 8f3156c945 Version 5.7.4 or org-index.el 2018-01-09 21:07:21 +01:00
Nicolas Goaziou 46e24f6830 Merge branch 'maint' 2018-01-09 19:51:17 +01:00
Nicolas Goaziou 8c7a14a850 org-clock: Consider hours when splitting the table with :steps 
* lisp/org-clock.el (org-clocktable-steps): Check time when :tstart
  and :tend are defined.
* testing/lisp/test-org-clock.el (test-org-clock/clocktable/step): Add
  tests.

Reported-by: savoie@nsidc.org
<http://lists.gnu.org/r/emacs-orgmode/2018-01/msg00227.html>
 2018-01-09 19:47:39 +01:00
Nicolas Goaziou c82c21c7ac Merge branch 'maint' 2018-01-08 20:40:16 +01:00
Nicolas Goaziou ed2bcab0ea ox: Fix typo in docstring 
* lisp/ox.el (org-export-search-cells): Fix typo.
 2018-01-08 20:39:31 +01:00
Nicolas Goaziou 9096ea4f3b manual: Tiny fix 
* contrib/manual.org: Add missing explaination about `untilnow'.
 2018-01-08 15:42:01 +01:00
Nicolas Goaziou 857425e184 ox-org: Obey to `org-display-custom-times' 
* lisp/ox-org.el (org-org-timestamp): New function.
(org): Use new function.
 2018-01-08 15:39:01 +01:00
Nicolas Goaziou c0a1fb4138 Merge branch 'maint' 2018-01-08 15:24:21 +01:00
Nicolas Goaziou 3566a3eeee org-clock: Fix `org-clock-display' called with `C-u C-u C-u' 
* lisp/org-clock.el (org-clock-display): Compute H and M when
  necessary.
 2018-01-08 15:22:33 +01:00
Nicolas Goaziou 7544f2b6d7 Merge branch 'maint' 2018-01-08 15:00:28 +01:00
Nicolas Goaziou 9c675b0727 org-clock: Small fixes 
* lisp/org-clock.el (org-clock-display-default-range): Improve
  docstring.  Add :safe keyword.
(org-clock-display): Fix comparison function.
 2018-01-08 14:59:53 +01:00
Nicolas Goaziou b65fe0f7a2 Merge branch 'maint' 2018-01-07 10:56:02 +01:00
Nicolas Goaziou 0c93296f83 org-table: Obey to `org-table-formula-create-columns' 
* lisp/org-table.el (org-table-recalculate): Return an error when the
  formula cannot create a necessary column.
(org-table-formula-create-columns): Fix docstring.
* testing/lisp/test-org-table.el (test-org-table/field-formula-outside-table):
  Fix tests.
 2018-01-07 10:55:30 +01:00
Kyle Meyer 34bb61bf81 Update master-only copyright years 2018-01-07 00:28:44 -05:00
Kyle Meyer d94f7024bc Merge branch 'maint' 2018-01-07 00:28:35 -05:00
Kyle Meyer 3e1641ef0a Update copyright years 2018-01-07 00:27:54 -05:00
Nicolas Goaziou e4b47699fe manual: Fix typo 2018-01-07 02:35:20 +01:00
Nicolas Goaziou 6d0e2f2cc3 manual: Improve "The clock table" section 2018-01-07 02:34:17 +01:00
Nicolas Goaziou 9bc6e644e9 Merge branch 'maint' 2018-01-07 01:34:59 +01:00
Ian Dunn b306aa2245 org-agenda: Fix lprops when recreating sticky agendas 
* lisp/org-agenda.el (org-agenda-lprops): New variable.
  (org-agenda-local-vars): Add it.
  (org-agenda-prepare): Set lprops from symbol property.
  (org-agenda-redo): Get lprops from variable, not property.
 2018-01-07 01:34:13 +01:00
Nicolas Goaziou 6b06a6238b Merge branch 'maint' 2018-01-06 10:19:37 +01:00
Alex Branham 5dfab7957d org-agenda: documentation addition 
* lisp/org-agenda.el: Add docstring to `org-agenda-show-log'
 2018-01-06 10:19:01 +01:00
Nicolas Goaziou 8a2914f458 Merge branch 'maint' 2018-01-06 10:09:39 +01:00
Nicolas Goaziou e00bbc6ec2 org.texi: Add `org-capture-templates' to variables index 
* doc/org.texi (Capture templates): Add `org-capture-templates' to
  variables index.
 2018-01-06 10:08:49 +01:00
Xu Chunyang 38617a5373 * manual.org: Add org-capture-templates to Variable Index 
TINYCHANGE
 2018-01-06 10:06:31 +01:00
Nicolas Goaziou e8cd52dee0 Merge branch 'maint' 2018-01-04 19:51:46 +01:00
Nicolas Goaziou 6c19b2db51 org.texi: Fix protocol for read-only repository 
* doc/org.texi (Installation): Fix protocol for read-only repository.
 2018-01-04 19:50:46 +01:00
Nicolas Goaziou 931406855e Merge branch 'maint' 2018-01-04 19:11:57 +01:00
Nicolas Goaziou b762c2dcc8 org.texi: Fix git repository location 
* doc/org.texi (Installation): Fix git repository location.
 2018-01-04 19:11:14 +01:00
Nicolas Goaziou eff8062400 manual: Add missing http -> https conversion 2018-01-04 19:08:03 +01:00
Nicolas Goaziou e2b47eb5e7 Merge branch 'maint' 2018-01-04 16:35:24 +01:00
Nicolas Goaziou 5838838288 org.texi: Use https instead of http for orgmode.org 
* doc/org.texi (Summary):
(Installation):
(Footnotes):
(Org syntax):
(Lookup functions):
(Org-Plot):
(Capturing column view):
(@code{open-source} protocol):
(Links in HTML export):
(JavaScript support):
(Images in ODT export):
(Library of Babel):
(Languages):
(Language-specific header arguments):
(Hooks):
(Add-on packages):
(Adding export back-ends):
(Speeding up your agendas):
(Setting up the staging area): Use https instead of http for
orgmode.org.
 2018-01-04 16:34:07 +01:00
Nicolas Goaziou 63c89df93c manual: Use https instead of http for orgmode.org 2018-01-04 16:29:17 +01:00
Marco Wahl 6c3c06273e org.el (org-copy-subtree): Correct typo 2018-01-04 16:26:08 +01:00
Nicolas Goaziou a692943970 manual: Use em-dash instead of spaced out en-dash 2018-01-04 16:08:38 +01:00
Nicolas Goaziou fc1e7c2033 Merge branch 'maint' 2018-01-03 22:55:39 +01:00
Nicolas Goaziou 76ee7b7cdd org-clock: Allow CLOCK_MODELINE_TOTAL inheritance 
* lisp/org-clock.el (org-clock-get-sum-start): Allow
  CLOCK_MODELINE_TOTAL inheritance.
 2018-01-03 22:54:28 +01:00
Nicolas Goaziou ff3d23e64e Do not use `called-interactively-p' in `org-store-link' 
* lisp/org.el (org-store-link): Do not use `called-interactively-p'.

Fixes: 19915
 2018-01-03 18:04:55 +01:00
Nicolas Goaziou c0ea20aab7 org-mobile: Save agenda files before pushing 
* lisp/org-mobile.el (org-mobile-push): Save agenda files before
  pushing.

Fixes: 19448
 2018-01-03 15:45:53 +01:00
Nicolas Goaziou 837e1b4249 Merge branch 'maint' 2018-01-03 15:26:38 +01:00
Nicolas Goaziou 7e8e12be21 org-table: Improve a docstring 
* lisp/org-table.el (org-table-import): Improve docstring.

Fixes: 22597
 2018-01-03 15:25:33 +01:00
Nicolas Goaziou d6369e9ac6 Use completion in `org-set-effort' 
* contrib/manual.org: Document change.
* lisp/org.el (org-set-effort): Change signature.
(org-inc-effort): Apply signature change.

Fixes: 22776, 22597
 2018-01-02 22:00:35 +01:00
Nicolas Goaziou b030475575 Merge branch 'maint' 2018-01-02 14:14:18 +01:00
Nicolas Goaziou 16c7ae7996 Fix handling nested VISIBILITY properties 
* lisp/org.el (org-set-visibility-according-to-property): Fix handling
  nested VISIBILITY properties.
* testing/lisp/test-org.el (test-org/set-visibility-according-to-property):
  New test.

Reported-by: Michael Maurer <maurer.michael@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2018-01/msg00012.html>
 2018-01-02 14:13:46 +01:00
Nicolas Goaziou 1bf34d5b8a Merge branch 'maint' 2018-01-02 12:43:36 +01:00
Nicolas Goaziou ec6813157e org-capture: Demote error when capturing `file+headline' in non-Org buffers 
* lisp/org-capture.el (org-capture-set-target-location): Warn when
  capturing a `file+headline' target and buffer is not in Org mode.

Fixes: 22352
 2018-01-02 12:40:54 +01:00
Nicolas Goaziou 63e9f45238 Merge branch 'maint' 2018-01-02 11:51:52 +01:00
Nicolas Goaziou 4c9b5f600f ox-beamer: Update copyright year 2018-01-02 11:51:26 +01:00