Commit Graph

21054 Commits

Author SHA1 Message Date
Bastien ba42085e8f Merge branch 'master' of code.orgmode.org:bzg/org-mode 2018-02-27 08:31:57 +01:00
Kyle Meyer 5cb1184447 Merge branch 'maint' 2018-02-26 22:11:56 -05:00
Michael Albinus e810e6e5f9 Backport commit 9743f48de from Emacs
* doc/org.texi: Mark keys consistently.

Mark keys consistently in manuals
9743f48de7325bd95a42e1a27acbf6635f8d086b
Michael Albinus
Mon Feb 26 13:53:37 2018 +0100
2018-02-26 21:42:25 -05:00
Michael Albinus c0de50216a Backport commit ce557a924 from Emacs
* doc/org.texi: Remove @key{} markups from @kindex entries.

Remove @key{} markups from @kindex entries in manuals
ce557a924a299650b5e0c93ba276f1ec651f7941
Michael Albinus
Mon Feb 26 09:24:39 2018 +0100
2018-02-26 21:40:38 -05:00
Michael Albinus 5c3a00575b Backport commit 7a069f35d from Emacs
* doc/org.texi: Fix @kindex entries.  Mark keys consistently.

Fix @kindex entries in manuals
7a069f35d4ce002dc10d666fde2850d8e6eee427
Michael Albinus
Sun Feb 25 16:29:39 2018 +0100
2018-02-26 21:38:43 -05:00
Michael Albinus bb2195a1c0 Backport commit e415309fe from Emacs
* doc/org.texi: Fix @cindex entries.  Use consistently
@code{} for keywords.

Fix @cindex entries in org.texi
e415309fef4077fe7e4dfe1a898d749c1136ca2c
Michael Albinus
Sat Feb 24 20:40:39 2018 +0100
2018-02-26 21:36:41 -05:00
Nicolas Goaziou 2c93a0b2d7 org-tempo: Fix TAB behaviour
* lisp/org-tempo.el (org-tempo-complete-tag): Use a different trick to
  handle failed completions.

Reported-by: Brent Goodrick <bgoodr@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2018-02/msg00164.html>
2018-02-27 02:02:56 +01:00
Alex Branham f521400a08 New face for upcoming deadlines in agenda
* lisp/org-faces.el (org-upcoming-distant-deadline-face): New face.
2018-02-27 01:44:49 +01:00
Nicolas Goaziou 6a56ae53f2 `org-mark-ring-push' also populates Emacs mark ring
* lisp/org.el (org-mark-ring-push): Also populate Emacs mark ring.

Fixes: Bug#23745
2018-02-27 01:02:22 +01:00
Nicolas Goaziou 8e70f5d02d ORG-NEWS: Document ~org-paste-subtree~ change 2018-02-27 00:17:12 +01:00
Nicolas Goaziou 8ebf4b7274 Change `org-paste-subtree' behavior
* lisp/org.el (org-paste-subtree): Never split a section. Instead
  always insert tree before the headline after point.  Use `org-yank'
  to split the section.
* testing/lisp/test-org.el (test-org/paste-subtree): New test.
2018-02-27 00:03:31 +01:00
Nicolas Goaziou e445894c0d Merge branch 'maint' 2018-02-26 12:16:34 +01:00
Nicolas Goaziou a0104599dc Fix `org-paste-subtree'
* lisp/org.el (org-paste-subtree): Use `org-outline-regexp-bol'.

The function cannot detect the proper level when a headline around
point contains spurious white spaces after the stars.
2018-02-26 12:14:24 +01:00
Bastien 2ff5699323 README_maintainer: minor tweaks 2018-02-26 09:18:19 +01:00
Nicolas Goaziou 5e8fa13610 Re-instate `C-c C-x m' binding
Reported-by: Kyle Meyer <kyle@kyleam.com>
<http://lists.gnu.org/r/emacs-orgmode/2018-02/msg00322.html>
2018-02-24 23:03:28 +01:00
Nicolas Goaziou 1b259f95aa Merge branch 'maint' 2018-02-24 22:38:27 +01:00
Nicolas Goaziou fffd300efd Update version keyword 2018-02-24 22:36:54 +01:00
Nicolas Goaziou 6ef5d2497c Revert "org-agenda: Fix lprops when recreating sticky agendas"
This reverts commit b306aa2245.
2018-02-24 22:36:29 +01:00
Nicolas Goaziou 6e10c268de Merge branch 'maint' 2018-02-24 22:01:32 +01:00
Nicolas Goaziou 65d6d3b043 org-capture: Silence byte-compiler 2018-02-24 22:01:04 +01:00
Nicolas Goaziou be93bacfa1 Merge branch 'maint' 2018-02-24 21:59:23 +01:00
Nick Dokos 84a3d03dff Replace dash by underscore in temp file names.
* org-babel-groovy-evaluate: replace '-' by '_' in temp file names.

