Commit Graph

19147 Commits

Author SHA1 Message Date
Nicolas Goaziou 1319a3be44 ox-html: Fix %d placeholder in pre/postamble string
* lisp/ox-html.el (org-html-format-spec): Correctly apply
  `org-html-metadata-timestamp-format' on %d placeholder.

Reported-by: Pavel Panchekha <me@pavpanchekha.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/110374>
2016-11-19 23:17:32 +01:00
Nicolas Goaziou db0377ddc6 Merge branch 'maint' 2016-11-19 23:09:33 +01:00
Nicolas Goaziou c3c33841eb Merge branch 'maint' of orgmode.org:org-mode into maint 2016-11-19 23:08:33 +01:00
Nicolas Goaziou 9e2dc98eef Fix error when exporting body only of an empty buffer
* lisp/ox.el (org-export-filter-apply-functions): Return empty string
  instead of nil when a filter returns the empty string.

* testing/lisp/test-ox.el (test-org-export/export-scope): Add test.
(test-org-export/filter-apply-functions): New test.

Reported-by: "Stefan-W. Hahn" <stefan.hahn@s-hahn.de>
<http://permalink.gmane.org/gmane.emacs.orgmode/110371>
2016-11-19 23:08:12 +01:00
Kyle Meyer bc0bebbc43 Merge branch 'maint' 2016-11-19 16:50:37 -05:00
Eli Zaretskii d31c8ef17c Backport commit 5b0cddd from Emacs
* doc/orgcard.tex: Change "GNU Emacs" to "this document" in copyright
notices.  (Bug#24520)

More fixes in copyright notices in etc/refcards/
5b0cddd91535025bbf0c69d17e2d4e470dd350c5
Eli Zaretskii
Tue Nov 15 19:01:07 2016 +0200
2016-11-19 16:50:27 -05:00
Eli Zaretskii 68760e703e Backport commit f994c20 from Emacs
* doc/orgcard.tex: Update the copyright blurb.  (Bug#24520)

Update copyright text in refcards
f994c2046588b168c1a4a900879cdffaf9d02f01
Eli Zaretskii
Sun Nov 13 18:20:59 2016 +0200
2016-11-19 16:49:19 -05:00
Paul Eggert ad5e2aed21 Backport commit dc152c5 from Emacs
Apple changed the spelling of its operating system again, to "macOS",
effective with macOS 10.12 Sierra (2016-09-20).  Change Emacs
documentation and comments to match this.  Stick with older OS
spellings ("OS X", "Mac OS X") when talking about older releases where
the older names are more correct.

Modernize usage of 'macOS' in doc and comments
dc152c54f4e44f5f2040883b03f71ff6aa66c893
Paul Eggert
Sun Nov 6 00:42:03 2016 -0700
2016-11-19 16:49:15 -05:00
Nicolas Goaziou 2c466ebff2 ob-clojure: Normalize :show-process syntax
* lisp/ob-clojure.el (org-babel-execute:clojure): :show-process
  requires a non-nil (and non "no") value.
2016-11-19 07:39:05 +01:00
Nicolas Goaziou cd4186c5c3 ob-clojure: Small refactoring
* lisp/ob-clojure.el (org-babel-execute:clojure): Small refactoring.
2016-11-19 07:35:23 +01:00
Frederick Giasson 56c0ce4a8d ob-clojure: Add :show-process
* lisp/ob-clojure.el (org-babel-clojure-sync-nrepl-timeout): New variable.
(org-babel-execute:clojure): Implement :show-process.  Better error
handling.
2016-11-19 00:30:39 +01:00
Nicolas Goaziou 68df8bc4fd Merge branch 'maint' 2016-11-18 23:04:15 +01:00
Nicolas Goaziou b3125dc84b ox-icalendar: Use \r\n instead of \n as line breaks
* lisp/ox-icalendar.el (org-icalendar-fold-string): Break lines with
  \r\n instead of \n, per RFC 5545.

Reported-by: Stephen Eglen <sje30@cam.ac.uk>
<http://permalink.gmane.org/gmane.emacs.orgmode/110306>
2016-11-18 23:03:01 +01:00
Nicolas Goaziou 0a24f50136 Merge branch 'maint' 2016-11-18 09:37:53 +01:00
Nicolas Goaziou 400186d839 org.texi: Small fixes
* doc/org.texi (Structure of code blocks): Remove too recent
  @indentedblock structure and fix some @ref, @xref, @pxref uses.
2016-11-18 09:36:47 +01:00
Nicolas Goaziou 56f1b8095f Merge branch 'maint' 2016-11-17 23:54:57 +01:00
Lambda Coder b9ed40c4b5 org.texi: Reword Babel chapter
* doc/org.texi (Template elements):
(Tables in @LaTeX{} export):
(Working with source code):
(Structure of code blocks):
(Editing source code):
(Exporting code blocks):
(Extracting source code):
(Evaluating code blocks):
(Library of Babel):
(Languages):
(Header arguments):
(Using header arguments):
(System-wide header arguments):
(Language-specific header arguments):
(Header arguments in Org mode properties):
(Language-specific header arguments in Org mode properties):
(Code block specific header arguments):
(Header arguments in function calls):
(Specific header arguments):
(var):
(results):
(file-desc):
(file):
(output-dir):
(dir):
(exports):
(comments):
(padline):
(no-expand):
(session):
(noweb):
(noweb-ref):
(noweb-sep):
(cache):
(sep):
(hlines):
(colnames):
(rownames):
(shebang):
(tangle-mode):
(eval):
(wrap):
(post):
(prologue):
(Results of evaluation):
(Noweb reference syntax):
(Key bindings and useful functions):
(Batch execution): Improve wording.
2016-11-17 23:36:08 +01:00
Nicolas Goaziou 047451c29d org.texi: Fix typo
* doc/org.texi (Exporting code blocks): Fix typo.
2016-11-14 08:43:08 +01:00
Charles Berry 3b5ce449c4 Replace `org-export-babel-evaluate' with `org-export-use-babel'
* lisp/ob-exp.el (org-babel-exp-process-buffer): Change variable
  name `org-export-babel-evaluate' to `org-export-use-babel'.  Also
  change the name in its `defcustom' and set the `:safe' key.

