Commit Graph

21145 Commits

Author SHA1 Message Date
Kyle Meyer f74f55cc75 Merge branch 'maint' 2018-03-07 22:07:42 -05:00
Paul Eggert 9ac80ede5e Backport commit f2caf08ca from Emacs
; Spelling fixes
f2caf08ca625f64c7eeea8dfa8f65a5b1bac58e2
Paul Eggert
Sun Mar 4 17:10:34 2018 -0800
2018-03-07 22:07:25 -05:00
Bastien 824cc8e56a Delete spurious file 2018-03-06 18:42:51 +01:00
Nicolas Goaziou 5ad085f34c Merge branch 'maint' 2018-03-06 10:15:22 +01:00
Nicolas Goaziou 9449939ca0 org-clock: Fix face for clock overruns
* lisp/org-clock.el (org-clock-get-clock-string): Fix 6655429b8.

Reported-by: Luke <mideniko1234-org@yahoo.co.uk>
<http://lists.gnu.org/r/emacs-orgmode/2018-03/msg00078.html>
2018-03-06 10:13:12 +01:00
Bastien Guerry f7b120e566 Merge branch 'develop' of stardiviner/org-mode into master 2018-03-06 07:49:47 +00:00
stardiviner 49a8de4ffd
* ob-core.el (org-babel-result-to-file): relative file link result.
Respect option `org-link-file-path-type`.
2018-03-06 14:43:22 +08:00
Nicolas Goaziou 881da595dd manual.org: Fix typo
* contrib/manual.org (Agenda Files): Fix typo.

"iswitchb" refers here to the library name, not to the command.
2018-03-05 19:28:00 +01:00
Nicolas Goaziou aad62024c9 manual: Sync with org.texi 2018-03-05 19:26:43 +01:00
Kaushal Modi b8e5c232e0 manual: Fix typo 2018-03-05 11:34:40 -05:00
Nicolas Goaziou b420c8e290 ob-core: Fix last commit
* lisp/ob-core.el (org-babel-execute-src-block): Fix thinko in commit
  122bf2997.
2018-03-05 14:34:28 +01:00
Bastien 69c5b6c999 Remove headings' metadata when turning them into list items
* lisp/org-list.el (org-toggle-item): Delete headings'
metadata before turning them into list items.

* lisp/org.el (org-log-drawer-start-re): New variable.
(org-log-drawer-end-re, org-log-drawer-re): New constants.
(org-heading-delete-metadata): New function.
(org-setting-tags): Fix comment.
2018-03-05 10:57:43 +01:00
Bastien dd99ed7443 doc/Documentation_Standards.org: Major update
Thanks to Thomas Dye for providing a patch to enhance this page.
2018-03-04 21:46:44 +01:00
Bastien 66d2474ccb doc/Documentation_Standards.org: Clean indentation 2018-03-04 21:31:14 +01:00
Bastien 4d50d5c9a4 doc/Documentation_Standards.org: Don't set fill-column
It is already set in .dir-locals.el.
2018-03-04 21:29:47 +01:00
Bastien 902148a967 Merge branch 'maint' 2018-03-04 21:22:32 +01:00
Bastien 74f6ed1eb0 org-clock.el: Strip bracket links from the heading
* lisp/org-clock.el (org-clock--mode-line-heading): Strip
links from the heading.

This restores the previous behavior before commit 66554298.

Thanks to Matt Lundin for reporting this.
2018-03-04 21:21:00 +01:00
Bastien a1dfd4ff20 org.texi: Fix typo
* doc/org.texi (Activation, Agenda files): Fix typo.

Thanks to Th. Rikl for reporting this.
2018-03-04 08:42:47 +01:00
Nicolas Goaziou d97ae53059 Merge branch 'maint' 2018-03-03 23:33:59 +01:00
Nicolas Goaziou cb0954d8de org-gnus: Fix `org-gnus-store-link'
* lisp/org-gnus.el (org-gnus-store-link): Fix storing link from an
  article when point in the summary buffer does not match the article.

Reported-by: Kevin Brubeck Unhammer <unhammer@fsfe.org>
<http://lists.gnu.org/r/emacs-orgmode/2018-03/msg00037.html>
2018-03-03 23:33:17 +01:00
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