Commit Graph

21425 Commits

Author SHA1 Message Date
Nicolas Goaziou 3ffc7d6903 Merge branch 'maint' 2018-03-03 13:42:35 +01:00
Nicolas Goaziou f8d758966c orgguide.texi: Fix typo
* doc/orgguide.texi (TODO Items): Fix typo.

Reported-by: siraben@disroot.org
<http://lists.gnu.org/r/emacs-orgmode/2018-03/msg00036.html>
2018-03-03 13:41:49 +01:00
Nicolas Goaziou 122bf29974 ob-core: Tiny refactoring
* lisp/ob-core.el (org-babel-execute-src-block): Tiny refactoring.
  Keep lines under 80 columns.
2018-03-03 10:07:21 +01:00
Nicolas Goaziou ca5206eed5 manual: Fix typo 2018-03-03 10:03:45 +01:00
Nicolas Goaziou 3fab011755 org-element: Better indentation for `org-element-adopt-elements'
* lisp/org-element.el (org-element-adopt-elements): Define a better
  indentation rule.
2018-03-03 10:00:06 +01:00
Nicolas Goaziou 6a0f31c04a manual: Properly format number ranges 2018-03-03 01:41:44 +01:00
Bastien Guerry 0c96d5066f Merge branch 'develop' of stardiviner/org-mode into master 2018-03-02 08:52:42 +00:00
stardiviner 39bd69b08d
* ob-core.el: (org-babel-execute-src-block) handle :results graphics :file case.
Don't write result to file if result is graphics.
2018-03-02 14:22:52 +08:00
stardiviner 6f976f1947
* ob-clojure-literate.el support graphics inline image link result.
(ob-clojure-literate-inject-code): save Clojure image variable to :file.

(ob-clojure-literate-support-graphics-result): fix src block does handle
graphics file result issue.

Use it like this:

,#+begin_src clojure :cache no :dir "data/images" :results graphics :file "ob-clojure-literate.png"
(use '(incanter core stats datasets charts io pdf))
(def ob-clojure-literate (histogram (sample-normal 1000)))
,#+end_src
2018-03-02 14:22:44 +08:00
Nicolas Goaziou a1659053d5 Merge branch 'maint' 2018-03-01 10:56:01 +01:00
Nicolas Goaziou 428ab7942a org-agenda: Obey to "++" prefix when bulk rescheduling/resetting deadline
* lisp/org-agenda.el (org-agenda-bulk-action): When date starts with
  "++", shift every marked entry.

Reported-by: Michael Hoffman <gmane4-hoffman@sneakemail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2018-03/msg00001.html>
2018-03-01 10:53:35 +01:00
Nicolas Goaziou 09af7f18b2 manual: Remove index entry and fix typo 2018-02-27 23:37:43 +01:00
Nicolas Goaziou b4f887f2d4 manual: Remove spurious index entry 2018-02-27 23:29:22 +01:00
Nicolas Goaziou e43e213d26 manual: Sync with "org.texi"
Fix some bindings
2018-02-27 20:29:46 +01:00
Nicolas Goaziou 273b760418 manual: Sync with "org.texi"
Update UP, DOWN, LEFT, RIGHT keys
2018-02-27 20:24:06 +01:00
Nicolas Goaziou c30f01418f manual: Sync manual with "org.texi"
Use @samp{...} in index.
2018-02-27 20:18:10 +01:00
Nicolas Goaziou 3dc112d516 manual: Apply 0 value for `org-edit-src-content-indentation' 2018-02-27 19:18:20 +01:00
Nicolas Goaziou d87148057e Update .dir-locals
* .dir-locals.el (org-mode): Update default values.
* lisp/org-list.el (org-list-description-max-indent): Add :safe
  keyword.
2018-02-27 19:17:18 +01:00
Bastien 0ddb912fb3 Merge branch 'maint' 2018-02-27 08:42:24 +01:00
Bastien f400694165 Merge branch 'maint' of code.orgmode.org:bzg/org-mode into maint 2018-02-27 08:36:59 +01:00
Bastien ca4ddc331c README_contribute: don't mention repo.or.cz mirror
This clone is obsolete.
2018-02-27 08:36:13 +01:00
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