* lisp/ox-icalendar.el (org-icalendar-export-current-agenda): Change
  variable name.

* lisp/ox.el (org-export-as): Change variable name.

* doc/org.texi (Exporting code blocks): Change variable name.  Amplify
   the explanation of what the variable does.  Add variable index entry.

* testing/lisp/test-ob-exp.el: Change variable name.

* testing/lisp/test-ob-lob.el: Change variable name.

* testing/lisp/test-ox.el: Change variable name.

Users were often confused that setting this variable to `nil' will
cause header arguments to be ignored in addition to preventing code
from being evaluated.  It is hoped that the documentation changes and
the name `org-export-use-babel' will better convey that everything
babel does can be switched off with this variable.
2016-11-13 15:29:33 -08:00
Nicolas Goaziou 45f25aea75 Merge branch 'maint' 2016-11-13 18:10:53 +01:00
Nicolas Goaziou 928e18dff9 org.texi: Fix typo
* doc/org.texi (External links): Fix typo.
2016-11-13 18:10:25 +01:00
Nicolas Goaziou 8a5e54f1cc Small fix to documentation
* doc/org.texi (Setting tags): Remove misleading information.
* lisp/org.el (org-tag-alist): Fix consistency with
  `org-tag-persistent-alist'.
2016-11-13 18:08:15 +01:00
Nicolas Goaziou 6ea46c7257 Merge branch 'maint' 2016-11-13 11:38:09 +01:00
Nicolas Goaziou cec084584d Fix docstring
* lisp/org.el (org-link-search-must-match-exact-headline): Fix
  docstring.  Add :safe keyword.
2016-11-13 11:37:53 +01:00
Nicolas Goaziou ebbc675bd9 Fix TODO keywords case sensitivity
* lisp/org.el (org-todo-regexp):
(org-not-done-regexp):
(org-not-done-heading-regexp):
(org-todo-line-regexp):
(org-complex-heading-regexp): Improve docstrings.

(org-insert-todo-heading):
(org-fix-position-after-promote):
(org-link-search):
(org-block-todo-from-children-or-siblings-or-parent):
(org-get-todo-state):
(org-priority):
(org-point-at-end-of-empty-headline):
* lisp/org-agenda.el (org-fix-agenda-info):
(org-agenda-get-todos):
(org-cmp-alpha):
* lisp/org-archive.el (org-archive-subtree):
(org-archive-all-done):
* lisp/org-list.el (org-toggle-item):
* lisp/org-pcomplete.el (pcomplete/org-mode/searchhead): Bind
`case-fold-search' to nil when matching aginst one of the regexp
above.

* testing/lisp/test-org.el (test-org/fuzzy-links): Add tests.
2016-11-13 11:26:17 +01:00
Nicolas Goaziou 3375671e83 Merge branch 'maint' 2016-11-12 01:45:46 +01:00
Nicolas Goaziou ff0748beac Small documentation fixes
* doc/org.texi (The very busy C-c C-c key):
* lisp/org.el (org-startup-folded): Documentation fixes.
2016-11-12 01:45:05 +01:00
Nicolas Goaziou 6340a78c9f Merge branch 'maint' 2016-11-12 01:23:36 +01:00
Nicolas Goaziou 393f490386 Remove dependency on "gs" for preview LaTeX
* lisp/org.el (org-preview-latex-process-alist): Remove "gs"
  requirement.

Reported-by: Frederick Giasson <fred@fgiasson.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/110216>
2016-11-12 01:21:25 +01:00
Nicolas Goaziou ea3de7286e Merge branch 'maint' 2016-11-12 01:09:31 +01:00
Nicolas Goaziou 31a112d4dd org-clock: Add missing space in clock line
* lisp/org-clock.el (org-clock-get-clock-string): Add missing space in
  clock line when no effort is defined.