Apparently, the JVM uses file names in the construction of names of internal
objects and dashes are illegal in that context. See

   https://stackoverflow.com/questions/48893994/groovy-in-org-mode-babel

for an example.
2018-02-24 21:39:50 +01:00
Nicolas Goaziou f3c20eb912 Merge branch 'maint' 2018-02-22 14:38:35 +01:00
Nicolas Dudebout db90aadd38 org-agenda: make log and clockreport modes local
* lisp/org-agenda.el (org-agenda-mode): Only set `org-agenda-show-log'
  and `org-agenda-clock-report-mode' to their default values when
  constructing an agenda buffer, and not when redoing it.
* lisp/org-agenda.el (org-agenda-log-mode,
  org-agenda-clockreport-mode): Do not set the global default value
  `org-agenda-start-with-log-mode' (respectively
  `org-agenda-start-with-clockreport-mode') with the current value of
  `org-agenda-log-mode' (respectively `org-agenda-clockreport-mode'),
  which, with sticky agendas is even buffer local.

`org-agenda-show-log' indicates if the the current agenda buffer has
log-mode enabled.  When building a new agenda buffer, it gets its
value from `org-agenda-start-with-log-mode'.  It is is semantically a
buffer local variable: when creating a new agenda buffer you expect it
to be set to the value in `org-agenda-start-with-log-mode'.  However,
2e9c2d71 while fixing an issue with sticky agendas rendered the
variable `org-agenda-log-mode' effectively global: toggling log mode
in a given agenda buffer modifies the global default for all agenda
buffers.  The same reasoning holds for clockreport mode.

This change ensures that a log or clockreport mode change made in one
agenda buffer does not propagate to other agenda buffers, existing or
new.  The change is however preserved on org-agenda-redo in the
initial agenda buffer, whether using sticky agendas or not.