Reported-by: Allen Li <vianchielfaura@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/110235>
2016-11-12 01:09:00 +01:00
Nicolas Goaziou e9b3c3ec57 Merge branch 'maint' 2016-11-11 17:49:39 +01:00
Nicolas Goaziou 27b10fb265 ox: Fix duplicate internal references for same title headings
* lisp/ox.el (org-export-get-reference): Ensure different elements or
  objects generating the same search cell do not get the same internal
  reference.
* testing/lisp/test-ox.el (test-org-export/get-reference): Add test.

Reported-by: mstrey@strey.biz
<http://permalink.gmane.org/gmane.emacs.orgmode/110211>
2016-11-11 17:47:09 +01:00
Nicolas Goaziou b28377998d Merge branch 'maint' 2016-11-11 12:04:21 +01:00
Nicolas Goaziou a3c366eb98 org-colview: Fix time sum when mixing duration and H:MM:SS time
* lisp/org-colview.el (org-columns--time-to-seconds): Recognize
  a duration even when it contains a H:MM:SS part.
* testing/lisp/test-org-colview.el (test-org-colview/columns-summary):
  Add test.

Reported-by: Björn Döring <bjoern@doering.io>
<http://permalink.gmane.org/gmane.emacs.orgmode/110144>
2016-11-11 12:02:34 +01:00
Nicolas Goaziou 9a10da6acc Merge branch 'maint' 2016-11-11 10:18:36 +01:00
Nicolas Goaziou c93a17dd8a ox: Fix subtree export when starting with meta-data
* lisp/ox.el (org-export-as): Skip planning info and first property
  drawer when exporting a subtree.
* testing/lisp/test-ox.el (test-org-export/export-scope): Add test.
2016-11-11 10:17:15 +01:00
Nicolas Goaziou 07ce47693e Merge branch 'maint' 2016-11-11 01:11:17 +01:00
Nicolas Goaziou efcaff3688 org-agenda: Treat fake planning info as regular time-stamp
* lisp/org-agenda.el (org-agenda-get-timestamps): Treat fake planning
  info as regular time-stamp.

Reported-by: Alan Tyree <alantyree@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/110197>
2016-11-11 01:08:53 +01:00
Nicolas Goaziou 147cada506 Merge branch 'maint' 2016-11-11 00:48:30 +01:00
Nicolas Goaziou c6f9aeb06e ox-publish: Fix too many opened buffer upon publishing
* lisp/ox-publish.el (org-publish-cache-file-needs-publishing): Create
  a new buffer for Org files only.

Reported-by: Éric Würbel <eric.wurbel@univ-amu.fr>
<http://permalink.gmane.org/gmane.emacs.orgmode/110190>
2016-11-11 00:45:21 +01:00
Nicolas Goaziou c535f54330 Merge branch 'maint' 2016-11-10 16:05:33 +01:00
Nicolas Goaziou dd2a0d3361 org.texi: More pregnant DEADLINE position in entries
* doc/org.texi (Deadlines and scheduling): Insist on the location for
  planning keywords.
(Inserting deadline/schedule): No need to specify the functions add
planning keywords at an appropriate location.
2016-11-10 16:02:46 +01:00
Nicolas Goaziou c0b37e1883 Merge branch 'maint' 2016-11-10 00:27:21 +01:00
Nicolas Goaziou 9f98979ff0 org-element: Prevent parsing meta-data after blank lines
* lisp/org-element.el (org-element--current-element): Check that
  planning info and property drawers are correctly located before
  parsing them.

* testing/lisp/test-org-element.el (test-org-element/planning-parser):
(test-org-element/property-drawer-parser): Add tests.
2016-11-10 00:25:34 +01:00
Nicolas Goaziou 1dc6c4bc9c org-element: Fix inlinetask parsing
* lisp/org-element.el (org-element-headline-parser): Small refactoring.
(org-element-inlinetask-parser): Add missing :pre-blank property.  Small
refactoring.  Also fix regexp for task end.

* testing/lisp/test-org-element.el (test-org-element/inlinetask-parser):
  Add test.
2016-11-09 23:30:39 +01:00
Nicolas Goaziou 52387021dc Merge branch 'maint' 2016-11-09 18:43:36 +01:00
Nicolas Goaziou 1f87273fd2 ox-latex: Fix temporary files removal when compiling files
* lisp/ox-latex.el (org-latex-compile): Assume temporary files are
  located in the output directory.

This partly reverts 120f8c0.
2016-11-09 18:42:29 +01:00
Nicolas Goaziou c9e0a52a99 Merge branch 'maint' 2016-11-08 18:25:08 +01:00
Nicolas Goaziou ae68bc516d ox-latex: Fix texi2dvi command
* lisp/ox-latex.el (org-latex-pdf-process): Handle cases where tex file
  is not located in default-directory.
2016-11-08 18:24:13 +01:00