TINYCHANGE
2018-02-22 14:37:45 +01:00
Nicolas Goaziou 79b36b6a8d Merge branch 'maint' 2018-02-21 15:04:37 +01:00
Nicolas Goaziou 6655429b8d org-capture: Refresh clock mode line when finalizing capture
* lisp/org-capture.el (org-capture-finalize): Refresh clock mode line.
* lisp/org-clock.el (org-clock--mode-line-heading): New function.
(org-clock-get-clock-string): Small refactoring.
(org-clock-update-mode-line): Add optional argument. Use new function.
(org-clock-in): Use new function.
2018-02-21 15:02:33 +01:00
Nicolas Goaziou 70b029c6a8 manual: Sync changes to "org.texi" 2018-02-18 22:48:32 +01:00
Kyle Meyer 47908228e7 Merge branch 'maint' 2018-02-18 16:33:04 -05:00
Glenn Morris ec8590d5e2 Backport commit 69107f347 from Emacs
; Fix doc typos related to indefinite articles
69107f347b3ac7f51cd22333f57393fd735915f2
Glenn Morris
Fri Feb 16 17:33:57 2018 -0500
2018-02-18 16:32:41 -05:00
Glenn Morris 4ddfc6bd69 Backport commit 66a4e651f from Emacs
; Fix doc typos related to indefinite articles
66a4e651f3cf38c320d1a9d5ae6f88dcc641792b
Glenn Morris
Fri Feb 16 15:16:15 2018 -0500
2018-02-18 16:32:41 -05:00
Glenn Morris 5c3be1a298 Backport commit 35e5c57db from Emacs
; Fix doc typos related to indefinite articles
35e5c57db311c3d6c1c3a8dd4edc3d756d1d5d24
Glenn Morris
Fri Feb 16 14:11:51 2018 -0500
2018-02-18 16:32:40 -05:00
Paul Eggert a173d75145 Backport commit 7d90d2ece from Emacs
Proofread os.texi and files.texi
7d90d2ece041630e0c440a2b0216e43f82729844
Paul Eggert
Mon Jan 29 10:38:06 2018 -0800
2018-02-18 16:32:40 -05:00
Nicolas Goaziou dd12f2722c manual: Remove last user reserved keys 2018-02-18 11:26:40 +01:00
Nicolas Goaziou e30089dbd6 manual: Do not assume `org-store-link' is bound to `C-c l' 2018-02-18 11:21:13 +01:00
Nicolas Goaziou 328406eb2c manual: Update "Adding Hyperlink Types" section 2018-02-18 11:00:49 +01:00
Nicolas Goaziou 1c6e72c086 manual: Do not assume `org-capture' is bound to `C-c c' 2018-02-17 21:41:10 +01:00
Nicolas Goaziou d035155901 manual: Do not assume `org-agenda' is bound to `C-c a' 2018-02-17 19:21:33 +01:00
Nicolas Goaziou 80d781fb6c manual: Fix typo 2018-02-16 14:39:10 +01:00
Nicolas Goaziou 88638b9c04 manual: Fix compilation error 2018-02-16 14:17:33 +01:00
Nicolas Goaziou 5a1a94b644 manual: Fix typo and add missing index entry 2018-02-15 23:12:08 +01:00
Nicolas Goaziou bbcf2f939c Merge branch 'maint' 2018-02-15 15:04:59 +01:00
Nicolas Goaziou df80fde9d0 Fix failing tests
Use relative symlinks instead of absolute ones.

Reported-by: Nick Dokos <ndokos@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2018-02/msg00241.html>
2018-02-15 15:01:45 +01:00
Nicolas Goaziou 1562d4e293 ox-publish: Fix last commit
* lisp/ox-publish.el (org-publish-org-to):
(org-publish-collect-index):
(org-publish--store-crossrefs):
(org-publish-resolve-external-link): Use `file-truename' instead of
`expand-file-name'.

Do not preserve symbolic links when a unique identifier is needed,
e.g., when storing or retrieving file properties from cache.
2018-02-15 14:51:26 +01:00
Nicolas Goaziou 58da7d4d17 org-table: Fix shrunk columns on hlines
* lisp/org-table.el (org-table--shrunk-field): Fix function when on
  a hline.
* testing/lisp/test-org-table.el (test-org-table/shrunk-columns): Add
  tests.

Reported-by: Kaushal Modi <kaushal.modi@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2018-02/msg00231.html>
2018-02-14 18:48:48 +01:00
Nicolas Goaziou af824a9b39 Merge branch 'maint' 2018-02-14 18:00:38 +01:00
Nicolas Goaziou 1a5151c51d org-clock: Fix default clocktable properties priority
* lisp/org-clock.el (org-clock-report): Improve docstring.  Refactor
  code.  Ensure user-defined properties have precedence over automatic
  ones.

Reported-by: Tyler Smith <tyler@plantarum.ca>
<http://lists.gnu.org/r/emacs-orgmode/2018-02/msg00215.html>
2018-02-14 17:57:21 +01:00
bzg 269ccd9590 Merge branch 'develop' of stardiviner/org-mode into master 2018-02-14 10:33:43 +00:00
stardiviner 2e6922191e
* ob-lua.el: remove it.
original ob-lua exists already.
2018-02-14 18:22:45 +08:00
Nicolas Goaziou 90607d1d18 Merge branch 'maint' 2018-02-13 17:36:36 +01:00
Nicolas Goaziou d5527699ab org.texi: Remove `org-enable-table-editor' remnant
* doc/org.texi (Built-in table editor): Remove reference to suppressed
  variable `org-enable-table-editor'.
2018-02-13 17:35:41 +01:00