From 84539dca3aa301ecfe48858eceef1ced0505388b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Delafond?= Date: Wed, 16 Mar 2016 09:54:04 +0100 Subject: Imported Upstream version 8.3.4 --- contrib/lisp/ob-eukleides.el | 2 +- contrib/lisp/ob-mathomatic.el | 2 +- contrib/lisp/ob-tcl.el | 2 +- contrib/lisp/org-bibtex-extras.el | 2 +- contrib/lisp/org-bookmark.el | 2 +- contrib/lisp/org-collector.el | 2 +- contrib/lisp/org-contribdir.el | 2 +- contrib/lisp/org-depend.el | 2 +- contrib/lisp/org-download.el | 2 +- contrib/lisp/org-effectiveness.el | 2 +- contrib/lisp/org-eldoc.el | 2 +- contrib/lisp/org-elisp-symbol.el | 2 +- contrib/lisp/org-eval-light.el | 2 +- contrib/lisp/org-eval.el | 2 +- contrib/lisp/org-eww.el | 2 +- contrib/lisp/org-expiry.el | 2 +- contrib/lisp/org-index.el | 2 +- contrib/lisp/org-interactive-query.el | 2 +- contrib/lisp/org-learn.el | 2 +- contrib/lisp/org-license.el | 2 +- contrib/lisp/org-mac-link.el | 2 +- contrib/lisp/org-mew.el | 2 +- contrib/lisp/org-notify.el | 2 +- contrib/lisp/org-screenshot.el | 3 +- contrib/lisp/org-sudoku.el | 2 +- contrib/lisp/org-toc.el | 2 +- contrib/lisp/org-track.el | 3 +- contrib/lisp/org-vm.el | 2 +- contrib/lisp/org-wikinodes.el | 2 +- contrib/lisp/org-wl.el | 2 +- contrib/lisp/orgtbl-sqlinsert.el | 2 +- contrib/lisp/ox-bibtex.el | 1 + contrib/lisp/ox-freemind.el | 2 +- contrib/lisp/ox-groff.el | 2 +- contrib/lisp/ox-koma-letter.el | 2 +- contrib/lisp/ox-taskjuggler.el | 2 +- etc/ORG-NEWS | 2 +- lisp/ob-C.el | 16 +- lisp/ob-J.el | 2 +- lisp/ob-R.el | 2 +- lisp/ob-abc.el | 2 +- lisp/ob-asymptote.el | 2 +- lisp/ob-awk.el | 2 +- lisp/ob-calc.el | 2 +- lisp/ob-clojure.el | 2 +- lisp/ob-comint.el | 2 +- lisp/ob-coq.el | 2 +- lisp/ob-core.el | 78 ++++++-- lisp/ob-css.el | 2 +- lisp/ob-ditaa.el | 2 +- lisp/ob-dot.el | 2 +- lisp/ob-ebnf.el | 2 +- lisp/ob-emacs-lisp.el | 2 +- lisp/ob-eval.el | 2 +- lisp/ob-exp.el | 4 +- lisp/ob-forth.el | 2 +- lisp/ob-fortran.el | 4 +- lisp/ob-gnuplot.el | 2 +- lisp/ob-groovy.el | 2 +- lisp/ob-haskell.el | 2 +- lisp/ob-io.el | 2 +- lisp/ob-java.el | 2 +- lisp/ob-js.el | 2 +- lisp/ob-keys.el | 2 +- lisp/ob-latex.el | 2 +- lisp/ob-ledger.el | 2 +- lisp/ob-lilypond.el | 2 +- lisp/ob-lisp.el | 2 +- lisp/ob-lob.el | 2 +- lisp/ob-makefile.el | 2 +- lisp/ob-matlab.el | 2 +- lisp/ob-maxima.el | 2 +- lisp/ob-mscgen.el | 2 +- lisp/ob-ocaml.el | 2 +- lisp/ob-octave.el | 2 +- lisp/ob-org.el | 2 +- lisp/ob-perl.el | 2 +- lisp/ob-picolisp.el | 2 +- lisp/ob-plantuml.el | 2 +- lisp/ob-processing.el | 2 +- lisp/ob-python.el | 2 +- lisp/ob-ref.el | 2 +- lisp/ob-ruby.el | 2 +- lisp/ob-sass.el | 2 +- lisp/ob-scala.el | 2 +- lisp/ob-scheme.el | 2 +- lisp/ob-screen.el | 2 +- lisp/ob-sed.el | 2 +- lisp/ob-shell.el | 2 +- lisp/ob-shen.el | 2 +- lisp/ob-sql.el | 2 +- lisp/ob-sqlite.el | 2 +- lisp/ob-table.el | 2 +- lisp/ob-tangle.el | 48 +++-- lisp/ob.el | 2 +- lisp/org-agenda.el | 10 +- lisp/org-archive.el | 4 +- lisp/org-attach.el | 2 +- lisp/org-bbdb.el | 2 +- lisp/org-bibtex.el | 10 +- lisp/org-capture.el | 5 +- lisp/org-clock.el | 10 +- lisp/org-colview.el | 8 +- lisp/org-compat.el | 12 +- lisp/org-crypt.el | 4 +- lisp/org-ctags.el | 2 +- lisp/org-datetree.el | 2 +- lisp/org-docview.el | 2 +- lisp/org-element.el | 84 ++++---- lisp/org-entities.el | 2 +- lisp/org-eshell.el | 2 +- lisp/org-faces.el | 2 +- lisp/org-feed.el | 4 +- lisp/org-footnote.el | 2 +- lisp/org-gnus.el | 2 +- lisp/org-habit.el | 2 +- lisp/org-id.el | 2 +- lisp/org-info.el | 2 +- lisp/org-inlinetask.el | 2 +- lisp/org-irc.el | 2 +- lisp/org-list.el | 2 +- lisp/org-loaddefs.el | 85 +++++---- lisp/org-macro.el | 4 +- lisp/org-macs.el | 2 +- lisp/org-mhe.el | 2 +- lisp/org-mobile.el | 4 +- lisp/org-mouse.el | 2 +- lisp/org-pcomplete.el | 2 +- lisp/org-plot.el | 2 +- lisp/org-protocol.el | 2 +- lisp/org-rmail.el | 2 +- lisp/org-src.el | 7 +- lisp/org-table.el | 348 ++++++++++++++++++---------------- lisp/org-timer.el | 2 +- lisp/org-version.el | 4 +- lisp/org-w3m.el | 2 +- lisp/org.el | 161 ++++++++-------- lisp/ox-ascii.el | 8 +- lisp/ox-beamer.el | 2 +- lisp/ox-html.el | 14 +- lisp/ox-icalendar.el | 6 +- lisp/ox-latex.el | 8 +- lisp/ox-man.el | 2 +- lisp/ox-md.el | 2 +- lisp/ox-odt.el | 7 +- lisp/ox-org.el | 4 +- lisp/ox-publish.el | 4 +- lisp/ox-texinfo.el | 2 +- lisp/ox.el | 18 +- mk/version.mk | 4 +- 150 files changed, 659 insertions(+), 567 deletions(-) mode change 100755 => 100644 lisp/org.el diff --git a/contrib/lisp/ob-eukleides.el b/contrib/lisp/ob-eukleides.el index cb5bb84..67f3bf4 100644 --- a/contrib/lisp/ob-eukleides.el +++ b/contrib/lisp/ob-eukleides.el @@ -1,6 +1,6 @@ ;;; ob-eukleides.el --- Org-babel functions for eukleides evaluation -;; Copyright (C) 2010-2014 Free Software Foundation, Inc. +;; Copyright (C) 2010-2016 Free Software Foundation, Inc. ;; Author: Luis Anaya ;; Keywords: literate programming, reproducible research diff --git a/contrib/lisp/ob-mathomatic.el b/contrib/lisp/ob-mathomatic.el index bfd8ecf..0ec1a5f 100644 --- a/contrib/lisp/ob-mathomatic.el +++ b/contrib/lisp/ob-mathomatic.el @@ -1,6 +1,6 @@ ;;; ob-mathomatic.el --- Org-babel functions for mathomatic evaluation -;; Copyright (C) 2009-2014 Free Software Foundation, Inc. +;; Copyright (C) 2009-2016 Free Software Foundation, Inc. ;; Author: Eric S Fraga ;; Eric Schulte diff --git a/contrib/lisp/ob-tcl.el b/contrib/lisp/ob-tcl.el index d66357d..7f75c4a 100644 --- a/contrib/lisp/ob-tcl.el +++ b/contrib/lisp/ob-tcl.el @@ -1,6 +1,6 @@ ;;; ob-tcl.el --- Org-babel functions for tcl evaluation -;; Copyright (C) 2009-2014 Free Software Foundation, Inc. +;; Copyright (C) 2009-2016 Free Software Foundation, Inc. ;; Authors: Dan Davison ;; Eric Schulte diff --git a/contrib/lisp/org-bibtex-extras.el b/contrib/lisp/org-bibtex-extras.el index 5f05039..7b0a89d 100644 --- a/contrib/lisp/org-bibtex-extras.el +++ b/contrib/lisp/org-bibtex-extras.el @@ -1,6 +1,6 @@ ;;; org-bibtex-extras --- extras for working with org-bibtex entries -;; Copyright (C) 2008-2014 Free Software Foundation, Inc. +;; Copyright (C) 2008-2016 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: outlines, hypermedia, bibtex, d3 diff --git a/contrib/lisp/org-bookmark.el b/contrib/lisp/org-bookmark.el index 9a69bbb..40c7cd0 100644 --- a/contrib/lisp/org-bookmark.el +++ b/contrib/lisp/org-bookmark.el @@ -1,5 +1,5 @@ ;;; org-bookmark.el - Support for links to bookmark -;; Copyright (C) 2008-2014 Free Software Foundation, Inc. +;; Copyright (C) 2008-2016 Free Software Foundation, Inc. ;; ;; Author: Tokuya Kameshima ;; Version: 1.0 diff --git a/contrib/lisp/org-collector.el b/contrib/lisp/org-collector.el index 5894707..3e2b3c4 100644 --- a/contrib/lisp/org-collector.el +++ b/contrib/lisp/org-collector.el @@ -1,6 +1,6 @@ ;;; org-collector --- collect properties into tables -;; Copyright (C) 2008-2014 Free Software Foundation, Inc. +;; Copyright (C) 2008-2016 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: outlines, hypermedia, calendar, wp, experimentation, diff --git a/contrib/lisp/org-contribdir.el b/contrib/lisp/org-contribdir.el index d94e7a0..d0bd951 100644 --- a/contrib/lisp/org-contribdir.el +++ b/contrib/lisp/org-contribdir.el @@ -1,5 +1,5 @@ ;;; org-contribdir.el --- Mark the location of the contrib directory -;; Copyright (C) 2009-2014 Free Software Foundation, Inc. +;; Copyright (C) 2009-2016 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/contrib/lisp/org-depend.el b/contrib/lisp/org-depend.el index 1cd4130..5e49b6c 100644 --- a/contrib/lisp/org-depend.el +++ b/contrib/lisp/org-depend.el @@ -1,5 +1,5 @@ ;;; org-depend.el --- TODO dependencies for Org-mode -;; Copyright (C) 2008-2014 Free Software Foundation, Inc. +;; Copyright (C) 2008-2016 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/contrib/lisp/org-download.el b/contrib/lisp/org-download.el index 6bff649..cbf335b 100644 --- a/contrib/lisp/org-download.el +++ b/contrib/lisp/org-download.el @@ -1,6 +1,6 @@ ;;; org-download.el --- Image drag-and-drop for Emacs org-mode -;; Copyright (C) 2014-2015 Free Software Foundation, Inc. +;; Copyright (C) 2014-2016 Free Software Foundation, Inc. ;; Author: Oleh Krehel ;; Keywords: images, screenshots, download diff --git a/contrib/lisp/org-effectiveness.el b/contrib/lisp/org-effectiveness.el index 0d830ab..b1e5a35 100644 --- a/contrib/lisp/org-effectiveness.el +++ b/contrib/lisp/org-effectiveness.el @@ -1,6 +1,6 @@ ;;; org-effectiveness.el --- Measuring the personal effectiveness -;; Copyright (C) 2013 Free Software Foundation, Inc. +;; Copyright (C) 2013-2016 Free Software Foundation, Inc. ;; Author: David Arroyo Menéndez ;; Keywords: effectiveness, plot diff --git a/contrib/lisp/org-eldoc.el b/contrib/lisp/org-eldoc.el index c970b27..5583cb8 100644 --- a/contrib/lisp/org-eldoc.el +++ b/contrib/lisp/org-eldoc.el @@ -1,6 +1,6 @@ ;;; org-eldoc.el --- display org header and src block info using eldoc -;; Copyright (c) 2014 Free Software Foundation, Inc. +;; Copyright (c) 2014-2016 Free Software Foundation, Inc. ;; Author: Łukasz Gruner ;; Maintainer: Łukasz Gruner diff --git a/contrib/lisp/org-elisp-symbol.el b/contrib/lisp/org-elisp-symbol.el index 167731e..cdf868b 100644 --- a/contrib/lisp/org-elisp-symbol.el +++ b/contrib/lisp/org-elisp-symbol.el @@ -1,6 +1,6 @@ ;;; org-elisp-symbol.el --- Org links to emacs-lisp symbols ;; -;; Copyright 2007-2014 Free Software Foundation, Inc. +;; Copyright 2007-2016 Free Software Foundation, Inc. ;; ;; Author: Bastien Guerry ;; Version: 0.2 diff --git a/contrib/lisp/org-eval-light.el b/contrib/lisp/org-eval-light.el index 872f3a4..1449b24 100644 --- a/contrib/lisp/org-eval-light.el +++ b/contrib/lisp/org-eval-light.el @@ -1,6 +1,6 @@ ;;; org-eval-light.el --- Display result of evaluating code in various languages (light) -;; Copyright (C) 2008-2014 Free Software Foundation, Inc. +;; Copyright (C) 2008-2016 Free Software Foundation, Inc. ;; Author: Carsten Dominik , ;; Eric Schulte diff --git a/contrib/lisp/org-eval.el b/contrib/lisp/org-eval.el index cb5620c..92a4a19 100644 --- a/contrib/lisp/org-eval.el +++ b/contrib/lisp/org-eval.el @@ -1,5 +1,5 @@ ;;; org-eval.el --- Display result of evaluating code in various languages -;; Copyright (C) 2008-2014 Free Software Foundation, Inc. +;; Copyright (C) 2008-2016 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/contrib/lisp/org-eww.el b/contrib/lisp/org-eww.el index a6973e9..20ec9d4 100644 --- a/contrib/lisp/org-eww.el +++ b/contrib/lisp/org-eww.el @@ -1,6 +1,6 @@ ;;; org-eww.el --- Store url and kill from Eww mode for Org -;; Copyright (C) 2014, 2015 Free Software Foundation, Inc. +;; Copyright (C) 2014-2016 Free Software Foundation, Inc. ;; Author: Marco Wahl a ;; Keywords: link, eww diff --git a/contrib/lisp/org-expiry.el b/contrib/lisp/org-expiry.el index 1506c3b..396f016 100644 --- a/contrib/lisp/org-expiry.el +++ b/contrib/lisp/org-expiry.el @@ -1,6 +1,6 @@ ;;; org-expiry.el --- expiry mechanism for Org entries ;; -;; Copyright 2007-2014 Free Software Foundation, Inc. +;; Copyright 2007-2016 Free Software Foundation, Inc. ;; ;; Author: Bastien Guerry ;; Version: 0.2 diff --git a/contrib/lisp/org-index.el b/contrib/lisp/org-index.el index 52bd2fc..aee0bac 100644 --- a/contrib/lisp/org-index.el +++ b/contrib/lisp/org-index.el @@ -1,6 +1,6 @@ ;;; org-index.el --- A personal index for org and beyond -;; Copyright (C) 2011-2015 Free Software Foundation, Inc. +;; Copyright (C) 2011-2016 Free Software Foundation, Inc. ;; Author: Marc Ihm ;; Version: 4.2.1 diff --git a/contrib/lisp/org-interactive-query.el b/contrib/lisp/org-interactive-query.el index 644132c..42ff7fd 100644 --- a/contrib/lisp/org-interactive-query.el +++ b/contrib/lisp/org-interactive-query.el @@ -1,6 +1,6 @@ ;;; org-interactive-query.el --- Interactive modification of agenda query ;; -;; Copyright 2007-2014 Free Software Foundation, Inc. +;; Copyright 2007-2016 Free Software Foundation, Inc. ;; ;; Author: Christopher League ;; Version: 1.0 diff --git a/contrib/lisp/org-learn.el b/contrib/lisp/org-learn.el index 1755e71..e47c8f8 100644 --- a/contrib/lisp/org-learn.el +++ b/contrib/lisp/org-learn.el @@ -1,6 +1,6 @@ ;;; org-learn.el --- Implements SuperMemo's incremental learning algorithm -;; Copyright (C) 2009-2014 Free Software Foundation, Inc. +;; Copyright (C) 2009-2016 Free Software Foundation, Inc. ;; Author: John Wiegley ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/contrib/lisp/org-license.el b/contrib/lisp/org-license.el index 426b148..dc1d797 100644 --- a/contrib/lisp/org-license.el +++ b/contrib/lisp/org-license.el @@ -1,6 +1,6 @@ ;;; org-license.el --- Add a license to your org files -;; Copyright (C) 2013 Free Software Foundation, Inc. +;; Copyright (C) 2013-2016 Free Software Foundation, Inc. ;; Author: David Arroyo Menéndez ;; Keywords: licenses, creative commons diff --git a/contrib/lisp/org-mac-link.el b/contrib/lisp/org-mac-link.el index c991dfa..56d67e1 100644 --- a/contrib/lisp/org-mac-link.el +++ b/contrib/lisp/org-mac-link.el @@ -1,6 +1,6 @@ ;;; org-mac-link.el --- Insert org-mode links to items selected in various Mac apps ;; -;; Copyright (c) 2010-2014 Free Software Foundation, Inc. +;; Copyright (c) 2010-2016 Free Software Foundation, Inc. ;; ;; Author: Anthony Lander ;; John Wiegley diff --git a/contrib/lisp/org-mew.el b/contrib/lisp/org-mew.el index eb0afc0..8f7f609 100644 --- a/contrib/lisp/org-mew.el +++ b/contrib/lisp/org-mew.el @@ -1,6 +1,6 @@ ;;; org-mew.el --- Support for links to Mew messages from within Org-mode -;; Copyright (C) 2008-2014 Free Software Foundation, Inc. +;; Copyright (C) 2008-2016 Free Software Foundation, Inc. ;; Author: Tokuya Kameshima ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/contrib/lisp/org-notify.el b/contrib/lisp/org-notify.el index 8bcca9f..91b34d3 100644 --- a/contrib/lisp/org-notify.el +++ b/contrib/lisp/org-notify.el @@ -1,6 +1,6 @@ ;;; org-notify.el --- Notifications for Org-mode -;; Copyright (C) 2012, 2013, 2014 Free Software Foundation, Inc. +;; Copyright (C) 2012-2016 Free Software Foundation, Inc. ;; Author: Peter Münster ;; Keywords: notification, todo-list, alarm, reminder, pop-up diff --git a/contrib/lisp/org-screenshot.el b/contrib/lisp/org-screenshot.el index 6d10783..d44063a 100644 --- a/contrib/lisp/org-screenshot.el +++ b/contrib/lisp/org-screenshot.el @@ -1,7 +1,6 @@ ;;; org-screenshot.el --- Take and manage screenshots in Org-mode files ;; -;; Copyright (C) 2009-2014 -;; Free Software Foundation, Inc. +;; Copyright (C) 2009-2016 Free Software Foundation, Inc. ;; ;; Author: Max Mikhanosha ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/contrib/lisp/org-sudoku.el b/contrib/lisp/org-sudoku.el index 4b4a3ac..c6a64e1 100644 --- a/contrib/lisp/org-sudoku.el +++ b/contrib/lisp/org-sudoku.el @@ -1,6 +1,6 @@ ;;; org-sudoku.el --- Greate and solve SUDOKU games in Org tables -;; Copyright (C) 2012, 2013, 2014 Free Software Foundation, Inc. +;; Copyright (C) 2012-2016 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp, games diff --git a/contrib/lisp/org-toc.el b/contrib/lisp/org-toc.el index 622cc02..b82952e 100644 --- a/contrib/lisp/org-toc.el +++ b/contrib/lisp/org-toc.el @@ -1,6 +1,6 @@ ;;; org-toc.el --- Table of contents for Org-mode buffer -;; Copyright 2007-2014 Free Software Foundation, Inc. +;; Copyright 2007-2016 Free Software Foundation, Inc. ;; ;; Author: Bastien Guerry ;; Keywords: Org table of contents diff --git a/contrib/lisp/org-track.el b/contrib/lisp/org-track.el index 434060b..50f10cd 100644 --- a/contrib/lisp/org-track.el +++ b/contrib/lisp/org-track.el @@ -1,7 +1,6 @@ ;;; org-track.el --- Track the most recent Org-mode version available. ;; -;; Copyright (C) 2009-2014 -;; Free Software Foundation, Inc. +;; Copyright (C) 2009-2016 Free Software Foundation, Inc. ;; ;; Author: Bastien Guerry ;; Eric S Fraga diff --git a/contrib/lisp/org-vm.el b/contrib/lisp/org-vm.el index 5d30f64..18d1be6 100644 --- a/contrib/lisp/org-vm.el +++ b/contrib/lisp/org-vm.el @@ -1,6 +1,6 @@ ;;; org-vm.el --- Support for links to VM messages from within Org-mode -;; Copyright (C) 2004-2014 Free Software Foundation, Inc. +;; Copyright (C) 2004-2016 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/contrib/lisp/org-wikinodes.el b/contrib/lisp/org-wikinodes.el index ff2d55a..428cb6c 100644 --- a/contrib/lisp/org-wikinodes.el +++ b/contrib/lisp/org-wikinodes.el @@ -1,6 +1,6 @@ ;;; org-wikinodes.el --- Wiki-like CamelCase links to outline nodes -;; Copyright (C) 2010-2014 Free Software Foundation, Inc. +;; Copyright (C) 2010-2016 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/contrib/lisp/org-wl.el b/contrib/lisp/org-wl.el index 632c9e3..9d7eb44 100644 --- a/contrib/lisp/org-wl.el +++ b/contrib/lisp/org-wl.el @@ -1,6 +1,6 @@ ;;; org-wl.el --- Support for links to Wanderlust messages from within Org-mode -;; Copyright (C) 2004-2014 Free Software Foundation, Inc. +;; Copyright (C) 2004-2016 Free Software Foundation, Inc. ;; Author: Tokuya Kameshima ;; David Maus diff --git a/contrib/lisp/orgtbl-sqlinsert.el b/contrib/lisp/orgtbl-sqlinsert.el index ed8f915..c8a39af 100644 --- a/contrib/lisp/orgtbl-sqlinsert.el +++ b/contrib/lisp/orgtbl-sqlinsert.el @@ -1,6 +1,6 @@ ;;; orgtbl-sqlinsert.el --- orgtbl to SQL insert statements. -;; Copyright (C) 2008-2014 Free Software Foundation +;; Copyright (C) 2008-2016 Free Software Foundation ;; Author: Jason Riedy ;; Keywords: org, tables, sql diff --git a/contrib/lisp/ox-bibtex.el b/contrib/lisp/ox-bibtex.el index 0719866..9d548bb 100644 --- a/contrib/lisp/ox-bibtex.el +++ b/contrib/lisp/ox-bibtex.el @@ -248,6 +248,7 @@ Return new parse tree." (insert (format "
\n

%s

\n" (org-export-translate "References" :html info))) (insert-file-contents (concat out-file ".html")) + (goto-char (point-max)) (insert "\n
")) ((org-export-derived-backend-p backend 'ascii) ;; convert HTML references to text w/pandoc diff --git a/contrib/lisp/ox-freemind.el b/contrib/lisp/ox-freemind.el index 3287d5d..3e4b6ae 100644 --- a/contrib/lisp/ox-freemind.el +++ b/contrib/lisp/ox-freemind.el @@ -1,6 +1,6 @@ ;;; ox-freemind.el --- Freemind Mindmap Back-End for Org Export Engine -;; Copyright (C) 2013, 2014 Free Software Foundation, Inc. +;; Copyright (C) 2013-2016 Free Software Foundation, Inc. ;; Author: Jambunathan K ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/contrib/lisp/ox-groff.el b/contrib/lisp/ox-groff.el index ade3478..6489ee7 100644 --- a/contrib/lisp/ox-groff.el +++ b/contrib/lisp/ox-groff.el @@ -1,6 +1,6 @@ ;;; ox-groff.el --- Groff Back-End for Org Export Engine -;; Copyright (C) 2011-2015 Free Software Foundation, Inc. +;; Copyright (C) 2011-2016 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou ;; Author: Luis R Anaya diff --git a/contrib/lisp/ox-koma-letter.el b/contrib/lisp/ox-koma-letter.el index e6fed3b..48d4ead 100644 --- a/contrib/lisp/ox-koma-letter.el +++ b/contrib/lisp/ox-koma-letter.el @@ -1,6 +1,6 @@ ;;; ox-koma-letter.el --- KOMA Scrlttr2 Back-End for Org Export Engine -;; Copyright (C) 2007-2015 Free Software Foundation, Inc. +;; Copyright (C) 2007-2016 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou ;; Alan Schmitt diff --git a/contrib/lisp/ox-taskjuggler.el b/contrib/lisp/ox-taskjuggler.el index 2bd47e6..664a0ea 100644 --- a/contrib/lisp/ox-taskjuggler.el +++ b/contrib/lisp/ox-taskjuggler.el @@ -1,6 +1,6 @@ ;;; ox-taskjuggler.el --- TaskJuggler Back-End for Org Export Engine ;; -;; Copyright (C) 2007-2014 Free Software Foundation, Inc. +;; Copyright (C) 2007-2016 Free Software Foundation, Inc. ;; ;; Emacs Lisp Archive Entry ;; Filename: ox-taskjuggler.el diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS index 779ed76..37911c6 100644 --- a/etc/ORG-NEWS +++ b/etc/ORG-NEWS @@ -3,7 +3,7 @@ ORG NEWS -- history of user-visible changes. -*- org -*- #+LINK: doc http://orgmode.org/worg/doc.html#%s #+LINK: git http://orgmode.org/cgit.cgi/org-mode.git/commit/?id=%s -Copyright (C) 2012-2015 Free Software Foundation, Inc. +Copyright (C) 2012-2016 Free Software Foundation, Inc. See the end of the file for license conditions. Please send Org bug reports to emacs-orgmode@gnu.org. diff --git a/lisp/ob-C.el b/lisp/ob-C.el index 64e9d20..a6d4d5e 100644 --- a/lisp/ob-C.el +++ b/lisp/ob-C.el @@ -1,6 +1,6 @@ ;;; ob-C.el --- org-babel functions for C and similar languages -;; Copyright (C) 2010-2015 Free Software Foundation, Inc. +;; Copyright (C) 2010-2016 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Thierry Banel @@ -81,7 +81,7 @@ This function calls `org-babel-execute:C++'." (org-babel-execute:C++ body params)) (defun org-babel-expand-body:cpp (body params) - "Expand a block of C++ code with org-babel according to it's + "Expand a block of C++ code with org-babel according to its header arguments." (org-babel-expand-body:C++ body params)) @@ -91,7 +91,7 @@ This function is called by `org-babel-execute-src-block'." (let ((org-babel-c-variant 'cpp)) (org-babel-C-execute body params))) (defun org-babel-expand-body:C++ (body params) - "Expand a block of C++ code with org-babel according to it's + "Expand a block of C++ code with org-babel according to its header arguments." (let ((org-babel-c-variant 'cpp)) (org-babel-C-expand-C++ body params))) @@ -101,7 +101,7 @@ This function is called by `org-babel-execute-src-block'." (let ((org-babel-c-variant 'd)) (org-babel-C-execute body params))) (defun org-babel-expand-body:D (body params) - "Expand a block of D code with org-babel according to it's + "Expand a block of D code with org-babel according to its header arguments." (let ((org-babel-c-variant 'd)) (org-babel-C-expand-D body params))) @@ -111,7 +111,7 @@ This function is called by `org-babel-execute-src-block'." (let ((org-babel-c-variant 'c)) (org-babel-C-execute body params))) (defun org-babel-expand-body:C (body params) - "Expand a block of C code with org-babel according to it's + "Expand a block of C code with org-babel according to its header arguments." (let ((org-babel-c-variant 'c)) (org-babel-C-expand-C body params))) @@ -175,12 +175,12 @@ or `org-babel-execute:C++' or `org-babel-execute:D'." (defun org-babel-C-expand-C++ (body params) "Expand a block of C or C++ code with org-babel according to -it's header arguments." +its header arguments." (org-babel-C-expand-C body params)) (defun org-babel-C-expand-C (body params) "Expand a block of C or C++ code with org-babel according to -it's header arguments." +its header arguments." (let ((vars (mapcar #'cdr (org-babel-get-header params :var))) (colnames (cdar (org-babel-get-header params :colname-names))) (main-p (not (string= (cdr (assoc :main params)) "no"))) @@ -229,7 +229,7 @@ it's header arguments." (defun org-babel-C-expand-D (body params) "Expand a block of D code with org-babel according to -it's header arguments." +its header arguments." (let ((vars (mapcar #'cdr (org-babel-get-header params :var))) (colnames (cdar (org-babel-get-header params :colname-names))) (main-p (not (string= (cdr (assoc :main params)) "no"))) diff --git a/lisp/ob-J.el b/lisp/ob-J.el index 500ce9e..dcdad03 100644 --- a/lisp/ob-J.el +++ b/lisp/ob-J.el @@ -1,6 +1,6 @@ ;;; ob-J.el --- org-babel functions for J evaluation -;; Copyright (C) 2011-2013 Free Software Foundation, Inc. +;; Copyright (C) 2011-2016 Free Software Foundation, Inc. ;; Author: Oleh Krehel ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-R.el b/lisp/ob-R.el index 4bd6eea..4b37c18 100644 --- a/lisp/ob-R.el +++ b/lisp/ob-R.el @@ -1,6 +1,6 @@ ;;; ob-R.el --- org-babel functions for R code evaluation -;; Copyright (C) 2009-2015 Free Software Foundation, Inc. +;; Copyright (C) 2009-2016 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Dan Davison diff --git a/lisp/ob-abc.el b/lisp/ob-abc.el index a980b02..36ad55d 100644 --- a/lisp/ob-abc.el +++ b/lisp/ob-abc.el @@ -1,6 +1,6 @@ ;;; ob-abc.el --- org-babel functions for template evaluation -;; Copyright (C) Free Software Foundation +;; Copyright (C) 2013-2016 Free Software Foundation, Inc. ;; Author: William Waites ;; Keywords: literate programming, music diff --git a/lisp/ob-asymptote.el b/lisp/ob-asymptote.el index ca58ecb..f6492ae 100644 --- a/lisp/ob-asymptote.el +++ b/lisp/ob-asymptote.el @@ -1,6 +1,6 @@ ;;; ob-asymptote.el --- org-babel functions for asymptote evaluation -;; Copyright (C) 2009-2015 Free Software Foundation, Inc. +;; Copyright (C) 2009-2016 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-awk.el b/lisp/ob-awk.el index eb03b46..021dd78 100644 --- a/lisp/ob-awk.el +++ b/lisp/ob-awk.el @@ -1,6 +1,6 @@ ;;; ob-awk.el --- org-babel functions for awk evaluation -;; Copyright (C) 2011-2015 Free Software Foundation, Inc. +;; Copyright (C) 2011-2016 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-calc.el b/lisp/ob-calc.el index 5dec244..f5e70de 100644 --- a/lisp/ob-calc.el +++ b/lisp/ob-calc.el @@ -1,6 +1,6 @@ ;;; ob-calc.el --- org-babel functions for calc code evaluation -;; Copyright (C) 2010-2015 Free Software Foundation, Inc. +;; Copyright (C) 2010-2016 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-clojure.el b/lisp/ob-clojure.el index 18a268a..5b023e6 100644 --- a/lisp/ob-clojure.el +++ b/lisp/ob-clojure.el @@ -1,6 +1,6 @@ ;;; ob-clojure.el --- org-babel functions for clojure evaluation -;; Copyright (C) 2009-2015 Free Software Foundation, Inc. +;; Copyright (C) 2009-2016 Free Software Foundation, Inc. ;; Author: Joel Boehland, Eric Schulte, Oleh Krehel ;; diff --git a/lisp/ob-comint.el b/lisp/ob-comint.el index afbbf84..8145d2c 100644 --- a/lisp/ob-comint.el +++ b/lisp/ob-comint.el @@ -1,6 +1,6 @@ ;;; ob-comint.el --- org-babel functions for interaction with comint buffers -;; Copyright (C) 2009-2015 Free Software Foundation, Inc. +;; Copyright (C) 2009-2016 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research, comint diff --git a/lisp/ob-coq.el b/lisp/ob-coq.el index 0147786..210f1a2 100644 --- a/lisp/ob-coq.el +++ b/lisp/ob-coq.el @@ -1,6 +1,6 @@ ;;; ob-coq.el --- org-babel functions for Coq -;; Copyright (C) 2010-2015 Free Software Foundation, Inc. +;; Copyright (C) 2010-2016 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-core.el b/lisp/ob-core.el index 617ef69..fcd15c4 100644 --- a/lisp/ob-core.el +++ b/lisp/ob-core.el @@ -1,6 +1,6 @@ ;;; ob-core.el --- working with code blocks in org-mode -;; Copyright (C) 2009-2015 Free Software Foundation, Inc. +;; Copyright (C) 2009-2016 Free Software Foundation, Inc. ;; Authors: Eric Schulte ;; Dan Davison @@ -33,12 +33,16 @@ (if (memq system-type '(windows-nt cygwin)) ".exe" nil)) + ;; dynamically scoped for tramp (defvar org-babel-call-process-region-original nil) -(defvar org-src-lang-modes) (defvar org-babel-library-of-babel) +(defvar org-edit-src-content-indentation) +(defvar org-src-lang-modes) + (declare-function outline-show-all "outline" ()) (declare-function org-every "org" (pred seq)) +(declare-function org-get-indentation "org" (&optional line)) (declare-function org-remove-indentation "org" (code &optional n)) (declare-function org-reduce "org" (CL-FUNC CL-SEQ &rest CL-KEYS)) (declare-function org-mark-ring-push "org" (&optional pos buffer)) @@ -99,6 +103,7 @@ (declare-function org-element-context "org-element" (&optional element)) (declare-function org-element-type "org-element" (element)) (declare-function org-element-at-point "org-element" ()) +(declare-function org-element-normalize-string "org-element" (s)) (declare-function org-element-property "org-element" (property element)) (declare-function org-every "org" (pred seq)) (declare-function org-macro-escape-arguments "org-macro" (&rest args)) @@ -260,7 +265,7 @@ Returns a list (setq info (org-babel-parse-src-block-match)) (setq indent (car (last info))) (setq info (butlast info)) - (while (and (forward-line -1) + (while (and (= 0 (forward-line -1)) (looking-at org-babel-multi-line-header-regexp)) (setf (nth 2 info) (org-babel-merge-params @@ -317,6 +322,8 @@ name of the code block." org-confirm-babel-evaluate))) (code-block (if ,info (format " %s " ,lang) " ")) (block-name (if ,name (format " (%s) " ,name) " "))) + ;; Silence byte-compiler if `body' doesn't use those vars. + (ignore noeval query) ,@body))) (defsubst org-babel-check-evaluate (info) @@ -613,6 +620,8 @@ multiple blocks are being executed (e.g., in chained execution through use of the :var header argument) this marker points to the outer-most code block.") +(defvar *this*) + ;;;###autoload (defun org-babel-execute-src-block (&optional arg info params) "Execute the current source code block. @@ -660,7 +669,8 @@ block." (skip-chars-forward " \t") (let ((result (org-babel-read-result))) (message (replace-regexp-in-string - "%" "%%" (format "%S" result))) result))) + "%" "%%" (format "%S" result))) + result))) ((org-babel-confirm-evaluate (let ((i info)) (setf (nth 2 i) merged-params) i)) (let* ((lang (nth 0 info)) @@ -756,7 +766,7 @@ org-babel-expand-body:lang function." "\n"))) ;;;###autoload -(defun org-babel-expand-src-block (&optional arg info params) +(defun org-babel-expand-src-block (&optional _arg info params) "Expand the current source code block. Expand according to the source code block's header arguments and pop open the results in a preview buffer." @@ -809,8 +819,7 @@ arguments and pop open the results in a preview buffer." (let ((results (copy-sequence original))) (dolist (new-list others) (dolist (arg-pair new-list) - (let ((header (car arg-pair)) - (args (cdr arg-pair))) + (let ((header (car arg-pair))) (setq results (cons arg-pair (org-remove-if (lambda (pair) (equal header (car pair))) @@ -903,7 +912,7 @@ arguments and pop open the results in a preview buffer." (add-hook 'org-tab-first-hook 'org-babel-header-arg-expand) ;;;###autoload -(defun org-babel-load-in-session (&optional arg info) +(defun org-babel-load-in-session (&optional _arg info) "Load the body of the current source-code block. Evaluate the header arguments for the source block before entering the session. After loading the body this pops open the @@ -972,7 +981,7 @@ with a prefix argument then this is passed on to (defvar org-src-window-setup) ;;;###autoload -(defun org-babel-switch-to-session-with-code (&optional arg info) +(defun org-babel-switch-to-session-with-code (&optional arg _info) "Switch to code buffer and display session." (interactive "P") (let ((swap-windows @@ -1098,7 +1107,13 @@ end-body --------- point at the end of the body" (body (match-string 5)) (beg-body (match-beginning 5)) (end-body (match-end 5))) - ,@body + ;; Silence byte-compiler in case `body' doesn't use all + ;; those variables. + (ignore full-block beg-block end-block lang + beg-lang end-lang switches beg-switches + end-switches header-args beg-header-args + end-header-args body beg-body end-body) + ,@body (goto-char end-block))))) (unless visited-p (kill-buffer to-be-removed)) (goto-char point)))) @@ -1625,7 +1640,7 @@ Note: this function removes any hlines in TABLE." (rownames (funcall (lambda () (let ((tp table)) (mapcar - (lambda (row) + (lambda (_row) (prog1 (pop (car tp)) (setq tp (cdr tp)))) @@ -1699,13 +1714,17 @@ to the table for reinsertion to org-mode." (org-babel-put-colnames table colnames) table)) table)) -(defun org-babel-where-is-src-block-head () +(defun org-babel-where-is-src-block-head (&optional src-block) "Find where the current source block begins. + +If optional argument SRC-BLOCK is `src-block' type element, find +its current beginning instead. + Return the point at the beginning of the current source block. Specifically at the beginning of the #+BEGIN_SRC line. Also set match-data relatively to `org-babel-src-block-regexp', which see. If the point is not on a source block then return nil." - (let ((element (org-element-at-point))) + (let ((element (or src-block (org-element-at-point)))) (when (eq (org-element-type element) 'src-block) (let ((end (org-element-property :end element))) (org-with-wide-buffer @@ -1803,7 +1822,8 @@ buffer or nil if no such result exists." (catch 'is-a-code-block (when (re-search-forward (concat org-babel-result-regexp - "[ \t]" (regexp-quote name) "[ \t]*[\n\f\v\r]") nil t) + "[ \t]" (regexp-quote name) "[ \t]*[\n\f\v\r]") + nil t) (when (and (string= "name" (downcase (match-string 1))) (or (beginning-of-line 1) (looking-at org-babel-src-block-regexp) @@ -2449,12 +2469,30 @@ file's directory then expand relative links." (defun org-babel-update-block-body (new-body) "Update the body of the current code block to NEW-BODY." - (if (not (org-babel-where-is-src-block-head)) - (error "Not in a source block") - (save-match-data - (replace-match (concat (org-babel-trim (org-remove-indentation new-body)) - "\n") nil t nil 5)) - (indent-rigidly (match-beginning 5) (match-end 5) 2))) + (let ((element (org-element-at-point))) + (unless (eq (org-element-type element) 'src-block) + (error "Not in a source block")) + (goto-char (org-babel-where-is-src-block-head element)) + (let* ((ind (org-get-indentation)) + (body-start (line-beginning-position 2)) + (body (org-element-normalize-string + (if (or org-src-preserve-indentation + (org-element-property :preserve-indent element)) + new-body + (with-temp-buffer + (insert (org-remove-indentation new-body)) + (indent-rigidly + (point-min) + (point-max) + (+ ind org-edit-src-content-indentation)) + (buffer-string)))))) + (delete-region body-start + (org-with-wide-buffer + (goto-char (org-element-property :end element)) + (skip-chars-backward " \t\n") + (line-beginning-position))) + (goto-char body-start) + (insert body)))) (defun org-babel-merge-params (&rest plists) "Combine all parameter association lists in PLISTS. diff --git a/lisp/ob-css.el b/lisp/ob-css.el index a0f0ad1..7f3d81a 100644 --- a/lisp/ob-css.el +++ b/lisp/ob-css.el @@ -1,6 +1,6 @@ ;;; ob-css.el --- org-babel functions for css evaluation -;; Copyright (C) 2009-2015 Free Software Foundation, Inc. +;; Copyright (C) 2009-2016 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-ditaa.el b/lisp/ob-ditaa.el index 081cddf..54238f3 100644 --- a/lisp/ob-ditaa.el +++ b/lisp/ob-ditaa.el @@ -1,6 +1,6 @@ ;;; ob-ditaa.el --- org-babel functions for ditaa evaluation -;; Copyright (C) 2009-2015 Free Software Foundation, Inc. +;; Copyright (C) 2009-2016 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-dot.el b/lisp/ob-dot.el index 7488980..e2e8857 100644 --- a/lisp/ob-dot.el +++ b/lisp/ob-dot.el @@ -1,6 +1,6 @@ ;;; ob-dot.el --- org-babel functions for dot evaluation -;; Copyright (C) 2009-2015 Free Software Foundation, Inc. +;; Copyright (C) 2009-2016 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-ebnf.el b/lisp/ob-ebnf.el index 8c98d30..9a78f6a 100644 --- a/lisp/ob-ebnf.el +++ b/lisp/ob-ebnf.el @@ -1,6 +1,6 @@ ;;; ob-ebnf.el --- org-babel functions for ebnf evaluation -;; Copyright (C) 2013 Free Software Foundation, Inc. +;; Copyright (C) 2013-2016 Free Software Foundation, Inc. ;; Author: Michael Gauland ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-emacs-lisp.el b/lisp/ob-emacs-lisp.el index 5eb7003..eaa1124 100644 --- a/lisp/ob-emacs-lisp.el +++ b/lisp/ob-emacs-lisp.el @@ -1,6 +1,6 @@ ;;; ob-emacs-lisp.el --- org-babel functions for emacs-lisp code evaluation -;; Copyright (C) 2009-2015 Free Software Foundation, Inc. +;; Copyright (C) 2009-2016 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-eval.el b/lisp/ob-eval.el index d94b695..e3ac383 100644 --- a/lisp/ob-eval.el +++ b/lisp/ob-eval.el @@ -1,6 +1,6 @@ ;;; ob-eval.el --- org-babel functions for external code evaluation -;; Copyright (C) 2009-2015 Free Software Foundation, Inc. +;; Copyright (C) 2009-2016 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research, comint diff --git a/lisp/ob-exp.el b/lisp/ob-exp.el index fdfbf5f..983d53c 100644 --- a/lisp/ob-exp.el +++ b/lisp/ob-exp.el @@ -1,6 +1,6 @@ ;;; ob-exp.el --- Exportation of org-babel source blocks -;; Copyright (C) 2009-2015 Free Software Foundation, Inc. +;; Copyright (C) 2009-2016 Free Software Foundation, Inc. ;; Authors: Eric Schulte ;; Dan Davison @@ -108,7 +108,7 @@ code ---- the default, display the code inside the block but do not process results - just like none only the block is run on export ensuring - that it's results are present in the org-mode buffer + that its results are present in the org-mode buffer none ---- do not display either code or results upon export diff --git a/lisp/ob-forth.el b/lisp/ob-forth.el index cc2795a..5a46d36 100644 --- a/lisp/ob-forth.el +++ b/lisp/ob-forth.el @@ -1,6 +1,6 @@ ;;; ob-forth.el --- org-babel functions for Forth -;; Copyright (C) 2014 Free Software Foundation, Inc. +;; Copyright (C) 2014-2016 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research, forth diff --git a/lisp/ob-fortran.el b/lisp/ob-fortran.el index 6390536..ed5d2dc 100644 --- a/lisp/ob-fortran.el +++ b/lisp/ob-fortran.el @@ -1,6 +1,6 @@ ;;; ob-fortran.el --- org-babel functions for fortran -;; Copyright (C) 2011-2015 Free Software Foundation, Inc. +;; Copyright (C) 2011-2016 Free Software Foundation, Inc. ;; Authors: Sergey Litvinov ;; Eric Schulte @@ -79,7 +79,7 @@ (defun org-babel-expand-body:fortran (body params) "Expand a block of fortran or fortran code with org-babel according to -it's header arguments." +its header arguments." (let ((vars (mapcar #'cdr (org-babel-get-header params :var))) (main-p (not (string= (cdr (assoc :main params)) "no"))) (includes (or (cdr (assoc :includes params)) diff --git a/lisp/ob-gnuplot.el b/lisp/ob-gnuplot.el index 8490b16..237ecec 100644 --- a/lisp/ob-gnuplot.el +++ b/lisp/ob-gnuplot.el @@ -1,6 +1,6 @@ ;;; ob-gnuplot.el --- org-babel functions for gnuplot evaluation -;; Copyright (C) 2009-2015 Free Software Foundation, Inc. +;; Copyright (C) 2009-2016 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-groovy.el b/lisp/ob-groovy.el index 8c0498e..14f644c 100644 --- a/lisp/ob-groovy.el +++ b/lisp/ob-groovy.el @@ -1,6 +1,6 @@ ;;; ob-groovy.el --- org-babel functions for Groovy evaluation -;; Copyright (C) 2013-2015 Free Software Foundation, Inc. +;; Copyright (C) 2013-2016 Free Software Foundation, Inc. ;; Author: Miro Bezjak ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-haskell.el b/lisp/ob-haskell.el index e7e9cb4..e9cb3cc 100644 --- a/lisp/ob-haskell.el +++ b/lisp/ob-haskell.el @@ -1,6 +1,6 @@ ;;; ob-haskell.el --- org-babel functions for haskell evaluation -;; Copyright (C) 2009-2015 Free Software Foundation, Inc. +;; Copyright (C) 2009-2016 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-io.el b/lisp/ob-io.el index 4f32383..ec2cd02 100644 --- a/lisp/ob-io.el +++ b/lisp/ob-io.el @@ -1,6 +1,6 @@ ;;; ob-io.el --- org-babel functions for Io evaluation -;; Copyright (C) 2012-2015 Free Software Foundation, Inc. +;; Copyright (C) 2012-2016 Free Software Foundation, Inc. ;; Author: Andrzej Lichnerowicz ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-java.el b/lisp/ob-java.el index f808911..5856c65 100644 --- a/lisp/ob-java.el +++ b/lisp/ob-java.el @@ -1,6 +1,6 @@ ;;; ob-java.el --- org-babel functions for java evaluation -;; Copyright (C) 2011-2015 Free Software Foundation, Inc. +;; Copyright (C) 2011-2016 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-js.el b/lisp/ob-js.el index f8ce300..9440aa9 100644 --- a/lisp/ob-js.el +++ b/lisp/ob-js.el @@ -1,6 +1,6 @@ ;;; ob-js.el --- org-babel functions for Javascript -;; Copyright (C) 2010-2015 Free Software Foundation, Inc. +;; Copyright (C) 2010-2016 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research, js diff --git a/lisp/ob-keys.el b/lisp/ob-keys.el index 7b70998..6a63456 100644 --- a/lisp/ob-keys.el +++ b/lisp/ob-keys.el @@ -1,6 +1,6 @@ ;;; ob-keys.el --- key bindings for org-babel -;; Copyright (C) 2009-2015 Free Software Foundation, Inc. +;; Copyright (C) 2009-2016 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-latex.el b/lisp/ob-latex.el index 8b3e5e8..681e229 100644 --- a/lisp/ob-latex.el +++ b/lisp/ob-latex.el @@ -1,6 +1,6 @@ ;;; ob-latex.el --- org-babel functions for latex "evaluation" -;; Copyright (C) 2009-2015 Free Software Foundation, Inc. +;; Copyright (C) 2009-2016 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-ledger.el b/lisp/ob-ledger.el index cda2d32..d07f257 100644 --- a/lisp/ob-ledger.el +++ b/lisp/ob-ledger.el @@ -1,6 +1,6 @@ ;;; ob-ledger.el --- org-babel functions for ledger evaluation -;; Copyright (C) 2010-2015 Free Software Foundation, Inc. +;; Copyright (C) 2010-2016 Free Software Foundation, Inc. ;; Author: Eric S Fraga ;; Keywords: literate programming, reproducible research, accounting diff --git a/lisp/ob-lilypond.el b/lisp/ob-lilypond.el index f1d732c..bfbace5 100644 --- a/lisp/ob-lilypond.el +++ b/lisp/ob-lilypond.el @@ -1,6 +1,6 @@ ;;; ob-lilypond.el --- org-babel functions for lilypond evaluation -;; Copyright (C) 2010-2015 Free Software Foundation, Inc. +;; Copyright (C) 2010-2016 Free Software Foundation, Inc. ;; Author: Martyn Jago ;; Keywords: babel language, literate programming diff --git a/lisp/ob-lisp.el b/lisp/ob-lisp.el index bd80dee..04df7fb 100644 --- a/lisp/ob-lisp.el +++ b/lisp/ob-lisp.el @@ -1,6 +1,6 @@ ;;; ob-lisp.el --- org-babel functions for common lisp evaluation -;; Copyright (C) 2009-2015 Free Software Foundation, Inc. +;; Copyright (C) 2009-2016 Free Software Foundation, Inc. ;; Authors: Joel Boehland ;; Eric Schulte diff --git a/lisp/ob-lob.el b/lisp/ob-lob.el index c285b0c..cf5cb4e 100644 --- a/lisp/ob-lob.el +++ b/lisp/ob-lob.el @@ -1,6 +1,6 @@ ;;; ob-lob.el --- functions supporting the Library of Babel -;; Copyright (C) 2009-2015 Free Software Foundation, Inc. +;; Copyright (C) 2009-2016 Free Software Foundation, Inc. ;; Authors: Eric Schulte ;; Dan Davison diff --git a/lisp/ob-makefile.el b/lisp/ob-makefile.el index b43a9b3..8f33773 100644 --- a/lisp/ob-makefile.el +++ b/lisp/ob-makefile.el @@ -1,6 +1,6 @@ ;;; ob-makefile.el --- org-babel functions for makefile evaluation -;; Copyright (C) 2009-2015 Free Software Foundation, Inc. +;; Copyright (C) 2009-2016 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Thomas S. Dye diff --git a/lisp/ob-matlab.el b/lisp/ob-matlab.el index 31464f9..69b4c45 100644 --- a/lisp/ob-matlab.el +++ b/lisp/ob-matlab.el @@ -1,6 +1,6 @@ ;;; ob-matlab.el --- org-babel support for matlab evaluation -;; Copyright (C) 2010-2015 Free Software Foundation, Inc. +;; Copyright (C) 2010-2016 Free Software Foundation, Inc. ;; Author: Dan Davison ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-maxima.el b/lisp/ob-maxima.el index 02e96b8..9b6cee6 100644 --- a/lisp/ob-maxima.el +++ b/lisp/ob-maxima.el @@ -1,6 +1,6 @@ ;;; ob-maxima.el --- org-babel functions for maxima evaluation -;; Copyright (C) 2009-2015 Free Software Foundation, Inc. +;; Copyright (C) 2009-2016 Free Software Foundation, Inc. ;; Author: Eric S Fraga ;; Eric Schulte diff --git a/lisp/ob-mscgen.el b/lisp/ob-mscgen.el index 6d57210..dae4c65 100644 --- a/lisp/ob-mscgen.el +++ b/lisp/ob-mscgen.el @@ -1,6 +1,6 @@ ;;; ob-msc.el --- org-babel functions for mscgen evaluation -;; Copyright (C) 2010-2015 Free Software Foundation, Inc. +;; Copyright (C) 2010-2016 Free Software Foundation, Inc. ;; Author: Juan Pechiar ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-ocaml.el b/lisp/ob-ocaml.el index 2831fcc..eadc388 100644 --- a/lisp/ob-ocaml.el +++ b/lisp/ob-ocaml.el @@ -1,6 +1,6 @@ ;;; ob-ocaml.el --- org-babel functions for ocaml evaluation -;; Copyright (C) 2009-2015 Free Software Foundation, Inc. +;; Copyright (C) 2009-2016 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-octave.el b/lisp/ob-octave.el index dbd9100..fba5a01 100644 --- a/lisp/ob-octave.el +++ b/lisp/ob-octave.el @@ -1,6 +1,6 @@ ;;; ob-octave.el --- org-babel functions for octave and matlab evaluation -;; Copyright (C) 2010-2015 Free Software Foundation, Inc. +;; Copyright (C) 2010-2016 Free Software Foundation, Inc. ;; Author: Dan Davison ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-org.el b/lisp/ob-org.el index ab0db67..af5b548 100644 --- a/lisp/ob-org.el +++ b/lisp/ob-org.el @@ -1,6 +1,6 @@ ;;; ob-org.el --- org-babel functions for org code block evaluation -;; Copyright (C) 2010-2015 Free Software Foundation, Inc. +;; Copyright (C) 2010-2016 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-perl.el b/lisp/ob-perl.el index 67d48d7..3a63837 100644 --- a/lisp/ob-perl.el +++ b/lisp/ob-perl.el @@ -1,6 +1,6 @@ ;;; ob-perl.el --- org-babel functions for perl evaluation -;; Copyright (C) 2009-2015 Free Software Foundation, Inc. +;; Copyright (C) 2009-2016 Free Software Foundation, Inc. ;; Authors: Dan Davison ;; Eric Schulte diff --git a/lisp/ob-picolisp.el b/lisp/ob-picolisp.el index 5b696f1..2a4ddc0 100644 --- a/lisp/ob-picolisp.el +++ b/lisp/ob-picolisp.el @@ -1,6 +1,6 @@ ;;; ob-picolisp.el --- org-babel functions for picolisp evaluation -;; Copyright (C) 2010-2015 Free Software Foundation, Inc. +;; Copyright (C) 2010-2016 Free Software Foundation, Inc. ;; Authors: Thorsten Jolitz ;; Eric Schulte diff --git a/lisp/ob-plantuml.el b/lisp/ob-plantuml.el index f0f7220..9a0604c 100644 --- a/lisp/ob-plantuml.el +++ b/lisp/ob-plantuml.el @@ -1,6 +1,6 @@ ;;; ob-plantuml.el --- org-babel functions for plantuml evaluation -;; Copyright (C) 2010-2015 Free Software Foundation, Inc. +;; Copyright (C) 2010-2016 Free Software Foundation, Inc. ;; Author: Zhang Weize ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-processing.el b/lisp/ob-processing.el index d983afe..2410402 100644 --- a/lisp/ob-processing.el +++ b/lisp/ob-processing.el @@ -1,6 +1,6 @@ ;;; ob-processing.el --- Babel functions for evaluation of processing -;; Copyright (C) 2015 Free Software Foundation, Inc. +;; Copyright (C) 2015-2016 Free Software Foundation, Inc. ;; Author: Jarmo Hurri (adapted from ob-asymptote.el written by Eric Schulte) ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-python.el b/lisp/ob-python.el index 3a9b8f6..1932e61 100644 --- a/lisp/ob-python.el +++ b/lisp/ob-python.el @@ -1,6 +1,6 @@ ;;; ob-python.el --- org-babel functions for python evaluation -;; Copyright (C) 2009-2015 Free Software Foundation, Inc. +;; Copyright (C) 2009-2016 Free Software Foundation, Inc. ;; Authors: Eric Schulte ;; Dan Davison diff --git a/lisp/ob-ref.el b/lisp/ob-ref.el index 6e690ab..95eb114 100644 --- a/lisp/ob-ref.el +++ b/lisp/ob-ref.el @@ -1,6 +1,6 @@ ;;; ob-ref.el --- org-babel functions for referencing external data -;; Copyright (C) 2009-2015 Free Software Foundation, Inc. +;; Copyright (C) 2009-2016 Free Software Foundation, Inc. ;; Authors: Eric Schulte ;; Dan Davison diff --git a/lisp/ob-ruby.el b/lisp/ob-ruby.el index 780b7bc..0cc665d 100644 --- a/lisp/ob-ruby.el +++ b/lisp/ob-ruby.el @@ -1,6 +1,6 @@ ;;; ob-ruby.el --- org-babel functions for ruby evaluation -;; Copyright (C) 2009-2015 Free Software Foundation, Inc. +;; Copyright (C) 2009-2016 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-sass.el b/lisp/ob-sass.el index a39248d..f675914 100644 --- a/lisp/ob-sass.el +++ b/lisp/ob-sass.el @@ -1,6 +1,6 @@ ;;; ob-sass.el --- org-babel functions for the sass css generation language -;; Copyright (C) 2009-2015 Free Software Foundation, Inc. +;; Copyright (C) 2009-2016 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-scala.el b/lisp/ob-scala.el index dfb72dd..7df8da8 100644 --- a/lisp/ob-scala.el +++ b/lisp/ob-scala.el @@ -1,6 +1,6 @@ ;;; ob-scala.el --- org-babel functions for Scala evaluation -;; Copyright (C) 2012-2015 Free Software Foundation, Inc. +;; Copyright (C) 2012-2016 Free Software Foundation, Inc. ;; Author: Andrzej Lichnerowicz ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-scheme.el b/lisp/ob-scheme.el index 2d7f3e6..0473138 100644 --- a/lisp/ob-scheme.el +++ b/lisp/ob-scheme.el @@ -1,6 +1,6 @@ ;;; ob-scheme.el --- org-babel functions for Scheme -;; Copyright (C) 2010-2015 Free Software Foundation, Inc. +;; Copyright (C) 2010-2016 Free Software Foundation, Inc. ;; Authors: Eric Schulte ;; Michael Gauland diff --git a/lisp/ob-screen.el b/lisp/ob-screen.el index 54ae5e1..db89733 100644 --- a/lisp/ob-screen.el +++ b/lisp/ob-screen.el @@ -1,6 +1,6 @@ ;;; ob-screen.el --- org-babel support for interactive terminal -;; Copyright (C) 2009-2015 Free Software Foundation, Inc. +;; Copyright (C) 2009-2016 Free Software Foundation, Inc. ;; Author: Benjamin Andresen ;; Keywords: literate programming, interactive shell diff --git a/lisp/ob-sed.el b/lisp/ob-sed.el index 9e3db37..f68bb14 100644 --- a/lisp/ob-sed.el +++ b/lisp/ob-sed.el @@ -1,6 +1,6 @@ ;;; ob-sed.el --- org-babel functions for sed scripts -;; Copyright (C) 2015 Free Software Foundation +;; Copyright (C) 2015-2016 Free Software Foundation, Inc. ;; Author: Bjarte Johansen ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-shell.el b/lisp/ob-shell.el index 84f4fa8..527e6f5 100644 --- a/lisp/ob-shell.el +++ b/lisp/ob-shell.el @@ -1,6 +1,6 @@ ;;; ob-shell.el --- org-babel functions for shell evaluation -;; Copyright (C) 2009-2015 Free Software Foundation, Inc. +;; Copyright (C) 2009-2016 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-shen.el b/lisp/ob-shen.el index 190d69b..413fe0d 100644 --- a/lisp/ob-shen.el +++ b/lisp/ob-shen.el @@ -1,6 +1,6 @@ ;;; ob-shen.el --- org-babel functions for Shen -;; Copyright (C) 2010-2015 Free Software Foundation, Inc. +;; Copyright (C) 2010-2016 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research, shen diff --git a/lisp/ob-sql.el b/lisp/ob-sql.el index a039613..f096572 100644 --- a/lisp/ob-sql.el +++ b/lisp/ob-sql.el @@ -1,6 +1,6 @@ ;;; ob-sql.el --- org-babel functions for sql evaluation -;; Copyright (C) 2009-2015 Free Software Foundation, Inc. +;; Copyright (C) 2009-2016 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-sqlite.el b/lisp/ob-sqlite.el index 18d7fc8..705d7ce 100644 --- a/lisp/ob-sqlite.el +++ b/lisp/ob-sqlite.el @@ -1,6 +1,6 @@ ;;; ob-sqlite.el --- org-babel functions for sqlite database interaction -;; Copyright (C) 2010-2015 Free Software Foundation, Inc. +;; Copyright (C) 2010-2016 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-table.el b/lisp/ob-table.el index ec7450e..6e6d7ac 100644 --- a/lisp/ob-table.el +++ b/lisp/ob-table.el @@ -1,6 +1,6 @@ ;;; ob-table.el --- support for calling org-babel functions from tables -;; Copyright (C) 2009-2015 Free Software Foundation, Inc. +;; Copyright (C) 2009-2016 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-tangle.el b/lisp/ob-tangle.el index e9af695..a42dd1d 100644 --- a/lisp/ob-tangle.el +++ b/lisp/ob-tangle.el @@ -29,16 +29,20 @@ (require 'org-src) (declare-function make-directory "files" (dir &optional parents)) +(declare-function org-at-heading-p "org" (&optional ignored)) (declare-function org-babel-update-block-body "org" (new-body)) (declare-function org-back-to-heading "org" (invisible-ok)) (declare-function org-before-first-heading-p "org" ()) (declare-function org-edit-special "org" (&optional arg)) +(declare-function org-element-at-point "org-element" ()) +(declare-function org-element-type "org-element" (element)) (declare-function org-fill-template "org" (template alist)) (declare-function org-heading-components "org" ()) (declare-function org-in-commented-heading-p "org" (&optional no-inheritance)) (declare-function org-link-escape "org" (text &optional table)) (declare-function org-open-link-from-string "org" (s &optional arg reference-buffer)) (declare-function org-store-link "org" (arg)) +(declare-function org-string-nw-p "org" (s)) (declare-function outline-previous-heading "outline" ()) (defvar org-link-types-re) @@ -364,8 +368,9 @@ that the appropriate major-mode is set. SPEC has the form: (if (stringp le) le (format "%S" le))))) '(start-line file link source-name))) (insert-comment (lambda (text) - (when (and comments (not (string= comments "no")) - (> (length text) 0)) + (when (and comments + (not (string= comments "no")) + (org-string-nw-p text)) (if org-babel-tangle-uncomment-comments ;; Plain comments: no processing. (insert text) @@ -545,7 +550,7 @@ which enable the original code blocks to be found." (prog1 counter (message "Detangled %d code blocks" counter))))) (defun org-babel-tangle-jump-to-org () - "Jump from a tangled code file to the related Org-mode file." + "Jump from a tangled code file to the related Org mode file." (interactive) (let ((mid (point)) start body-start end done @@ -554,9 +559,8 @@ which enable the original code blocks to be found." (save-excursion (while (and (re-search-backward org-bracket-link-analytic-regexp nil t) (not ; ever wider searches until matching block comments - (and (setq start (point-at-eol)) - (setq body-start (save-excursion - (forward-line 2) (point-at-bol))) + (and (setq start (line-beginning-position)) + (setq body-start (line-beginning-position 2)) (setq link (match-string 0)) (setq path (match-string 3)) (setq block-name (match-string 5)) @@ -565,29 +569,33 @@ which enable the original code blocks to be found." (re-search-forward (concat " " (regexp-quote block-name) " ends here") nil t) - (setq end (point-at-bol)))))))) + (setq end (line-beginning-position)))))))) (unless (and start (< start mid) (< mid end)) (error "Not in tangled code")) - (setq body (org-babel-trim (buffer-substring start end)))) + (setq body (buffer-substring body-start end))) (when (string-match "::" path) (setq path (substring path 0 (match-beginning 0)))) - (find-file path) (setq target-buffer (current-buffer)) - (goto-char start) (org-open-link-from-string link) + (find-file path) + (setq target-buffer (current-buffer)) + ;; Go to the beginning of the relative block in Org file. + (org-open-link-from-string link) (if (string-match "[^ \t\n\r]:\\([[:digit:]]+\\)" block-name) - (org-babel-next-src-block - (string-to-number (match-string 1 block-name))) + (let ((n (string-to-number (match-string 1 block-name)))) + (if (org-before-first-heading-p) (goto-char (point-min)) + (org-back-to-heading t)) + ;; Do not skip the first block if it begins at point min. + (cond ((or (org-at-heading-p) + (not (eq (org-element-type (org-element-at-point)) + 'src-block))) + (org-babel-next-src-block n)) + ((= n 1)) + (t (org-babel-next-src-block (1- n))))) (org-babel-goto-named-src-block block-name)) - ;; position at the beginning of the code block body (goto-char (org-babel-where-is-src-block-head)) + ;; Preserve location of point within the source code in tangled + ;; code file. (forward-line 1) - ;; Use org-edit-special to isolate the code. - (org-edit-special) - ;; Then move forward the correct number of characters in the - ;; code buffer. (forward-char (- mid body-start)) - ;; And return to the Org-mode buffer with the point in the right - ;; place. - (org-edit-src-exit) (setq target-char (point))) (org-src-switch-to-buffer target-buffer t) (prog1 body (goto-char target-char)))) diff --git a/lisp/ob.el b/lisp/ob.el index 42137c2..cc46693 100644 --- a/lisp/ob.el +++ b/lisp/ob.el @@ -1,6 +1,6 @@ ;;; ob.el --- working with code blocks in org-mode -;; Copyright (C) 2009-2015 Free Software Foundation, Inc. +;; Copyright (C) 2009-2016 Free Software Foundation, Inc. ;; Authors: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 96e15d5..19a4095 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -1,6 +1,6 @@ ;;; org-agenda.el --- Dynamic task and appointment lists for Org -;; Copyright (C) 2004-2015 Free Software Foundation, Inc. +;; Copyright (C) 2004-2016 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp @@ -4615,7 +4615,7 @@ in `org-agenda-text-search-extra-files'." (> (org-reduced-level (org-outline-level)) org-agenda-search-view-max-outline-level) (forward-line -1) - (outline-back-to-heading t))) + (org-back-to-heading t))) (skip-chars-forward "* ") (setq beg (point-at-bol) beg1 (point) @@ -7568,7 +7568,9 @@ to switch between filtering and excluding." (defun org-agenda-filter-by-tag-refine (arg &optional char) "Refine the current filter. See `org-agenda-filter-by-tag'." (interactive "P") - (org-agenda-filter-by-tag arg char 'refine)) + (org-agenda-filter-by-tag arg char)) +(make-obsolete 'org-agenda-filter-by-tag-refine + "use `org-agenda-filter-by-tag' instead." "8.3.4") (defun org-agenda-filter-make-matcher (filter type &optional expand) "Create the form that tests a line for agenda filter. Optional @@ -7705,7 +7707,7 @@ tags in the FILTER if any of the tags in FILTER are grouptags." (progn (setq tags (org-get-at-bol 'tags) cat (org-get-at-eol 'org-category 1) - txt (org-get-at-eol 'txt 1)) + txt (org-get-at-bol 'txt)) (if (not (eval org-agenda-filter-form)) (org-agenda-filter-hide-line type)) (beginning-of-line 2)) diff --git a/lisp/org-archive.el b/lisp/org-archive.el index 170bfd7..4c6a8c3 100644 --- a/lisp/org-archive.el +++ b/lisp/org-archive.el @@ -1,6 +1,6 @@ ;;; org-archive.el --- Archiving for Org-mode -;; Copyright (C) 2004-2015 Free Software Foundation, Inc. +;; Copyright (C) 2004-2016 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp @@ -565,7 +565,7 @@ the children that do not contain any open TODO items." (save-excursion (org-back-to-heading t) (setq set (org-toggle-tag org-archive-tag)) - (when set (outline-hide-subtree))) + (when set (org-flag-subtree t))) (and set (beginning-of-line 1)) (message "Subtree %s" (if set "archived" "unarchived")))))) diff --git a/lisp/org-attach.el b/lisp/org-attach.el index fb4c385..e237b2c 100644 --- a/lisp/org-attach.el +++ b/lisp/org-attach.el @@ -1,6 +1,6 @@ ;;; org-attach.el --- Manage file attachments to org-mode tasks -;; Copyright (C) 2008-2015 Free Software Foundation, Inc. +;; Copyright (C) 2008-2016 Free Software Foundation, Inc. ;; Author: John Wiegley ;; Keywords: org data task diff --git a/lisp/org-bbdb.el b/lisp/org-bbdb.el index c489385..aeee35f 100644 --- a/lisp/org-bbdb.el +++ b/lisp/org-bbdb.el @@ -1,6 +1,6 @@ ;;; org-bbdb.el --- Support for links to BBDB entries from within Org-mode -;; Copyright (C) 2004-2015 Free Software Foundation, Inc. +;; Copyright (C) 2004-2016 Free Software Foundation, Inc. ;; Authors: Carsten Dominik ;; Thomas Baumann diff --git a/lisp/org-bibtex.el b/lisp/org-bibtex.el index 4622702..a1cd8b0 100644 --- a/lisp/org-bibtex.el +++ b/lisp/org-bibtex.el @@ -1,6 +1,6 @@ ;;; org-bibtex.el --- Org links to BibTeX entries ;; -;; Copyright (C) 2007-2015 Free Software Foundation, Inc. +;; Copyright (C) 2007-2016 Free Software Foundation, Inc. ;; ;; Authors: Bastien Guerry ;; Carsten Dominik @@ -549,14 +549,16 @@ With optional argument OPTIONAL, also prompt for optional fields." ;;; Bibtex <-> Org-mode headline translation functions -(defun org-bibtex (&optional filename) +(defun org-bibtex (filename) "Export each headline in the current file to a bibtex entry. Headlines are exported using `org-bibtex-headline'." (interactive (list (read-file-name "Bibtex file: " nil nil nil - (file-name-nondirectory - (concat (file-name-sans-extension (buffer-file-name)) ".bib"))))) + (let ((file (buffer-file-name (buffer-base-buffer)))) + (and file + (file-name-nondirectory + (concat (file-name-sans-extension file) ".bib"))))))) (let ((error-point (catch 'bib (let ((bibtex-entries diff --git a/lisp/org-capture.el b/lisp/org-capture.el index 58b578b..5052ad8 100644 --- a/lisp/org-capture.el +++ b/lisp/org-capture.el @@ -1,6 +1,6 @@ ;;; org-capture.el --- Fast note taking in Org-mode -;; Copyright (C) 2010-2015 Free Software Foundation, Inc. +;; Copyright (C) 2010-2016 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp @@ -124,7 +124,8 @@ target Specification of where the captured item should be placed. Most target specifications contain a file name. If that file name is the empty string, it defaults to `org-default-notes-file'. A file can also be given as a variable, function, or Emacs Lisp - form. + form. When an absolute path is not specified for a + target, it is taken as relative to `org-directory'. Valid values are: diff --git a/lisp/org-clock.el b/lisp/org-clock.el index f6ca89d..143f749 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -1,6 +1,6 @@ ;;; org-clock.el --- The time clocking code for Org-mode -;; Copyright (C) 2004-2015 Free Software Foundation, Inc. +;; Copyright (C) 2004-2016 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp @@ -875,7 +875,7 @@ This macro also protects the current active clock from being altered." (org-clock-effort) (org-clock-marker (car ,clock)) (org-clock-hd-marker (save-excursion - (outline-back-to-heading t) + (org-back-to-heading t) (point-marker)))) ,@forms))) (def-edebug-spec org-with-clock (form body)) @@ -960,7 +960,7 @@ If necessary, clock-out of the currently active clock." (org-with-wide-buffer (let ((drawer-re (format "^[ \t]*:%s:[ \t]*$" (regexp-quote (if (stringp drawer) drawer "LOGBOOK")))) - (beg (save-excursion (outline-back-to-heading t) (point)))) + (beg (save-excursion (org-back-to-heading t) (point)))) (catch 'exit (while (re-search-backward drawer-re beg t) (let ((element (org-element-at-point))) @@ -2031,7 +2031,7 @@ fontified, and then returned." (org-mode) (org-create-dblock props) (org-update-dblock) - (font-lock-ensure) + (org-font-lock-ensure) (forward-line 2) (buffer-substring (point) (progn (re-search-forward "^[ \t]*#\\+END" nil t) @@ -2646,12 +2646,14 @@ from the dynamic block definition." ((eq formula '%) ;; compute the column where the % numbers need to go (setq pcol (+ 2 + (length properties) (if multifile 1 0) (if level-p 1 0) (if timestamp 1 0) (min maxlevel (or ntcol 100)))) ;; compute the column where the total time is (setq tcol (+ 2 + (length properties) (if multifile 1 0) (if level-p 1 0) (if timestamp 1 0))) diff --git a/lisp/org-colview.el b/lisp/org-colview.el index 359c46a..eade725 100644 --- a/lisp/org-colview.el +++ b/lisp/org-colview.el @@ -1,6 +1,6 @@ ;;; org-colview.el --- Column View in Org-mode -;; Copyright (C) 2004-2015 Free Software Foundation, Inc. +;; Copyright (C) 2004-2016 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp @@ -607,7 +607,7 @@ an integer, select that value." (t (setq nval (car allowed))))) (cond ((equal major-mode 'org-agenda-mode) - (org-columns-eval '(org-entry-put pom key nval)) + (org-columns-eval `(org-entry-put ,pom ,key ,nval)) ;; The following let preserves the current format, and makes sure ;; that in only a single file things need to be updated. (let* ((org-agenda-overriding-columns-format org-columns-current-fmt) @@ -618,13 +618,13 @@ an integer, select that value." (org-agenda-columns))) (t (let ((inhibit-read-only t)) - (remove-text-properties (1- bol) eol '(read-only t)) + (remove-text-properties (max (1- bol) (point-min)) eol '(read-only t)) (unwind-protect (progn (setq org-columns-overlays (org-delete-all line-overlays org-columns-overlays)) (mapc 'delete-overlay line-overlays) - (org-columns-eval '(org-entry-put pom key nval))) + (org-columns-eval `(org-entry-put ,pom ,key ,nval))) (org-columns-display-here))) (org-move-to-column col) (and (nth 3 (assoc-string key org-columns-current-fmt-compiled t)) diff --git a/lisp/org-compat.el b/lisp/org-compat.el index e7518d8..70e4573 100644 --- a/lisp/org-compat.el +++ b/lisp/org-compat.el @@ -1,6 +1,6 @@ ;;; org-compat.el --- Compatibility code for Org-mode -;; Copyright (C) 2004-2015 Free Software Foundation, Inc. +;; Copyright (C) 2004-2016 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp @@ -333,7 +333,9 @@ Works on both Emacs and XEmacs." Pass COLUMN and FORCE to `move-to-column'. Pass BUFFER to the XEmacs version of `move-to-column'." (let ((buffer-invisibility-spec - (remove '(org-filtered) buffer-invisibility-spec))) + (if (listp buffer-invisibility-spec) + (remove '(org-filtered) buffer-invisibility-spec) + buffer-invisibility-spec))) (if (featurep 'xemacs) (org-xemacs-without-invisibility (move-to-column column force buffer)) @@ -409,8 +411,10 @@ Pass BUFFER to the XEmacs version of `move-to-column'." (defalias 'format-message 'format)) ;; `font-lock-ensure' is only available from 24.4.50 on -(unless (fboundp 'font-lock-ensure) - (defalias 'font-lock-ensure 'font-lock-fontify-buffer)) +(defalias 'org-font-lock-ensure + (if (fboundp 'font-lock-ensure) + #'font-lock-ensure + (lambda (&optional _beg _end) (font-lock-fontify-buffer)))) (defmacro org-no-popups (&rest body) "Suppress popup windows. diff --git a/lisp/org-crypt.el b/lisp/org-crypt.el index abe9f3c..d41e80a 100644 --- a/lisp/org-crypt.el +++ b/lisp/org-crypt.el @@ -1,6 +1,6 @@ ;;; org-crypt.el --- Public key encryption for org-mode entries -;; Copyright (C) 2007-2015 Free Software Foundation, Inc. +;; Copyright (C) 2007-2016 Free Software Foundation, Inc. ;; Emacs Lisp Archive Entry ;; Filename: org-crypt.el @@ -225,7 +225,7 @@ See `org-crypt-disable-auto-save'." ;; outline property starts at the \n of the heading. (delete-region (1- (point)) end) ;; Store a checksum of the decrypted and the encrypted - ;; text value. This allow to reuse the same encrypted text + ;; text value. This allows reusing the same encrypted text ;; if the text does not change, and therefore avoid a ;; re-encryption process. (insert "\n" (propertize decrypted-text diff --git a/lisp/org-ctags.el b/lisp/org-ctags.el index e5435e3..ea4f52b 100644 --- a/lisp/org-ctags.el +++ b/lisp/org-ctags.el @@ -1,6 +1,6 @@ ;;; org-ctags.el - Integrate Emacs "tags" facility with org mode. ;; -;; Copyright (C) 2007-2015 Free Software Foundation, Inc. +;; Copyright (C) 2007-2016 Free Software Foundation, Inc. ;; Author: Paul Sexton diff --git a/lisp/org-datetree.el b/lisp/org-datetree.el index a97a9d0..999bc24 100644 --- a/lisp/org-datetree.el +++ b/lisp/org-datetree.el @@ -1,6 +1,6 @@ ;;; org-datetree.el --- Create date entries in a tree -;; Copyright (C) 2009-2015 Free Software Foundation, Inc. +;; Copyright (C) 2009-2016 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org-docview.el b/lisp/org-docview.el index e3bf5fd..d2a9525 100644 --- a/lisp/org-docview.el +++ b/lisp/org-docview.el @@ -1,6 +1,6 @@ ;;; org-docview.el --- support for links to doc-view-mode buffers -;; Copyright (C) 2009-2015 Free Software Foundation, Inc. +;; Copyright (C) 2009-2016 Free Software Foundation, Inc. ;; Author: Jan Böcker ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org-element.el b/lisp/org-element.el index 911e4e1..2576c3f 100644 --- a/lisp/org-element.el +++ b/lisp/org-element.el @@ -1,6 +1,6 @@ ;;; org-element.el --- Parser And Applications for Org syntax -;; Copyright (C) 2012-2015 Free Software Foundation, Inc. +;; Copyright (C) 2012-2016 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou ;; Keywords: outlines, hypermedia, calendar, wp @@ -415,9 +415,9 @@ Other brackets are treated as spaces.") ;; Provide four accessors: `org-element-type', `org-element-property' ;; `org-element-contents' and `org-element-restriction'. ;; -;; Setter functions allow to modify elements by side effect. There is -;; `org-element-put-property', `org-element-set-contents'. These -;; low-level functions are useful to build a parse tree. +;; Setter functions allow modification of elements by side effect. +;; There is `org-element-put-property', `org-element-set-contents'. +;; These low-level functions are useful to build a parse tree. ;; ;; `org-element-adopt-element', `org-element-set-element', ;; `org-element-extract-element' and `org-element-insert-before' are @@ -625,7 +625,7 @@ is cleared and contents are removed in the process." ;; cannot contain other greater elements of their own type. ;; ;; Beside implementing a parser and an interpreter, adding a new -;; greater element requires to tweak `org-element--current-element'. +;; greater element requires tweaking `org-element--current-element'. ;; Moreover, the newly defined type must be added to both ;; `org-element-all-elements' and `org-element-greater-elements'. @@ -796,6 +796,12 @@ CONTENTS is the contents of the element." ;;;; Footnote Definition +(defconst org-element--footnote-separator + (concat org-outline-regexp-bol "\\|" + org-footnote-definition-re "\\|" + "^\\([ \t]*\n\\)\\{2,\\}") + "Regexp used as a footnote definition separator.") + (defun org-element-footnote-definition-parser (limit affiliated) "Parse a footnote definition. @@ -814,21 +820,29 @@ Assume point is at the beginning of the footnote definition." (org-match-string-no-properties 1))) (begin (car affiliated)) (post-affiliated (point)) - (ending (save-excursion - (if (progn - (end-of-line) - (re-search-forward - (concat org-outline-regexp-bol "\\|" - org-footnote-definition-re "\\|" - "^\\([ \t]*\n\\)\\{2,\\}") limit 'move)) - (match-beginning 0) - (point)))) - (contents-begin (progn - (search-forward "]") - (skip-chars-forward " \r\t\n" ending) - (cond ((= (point) ending) nil) - ((= (line-beginning-position) begin) (point)) - (t (line-beginning-position))))) + (ending + (save-excursion + (end-of-line) + (cond + ((not + (re-search-forward org-element--footnote-separator limit t)) + limit) + ((eq (char-after (match-beginning 0)) ?\[) + ;; At a new footnote definition, make sure we end + ;; before any affiliated keyword above. + (forward-line -1) + (while (and (> (point) post-affiliated) + (org-looking-at-p org-element--affiliated-re)) + (forward-line -1)) + (line-beginning-position 2)) + (t (match-beginning 0))))) + (contents-begin + (progn + (search-forward "]") + (skip-chars-forward " \r\t\n" ending) + (cond ((= (point) ending) nil) + ((= (line-beginning-position) post-affiliated) (point)) + (t (line-beginning-position))))) (contents-end (and contents-begin ending)) (end (progn (goto-char ending) (skip-chars-forward " \r\t\n" limit) @@ -3919,8 +3933,8 @@ position of point and CDR is nil." ;; `org-element-parse-secondary-string', which parses objects within ;; a given string. ;; -;; The (almost) almighty `org-element-map' allows to apply a function -;; on elements or objects matching some type, and accumulate the +;; The (almost) almighty `org-element-map' allows applying a function +;; on elements or objects matching some type, and accumulating the ;; resulting values. In an export situation, it also skips unneeded ;; parts of the parse tree. @@ -4906,7 +4920,7 @@ This function assumes `org-element--cache' is a valid AVL tree." "Non-nil when cache is active in current buffer." (and org-element-use-cache org-element--cache - (or (derived-mode-p 'org-mode) orgstruct-mode))) + (derived-mode-p 'org-mode))) (defun org-element--cache-find (pos &optional side) "Find element in cache starting at POS or before. @@ -5618,8 +5632,7 @@ buffers." (interactive "P") (dolist (buffer (if all (buffer-list) (list (current-buffer)))) (with-current-buffer buffer - (when (and org-element-use-cache - (or (derived-mode-p 'org-mode) orgstruct-mode)) + (when (and org-element-use-cache (derived-mode-p 'org-mode)) (org-set-local 'org-element--cache (avl-tree-create #'org-element--cache-compare)) (org-set-local 'org-element--cache-objects (make-hash-table :test #'eq)) @@ -5722,15 +5735,15 @@ Providing it allows for quicker computation." (org-with-wide-buffer (let* ((pos (point)) (element (or element (org-element-at-point))) - (type (org-element-type element))) + (type (org-element-type element)) + (post (org-element-property :post-affiliated element))) ;; If point is inside an element containing objects or ;; a secondary string, narrow buffer to the container and ;; proceed with parsing. Otherwise, return ELEMENT. (cond ;; At a parsed affiliated keyword, check if we're inside main ;; or dual value. - ((let ((post (org-element-property :post-affiliated element))) - (and post (< pos post))) + ((and post (< pos post)) (beginning-of-line) (let ((case-fold-search t)) (looking-at org-element--affiliated-re)) (cond @@ -5749,7 +5762,8 @@ Providing it allows for quicker computation." ;; At an item, objects can only be located within tag, if any. ((eq type 'item) (let ((tag (org-element-property :tag element))) - (if (not tag) (throw 'objects-forbidden element) + (if (or (not tag) (/= (line-beginning-position) post)) + (throw 'objects-forbidden element) (beginning-of-line) (search-forward tag (line-end-position)) (goto-char (match-beginning 0)) @@ -5759,10 +5773,14 @@ Providing it allows for quicker computation." ;; At an headline or inlinetask, objects are in title. ((memq type '(headline inlinetask)) (goto-char (org-element-property :begin element)) - (skip-chars-forward "*") - (if (and (> pos (point)) (< pos (line-end-position))) - (narrow-to-region (point) (line-end-position)) - (throw 'objects-forbidden element))) + (looking-at org-complex-heading-regexp) + (let ((end (match-end 4))) + (if (not end) (throw 'objects-forbidden element) + (goto-char (match-beginning 4)) + (when (let (case-fold-search) (looking-at org-comment-string)) + (goto-char (match-end 0))) + (if (>= (point) end) (throw 'objects-forbidden element) + (narrow-to-region (point) end))))) ;; At a paragraph, a table-row or a verse block, objects are ;; located within their contents. ((memq type '(paragraph table-row verse-block)) diff --git a/lisp/org-entities.el b/lisp/org-entities.el index 112088d..89c5962 100644 --- a/lisp/org-entities.el +++ b/lisp/org-entities.el @@ -1,6 +1,6 @@ ;;; org-entities.el --- Support for special entities in Org-mode -;; Copyright (C) 2010-2015 Free Software Foundation, Inc. +;; Copyright (C) 2010-2016 Free Software Foundation, Inc. ;; Author: Carsten Dominik , ;; Ulf Stegemann diff --git a/lisp/org-eshell.el b/lisp/org-eshell.el index 115b333..9c1c4a1 100644 --- a/lisp/org-eshell.el +++ b/lisp/org-eshell.el @@ -1,6 +1,6 @@ ;;; org-eshell.el - Support for links to working directories in eshell -;; Copyright (C) 2011-2015 Free Software Foundation, Inc. +;; Copyright (C) 2011-2016 Free Software Foundation, Inc. ;; Author: Konrad Hinsen diff --git a/lisp/org-faces.el b/lisp/org-faces.el index 0a1ce1d..941a604 100644 --- a/lisp/org-faces.el +++ b/lisp/org-faces.el @@ -1,6 +1,6 @@ ;;; org-faces.el --- Face definitions for Org-mode. -;; Copyright (C) 2004-2015 Free Software Foundation, Inc. +;; Copyright (C) 2004-2016 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org-feed.el b/lisp/org-feed.el index f637bfd..0600f63 100644 --- a/lisp/org-feed.el +++ b/lisp/org-feed.el @@ -1,6 +1,6 @@ ;;; org-feed.el --- Add RSS feed items to Org files ;; -;; Copyright (C) 2009-2015 Free Software Foundation, Inc. +;; Copyright (C) 2009-2016 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp @@ -24,7 +24,7 @@ ;; ;;; Commentary: ;; -;; This module allows to create and change entries in an Org-mode +;; This module allows entries to be created and changed in an Org-mode ;; file triggered by items in an RSS feed. The basic functionality is ;; geared toward simply adding new items found in a feed as outline nodes ;; to an Org file. Using hooks, arbitrary actions can be triggered for diff --git a/lisp/org-footnote.el b/lisp/org-footnote.el index 7fd55d9..800b5df 100644 --- a/lisp/org-footnote.el +++ b/lisp/org-footnote.el @@ -1,6 +1,6 @@ ;;; org-footnote.el --- Footnote support in Org and elsewhere ;; -;; Copyright (C) 2009-2015 Free Software Foundation, Inc. +;; Copyright (C) 2009-2016 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org-gnus.el b/lisp/org-gnus.el index c7b46af..a574c0f 100644 --- a/lisp/org-gnus.el +++ b/lisp/org-gnus.el @@ -1,6 +1,6 @@ ;;; org-gnus.el --- Support for links to Gnus groups and messages from within Org-mode -;; Copyright (C) 2004-2015 Free Software Foundation, Inc. +;; Copyright (C) 2004-2016 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Tassilo Horn diff --git a/lisp/org-habit.el b/lisp/org-habit.el index 69d1912..25bc160 100644 --- a/lisp/org-habit.el +++ b/lisp/org-habit.el @@ -1,6 +1,6 @@ ;;; org-habit.el --- The habit tracking code for Org-mode -;; Copyright (C) 2009-2015 Free Software Foundation, Inc. +;; Copyright (C) 2009-2016 Free Software Foundation, Inc. ;; Author: John Wiegley ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org-id.el b/lisp/org-id.el index f86ef22..107ac39 100644 --- a/lisp/org-id.el +++ b/lisp/org-id.el @@ -1,6 +1,6 @@ ;;; org-id.el --- Global identifiers for Org-mode entries ;; -;; Copyright (C) 2008-2015 Free Software Foundation, Inc. +;; Copyright (C) 2008-2016 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org-info.el b/lisp/org-info.el index b9f7ba0..270c19f 100644 --- a/lisp/org-info.el +++ b/lisp/org-info.el @@ -1,6 +1,6 @@ ;;; org-info.el --- Support for links to Info nodes from within Org-Mode -;; Copyright (C) 2004-2015 Free Software Foundation, Inc. +;; Copyright (C) 2004-2016 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org-inlinetask.el b/lisp/org-inlinetask.el index 7e15b44..26d2e3d 100644 --- a/lisp/org-inlinetask.el +++ b/lisp/org-inlinetask.el @@ -1,6 +1,6 @@ ;;; org-inlinetask.el --- Tasks independent of outline hierarchy -;; Copyright (C) 2009-2015 Free Software Foundation, Inc. +;; Copyright (C) 2009-2016 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org-irc.el b/lisp/org-irc.el index 1ec69d8..333c4b1 100644 --- a/lisp/org-irc.el +++ b/lisp/org-irc.el @@ -1,6 +1,6 @@ ;;; org-irc.el --- Store links to IRC sessions ;; -;; Copyright (C) 2008-2015 Free Software Foundation, Inc. +;; Copyright (C) 2008-2016 Free Software Foundation, Inc. ;; ;; Author: Philip Jackson ;; Keywords: erc, irc, link, org diff --git a/lisp/org-list.el b/lisp/org-list.el index d7369ad..d264451 100644 --- a/lisp/org-list.el +++ b/lisp/org-list.el @@ -1,6 +1,6 @@ ;;; org-list.el --- Plain lists for Org-mode ;; -;; Copyright (C) 2004-2015 Free Software Foundation, Inc. +;; Copyright (C) 2004-2016 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Bastien Guerry diff --git a/lisp/org-loaddefs.el b/lisp/org-loaddefs.el index 1cec7d9..b61eaa3 100644 --- a/lisp/org-loaddefs.el +++ b/lisp/org-loaddefs.el @@ -14,7 +14,7 @@ ;;;;;; org-babel-execute-src-block org-babel-pop-to-session-maybe ;;;;;; org-babel-load-in-session-maybe org-babel-expand-src-block-maybe ;;;;;; org-babel-view-src-block-info org-babel-execute-maybe org-babel-execute-safely-maybe) -;;;;;; "ob-core" "ob-core.el" "941575cd3238be25274d48a658089252") +;;;;;; "ob-core" "ob-core.el" "ee83b8920bd29f8ac10c08e0b4271f48") ;;; Generated autoloads from ob-core.el (autoload 'org-babel-execute-safely-maybe "ob-core" "\ @@ -78,7 +78,7 @@ Expand the current source code block. Expand according to the source code block's header arguments and pop open the results in a preview buffer. -\(fn &optional ARG INFO PARAMS)" t nil) +\(fn &optional _ARG INFO PARAMS)" t nil) (autoload 'org-babel-check-src-block "ob-core" "\ Check for misspelled header arguments in the current code block. @@ -96,7 +96,7 @@ Evaluate the header arguments for the source block before entering the session. After loading the body this pops open the session. -\(fn &optional ARG INFO)" t nil) +\(fn &optional _ARG INFO)" t nil) (autoload 'org-babel-initiate-session "ob-core" "\ Initiate session for current code block. @@ -117,7 +117,7 @@ with a prefix argument then this is passed on to (autoload 'org-babel-switch-to-session-with-code "ob-core" "\ Switch to code buffer and display session. -\(fn &optional ARG INFO)" t nil) +\(fn &optional ARG _INFO)" t nil) (autoload 'org-babel-do-in-edit-buffer "ob-core" "\ Evaluate BODY in edit buffer if there is a code block at point. @@ -235,7 +235,7 @@ Mark current src block. ;;;*** ;;;### (autoloads (org-babel-describe-bindings) "ob-keys" "ob-keys.el" -;;;;;; "120511b104b79537595411024cdbd951") +;;;;;; "24762aeb15b93f86ba40d1649d47134a") ;;; Generated autoloads from ob-keys.el (autoload 'org-babel-describe-bindings "ob-keys" "\ @@ -246,7 +246,7 @@ Describe all keybindings behind `org-babel-key-prefix'. ;;;*** ;;;### (autoloads (org-babel-lob-get-info org-babel-lob-execute-maybe) -;;;;;; "ob-lob" "ob-lob.el" "4c4edc59eb6dd8eafc0568bed1be0cbe") +;;;;;; "ob-lob" "ob-lob.el" "642d1791b061066c54b8ff95e332f856") ;;; Generated autoloads from ob-lob.el (autoload 'org-babel-lob-execute-maybe "ob-lob" "\ @@ -264,7 +264,7 @@ Return a Library of Babel function call as a string. ;;;*** ;;;### (autoloads (org-babel-tangle org-babel-tangle-file) "ob-tangle" -;;;;;; "ob-tangle.el" "bbdbf9322d0ab7e977944af2e50bfa5f") +;;;;;; "ob-tangle.el" "3ba1e4bcd6d4b3c9293130baa1e76017") ;;; Generated autoloads from ob-tangle.el (autoload 'org-babel-tangle-file "ob-tangle" "\ @@ -298,7 +298,7 @@ used to limit the exported source code blocks by language. ;;;;;; org-search-view org-agenda-list org-batch-store-agenda-views ;;;;;; org-store-agenda-views org-batch-agenda-csv org-batch-agenda ;;;;;; org-agenda org-toggle-sticky-agenda) "org-agenda" "org-agenda.el" -;;;;;; (22140 56762)) +;;;;;; (22194 60218)) ;;; Generated autoloads from org-agenda.el (autoload 'org-toggle-sticky-agenda "org-agenda" "\ @@ -574,7 +574,7 @@ to override `appt-message-warning-time'. ;;;### (autoloads (org-archive-subtree-default-with-confirmation ;;;;;; org-archive-subtree-default org-toggle-archive-tag org-archive-to-archive-sibling ;;;;;; org-archive-subtree org-add-archive-files) "org-archive" -;;;;;; "org-archive.el" "ae38f88639f444f347a31cb5637a2fa9") +;;;;;; "org-archive.el" "49615e9b6aa6314b77b090b118280556") ;;; Generated autoloads from org-archive.el (autoload 'org-add-archive-files "org-archive" "\ @@ -629,7 +629,7 @@ This command is set with the variable `org-archive-default-command'. ;;;*** -;;;### (autoloads (org-attach) "org-attach" "org-attach.el" "02c6d147939c83c1311423492e8bbda3") +;;;### (autoloads (org-attach) "org-attach" "org-attach.el" "1e4c1afefe41ea28817861da7ea71ce6") ;;; Generated autoloads from org-attach.el (autoload 'org-attach "org-attach" "\ @@ -641,7 +641,7 @@ Shows a list of commands and prompts for another key to execute a command. ;;;*** ;;;### (autoloads (org-bbdb-anniversaries) "org-bbdb" "org-bbdb.el" -;;;;;; "7b7a2669c8c50375f19fac9b951a3cdc") +;;;;;; "e782f707a5a0d3b8a8fd76825deb4111") ;;; Generated autoloads from org-bbdb.el (autoload 'org-bbdb-anniversaries "org-bbdb" "\ @@ -652,8 +652,8 @@ Extract anniversaries from BBDB for display in the agenda. ;;;*** ;;;### (autoloads (org-capture-import-remember-templates org-capture -;;;;;; org-capture-string) "org-capture" "org-capture.el" (22124 -;;;;;; 4162)) +;;;;;; org-capture-string) "org-capture" "org-capture.el" (22200 +;;;;;; 12002)) ;;; Generated autoloads from org-capture.el (autoload 'org-capture-string "org-capture" "\ @@ -700,7 +700,7 @@ Set `org-capture-templates' to be similar to `org-remember-templates'. ;;;;;; org-clock-remove-overlays org-clock-display org-clock-sum ;;;;;; org-clock-goto org-clock-cancel org-clock-out org-clock-in-last ;;;;;; org-clock-in org-resolve-clocks) "org-clock" "org-clock.el" -;;;;;; "e6d87792d62998c4d6764d868a348c7e") +;;;;;; "133b6d837d46606bf3b4f1753035bca8") ;;; Generated autoloads from org-clock.el (autoload 'org-resolve-clocks "org-clock" "\ @@ -833,7 +833,7 @@ Otherwise, return nil. ;;;### (autoloads (org-agenda-columns org-insert-columns-dblock org-dblock-write:columnview ;;;;;; org-columns-number-to-string org-columns-compute org-columns ;;;;;; org-columns-get-format-and-top-level org-columns-remove-overlays) -;;;;;; "org-colview" "org-colview.el" (22124 4162)) +;;;;;; "org-colview" "org-colview.el" (22176 30266)) ;;; Generated autoloads from org-colview.el (autoload 'org-columns-remove-overlays "org-colview" "\ @@ -897,7 +897,7 @@ Turn on or update column view in the agenda. ;;;*** ;;;### (autoloads (org-check-version) "org-compat" "org-compat.el" -;;;;;; (22124 4162)) +;;;;;; (22193 39354)) ;;; Generated autoloads from org-compat.el (autoload 'org-check-version "org-compat" "\ @@ -908,7 +908,7 @@ Try very hard to provide sensible version strings. ;;;*** ;;;### (autoloads (org-datetree-find-date-create) "org-datetree" -;;;;;; "org-datetree.el" "f59e07b5e58409e8f540661bb1de0721") +;;;;;; "org-datetree.el" "b568067e20b64b5dcfc50d0fe986fb9f") ;;; Generated autoloads from org-datetree.el (autoload 'org-datetree-find-date-create "org-datetree" "\ @@ -923,7 +923,7 @@ tree can be found. ;;;### (autoloads (org-element-context org-element-at-point org-element-cache-refresh ;;;;;; org-element-cache-reset org-element-interpret-data org-element-update-syntax) -;;;;;; "org-element" "org-element.el" "3e4331afb6c8cf1861c9a10de419bf72") +;;;;;; "org-element" "org-element.el" "54a3a77d31b0c99c7ce9827c94b05491") ;;; Generated autoloads from org-element.el (autoload 'org-element-update-syntax "org-element" "\ @@ -996,7 +996,7 @@ Providing it allows for quicker computation. ;;;*** ;;;### (autoloads (org-feed-show-raw-feed org-feed-goto-inbox org-feed-update -;;;;;; org-feed-update-all) "org-feed" "org-feed.el" "56102e4de09ad6277cb8df0263dd7720") +;;;;;; org-feed-update-all) "org-feed" "org-feed.el" "d0f9ed4388a963a1ef1623799a68a0f0") ;;; Generated autoloads from org-feed.el (autoload 'org-feed-update-all "org-feed" "\ @@ -1024,7 +1024,7 @@ Show the raw feed buffer of a feed. ;;;*** ;;;### (autoloads (org-footnote-normalize org-footnote-action) "org-footnote" -;;;;;; "org-footnote.el" "07722d60ada7fa7913881b21d915d854") +;;;;;; "org-footnote.el" "9ceecddca334b14eed8100670d00bb8f") ;;; Generated autoloads from org-footnote.el (autoload 'org-footnote-action "org-footnote" "\ @@ -1059,7 +1059,7 @@ referenced sequence. ;;;### (autoloads (org-id-store-link org-id-find-id-file org-id-update-id-locations ;;;;;; org-id-new org-id-find org-id-goto org-id-get-with-outline-drilling ;;;;;; org-id-get-with-outline-path-completion org-id-get org-id-copy -;;;;;; org-id-get-create) "org-id" "org-id.el" "ac9eb6c84780e6492017c2d7326f3801") +;;;;;; org-id-get-create) "org-id" "org-id.el" "aa9a9a641f5d77fb14a6ac89b1831168") ;;; Generated autoloads from org-id.el (autoload 'org-id-get-create "org-id" "\ @@ -1170,7 +1170,7 @@ during idle time. ;;;*** -;;;### (autoloads (org-irc-store-link) "org-irc" "org-irc.el" "e6ac5be44b417efe7e54a291ea8eb7a8") +;;;### (autoloads (org-irc-store-link) "org-irc" "org-irc.el" "844cf138fe188afd472820c355b395ae") ;;; Generated autoloads from org-irc.el (autoload 'org-irc-store-link "org-irc" "\ @@ -1197,7 +1197,7 @@ ARG can also be a list of checker names, as symbols, to run. ;;;*** ;;;### (autoloads (org-load-noerror-mustsuffix) "org-macs" "org-macs.el" -;;;;;; (22124 4162)) +;;;;;; (22161 62906)) ;;; Generated autoloads from org-macs.el (autoload 'org-load-noerror-mustsuffix "org-macs" "\ @@ -1208,7 +1208,7 @@ Load FILE with optional arguments NOERROR and MUSTSUFFIX. Drop the MUSTSUFFIX a ;;;*** ;;;### (autoloads (org-mobile-pull org-mobile-push) "org-mobile" -;;;;;; "org-mobile.el" "fa167263b2f8f3a5352fc25dbe49b69b") +;;;;;; "org-mobile.el" "6fe291f3ef3fff1fbde9b1ec117c2d2a") ;;; Generated autoloads from org-mobile.el (autoload 'org-mobile-push "org-mobile" "\ @@ -1227,7 +1227,7 @@ agenda view showing the flagged items. ;;;*** -;;;### (autoloads (org-plot/gnuplot) "org-plot" "org-plot.el" "f96ae5dc9400f35859c4d0c001fa4d74") +;;;### (autoloads (org-plot/gnuplot) "org-plot" "org-plot.el" "e480cdf4e7d3e91e180354e60f40dd55") ;;; Generated autoloads from org-plot.el (autoload 'org-plot/gnuplot "org-plot" "\ @@ -1260,7 +1260,7 @@ line directly before or after the table. ;;;;;; org-table-begin org-table-align org-table-export org-table-import ;;;;;; org-table-convert-region org-table-create org-table-create-or-convert-from-region ;;;;;; org-table-create-with-table\.el) "org-table" "org-table.el" -;;;;;; "537e73768bb60b868fd2c10a3a780d73") +;;;;;; "e9359ea5b998c77257caa9b21313bf8a") ;;; Generated autoloads from org-table.el (autoload 'org-table-create-with-table\.el "org-table" "\ @@ -1603,8 +1603,11 @@ If NLAST is a number, only the NLAST fields will actually be summed. (autoload 'org-table-get-stored-formulas "org-table" "\ Return an alist with the stored formulas directly after current table. +By default, only return active formulas, i.e., formulas located +on the first line after the table. However, if optional argument +LOCATION is a buffer position, consider the formulas there. -\(fn &optional NOERROR)" nil nil) +\(fn &optional NOERROR LOCATION)" nil nil) (autoload 'org-table-maybe-eval-formula "org-table" "\ Check if the current field starts with \"=\" or \":=\". @@ -1937,7 +1940,7 @@ characters width of the plot. ASK may also be the ;;;*** ;;;### (autoloads (org-timer-set-timer org-timer-item org-timer-change-times-in-region -;;;;;; org-timer org-timer-start) "org-timer" "org-timer.el" "c2c017e6e415e473788ee20d76f930de") +;;;;;; org-timer org-timer-start) "org-timer" "org-timer.el" "96624173cc52bc1945ce7cb5940a7d2b") ;;; Generated autoloads from org-timer.el (autoload 'org-timer-start "org-timer" "\ @@ -2002,7 +2005,7 @@ using three `C-u' prefix arguments. ;;;*** ;;;### (autoloads (org-git-version org-release) "org-version" "org-version.el" -;;;;;; (22159 58592)) +;;;;;; (22219 35318)) ;;; Generated autoloads from org-version.el (autoload 'org-release "org-version" "\ @@ -2028,7 +2031,7 @@ The location of ODT styles.") ;;;;;; org-run-like-in-org-mode turn-on-orgstruct++ turn-on-orgstruct ;;;;;; orgstruct-mode org-global-cycle org-cycle org-mode org-clock-persistence-insinuate ;;;;;; turn-on-orgtbl org-version org-babel-load-file org-babel-do-load-languages) -;;;;;; "org" "org.el" (22158 315)) +;;;;;; "org" "org.el" (22219 35205)) ;;; Generated autoloads from org.el (autoload 'org-babel-do-load-languages "org" "\ @@ -2251,7 +2254,7 @@ Call the customize function with org as argument. ;;;### (autoloads (org-ascii-publish-to-utf8 org-ascii-publish-to-latin1 ;;;;;; org-ascii-publish-to-ascii org-ascii-export-to-ascii org-ascii-export-as-ascii) -;;;;;; "ox-ascii" "ox-ascii.el" "2c695b9d7d3e1e38409399fd2bb9051a") +;;;;;; "ox-ascii" "ox-ascii.el" "8b996711b8e315a0dd406d54c0854eaa") ;;; Generated autoloads from ox-ascii.el (autoload 'org-ascii-export-as-ascii "ox-ascii" "\ @@ -2354,7 +2357,7 @@ Return output file name. ;;;### (autoloads (org-beamer-publish-to-pdf org-beamer-publish-to-latex ;;;;;; org-beamer-select-environment org-beamer-export-to-pdf org-beamer-export-to-latex ;;;;;; org-beamer-export-as-latex org-beamer-mode) "ox-beamer" "ox-beamer.el" -;;;;;; "5b748cdd893990814ca747054ba4e08a") +;;;;;; "794938d6b0ee97f126e6c5d6330eeaff") ;;; Generated autoloads from ox-beamer.el (autoload 'org-beamer-mode "ox-beamer" "\ @@ -2491,7 +2494,7 @@ Return output file name. ;;;### (autoloads (org-html-publish-to-html org-html-export-to-html ;;;;;; org-html-convert-region-to-html org-html-export-as-html org-html-htmlize-generate-css) -;;;;;; "ox-html" "ox-html.el" "998bdaa7a35400df0fe9f3c72fbf9ecc") +;;;;;; "ox-html" "ox-html.el" "8a71c624b1d1c388ab0adfe0baf74040") ;;; Generated autoloads from ox-html.el (put 'org-html-head-include-default-style 'safe-local-variable 'booleanp) @@ -2599,7 +2602,7 @@ Return output file name. ;;;### (autoloads (org-icalendar-combine-agenda-files org-icalendar-export-agenda-files ;;;;;; org-icalendar-export-to-ics) "ox-icalendar" "ox-icalendar.el" -;;;;;; "2afaa2d0048aa2b617cf5801a7f189f8") +;;;;;; "0420c450f1da4a87e24a8afbc23f75f3") ;;; Generated autoloads from ox-icalendar.el (autoload 'org-icalendar-export-to-ics "ox-icalendar" "\ @@ -2651,7 +2654,7 @@ The file is stored under the name chosen in ;;;### (autoloads (org-latex-publish-to-pdf org-latex-publish-to-latex ;;;;;; org-latex-export-to-pdf org-latex-export-to-latex org-latex-convert-region-to-latex -;;;;;; org-latex-export-as-latex) "ox-latex" "ox-latex.el" "5f41129e2e6ee18dbec2dd8cfb4e2d05") +;;;;;; org-latex-export-as-latex) "ox-latex" "ox-latex.el" "d27ca15eea14bcf3173e74f51b3d3e69") ;;; Generated autoloads from ox-latex.el (autoload 'org-latex-export-as-latex "ox-latex" "\ @@ -2778,7 +2781,7 @@ Return output file name. ;;;### (autoloads (org-md-publish-to-md org-md-export-to-markdown ;;;;;; org-md-convert-region-to-md org-md-export-as-markdown) "ox-md" -;;;;;; "ox-md.el" "448de11a6a5c4e6b6ed29146698b78d4") +;;;;;; "ox-md.el" "875c98308c9f63cd880c47ae90b2fb91") ;;; Generated autoloads from ox-md.el (autoload 'org-md-export-as-markdown "ox-md" "\ @@ -2851,7 +2854,7 @@ Return output file name. ;;;*** ;;;### (autoloads (org-odt-convert org-odt-export-to-odt org-odt-export-as-odf-and-open -;;;;;; org-odt-export-as-odf) "ox-odt" "ox-odt.el" "d3e8e12b388f84ec7e74e8e63a7c057a") +;;;;;; org-odt-export-as-odf) "ox-odt" "ox-odt.el" "e3a936f4f3bbe947f4d4b75ce359538f") ;;; Generated autoloads from ox-odt.el (put 'org-odt-preferred-output-format 'safe-local-variable 'stringp) @@ -2914,7 +2917,7 @@ using `org-open-file'. ;;;*** ;;;### (autoloads (org-org-publish-to-org org-org-export-to-org org-org-export-as-org) -;;;;;; "ox-org" "ox-org.el" "c9cccd49abced6f7ad4cc70d76d67f6e") +;;;;;; "ox-org" "ox-org.el" "8f2b09ccf51699abf1204d296e93a399") ;;; Generated autoloads from ox-org.el (autoload 'org-org-export-as-org "ox-org" "\ @@ -2994,7 +2997,7 @@ Return output file name. ;;;### (autoloads (org-publish-current-project org-publish-current-file ;;;;;; org-publish-all org-publish) "ox-publish" "ox-publish.el" -;;;;;; "fdfce4591b6fa2152faae1cba2401706") +;;;;;; "a6e792ca3583d341a674e11cecfdd6e9") ;;; Generated autoloads from ox-publish.el (defalias 'org-publish-project 'org-publish) @@ -3038,7 +3041,7 @@ the project. ;;;*** ;;;### (autoloads (org-texinfo-convert-region-to-texinfo org-texinfo-publish-to-texinfo) -;;;;;; "ox-texinfo" "ox-texinfo.el" "9c7a7460ca076741bad9862293c76e4e") +;;;;;; "ox-texinfo" "ox-texinfo.el" "78e9355de19d5650647109cc50825a58") ;;; Generated autoloads from ox-texinfo.el (autoload 'org-texinfo-publish-to-texinfo "ox-texinfo" "\ @@ -3064,7 +3067,7 @@ this command to convert it. ;;;### (autoloads (org-export-dispatch org-export-to-file org-export-to-buffer ;;;;;; org-export-insert-default-template org-export-replace-region-by -;;;;;; org-export-string-as org-export-as) "ox" "ox.el" "80b647995035a70655d4440422bf062a") +;;;;;; org-export-string-as org-export-as) "ox" "ox.el" "666ded911b08be6cee87ae459dc28b1c") ;;; Generated autoloads from ox.el (autoload 'org-export-as "ox" "\ diff --git a/lisp/org-macro.el b/lisp/org-macro.el index e808972..fee33f6 100644 --- a/lisp/org-macro.el +++ b/lisp/org-macro.el @@ -1,6 +1,6 @@ ;;; org-macro.el --- Macro Replacement Code for Org Mode -;; Copyright (C) 2013-2015 Free Software Foundation, Inc. +;; Copyright (C) 2013-2016 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou ;; Keywords: outlines, hypermedia, calendar, wp @@ -188,7 +188,7 @@ found in the buffer with no definition in TEMPLATES. Optional argument KEYWORDS, when non-nil is a list of keywords, as strings, where macro expansion is allowed." - (save-excursion + (org-with-wide-buffer (goto-char (point-min)) (let ((properties-regexp (format "\\`EXPORT_%s\\+?\\'" (regexp-opt keywords))) diff --git a/lisp/org-macs.el b/lisp/org-macs.el index d6dcca8..631f83a 100644 --- a/lisp/org-macs.el +++ b/lisp/org-macs.el @@ -1,6 +1,6 @@ ;;; org-macs.el --- Top-level definitions for Org-mode -;; Copyright (C) 2004-2015 Free Software Foundation, Inc. +;; Copyright (C) 2004-2016 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org-mhe.el b/lisp/org-mhe.el index e184440..e8abef9 100644 --- a/lisp/org-mhe.el +++ b/lisp/org-mhe.el @@ -1,6 +1,6 @@ ;;; org-mhe.el --- Support for links to MH-E messages from within Org-mode -;; Copyright (C) 2004-2015 Free Software Foundation, Inc. +;; Copyright (C) 2004-2016 Free Software Foundation, Inc. ;; Author: Thomas Baumann ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org-mobile.el b/lisp/org-mobile.el index 6c7c8d0..e6709e4 100644 --- a/lisp/org-mobile.el +++ b/lisp/org-mobile.el @@ -1,5 +1,5 @@ ;;; org-mobile.el --- Code for asymmetric sync with a mobile device -;; Copyright (C) 2009-2015 Free Software Foundation, Inc. +;; Copyright (C) 2009-2016 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp @@ -88,7 +88,7 @@ org-agenda-text-search-extra-files Encryption uses AES-256, with a password given in `org-mobile-encryption-password'. When nil, plain files are kept on the server. -Turning on encryption requires to set the same password in the MobileOrg +Turning on encryption requires setting the same password in the MobileOrg application. Before turning this on, check of MobileOrg does already support it - at the time of this writing it did not yet." :group 'org-mobile diff --git a/lisp/org-mouse.el b/lisp/org-mouse.el index 43ebfb6..232a4be 100644 --- a/lisp/org-mouse.el +++ b/lisp/org-mouse.el @@ -1,6 +1,6 @@ ;;; org-mouse.el --- Better mouse support for org-mode -;; Copyright (C) 2006-2015 Free Software Foundation, Inc. +;; Copyright (C) 2006-2016 Free Software Foundation, Inc. ;; Author: Piotr Zielinski ;; Maintainer: Carsten Dominik diff --git a/lisp/org-pcomplete.el b/lisp/org-pcomplete.el index 42d0f9f..e27492c 100644 --- a/lisp/org-pcomplete.el +++ b/lisp/org-pcomplete.el @@ -1,6 +1,6 @@ ;;; org-pcomplete.el --- In-buffer completion code -;; Copyright (C) 2004-2015 Free Software Foundation, Inc. +;; Copyright (C) 2004-2016 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; John Wiegley diff --git a/lisp/org-plot.el b/lisp/org-plot.el index 90a7f36..9dbf882 100644 --- a/lisp/org-plot.el +++ b/lisp/org-plot.el @@ -1,6 +1,6 @@ ;;; org-plot.el --- Support for plotting from Org-mode -;; Copyright (C) 2008-2015 Free Software Foundation, Inc. +;; Copyright (C) 2008-2016 Free Software Foundation, Inc. ;; ;; Author: Eric Schulte ;; Keywords: tables, plotting diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el index 339f2b7..2f2c54b 100644 --- a/lisp/org-protocol.el +++ b/lisp/org-protocol.el @@ -1,6 +1,6 @@ ;;; org-protocol.el --- Intercept calls from emacsclient to trigger custom actions. ;; -;; Copyright (C) 2008-2015 Free Software Foundation, Inc. +;; Copyright (C) 2008-2016 Free Software Foundation, Inc. ;; ;; Authors: Bastien Guerry ;; Daniel M German diff --git a/lisp/org-rmail.el b/lisp/org-rmail.el index af47e0f..d737aff 100644 --- a/lisp/org-rmail.el +++ b/lisp/org-rmail.el @@ -1,6 +1,6 @@ ;;; org-rmail.el --- Support for links to Rmail messages from within Org-mode -;; Copyright (C) 2004-2015 Free Software Foundation, Inc. +;; Copyright (C) 2004-2016 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org-src.el b/lisp/org-src.el index 9c205e1..b7bbf31 100644 --- a/lisp/org-src.el +++ b/lisp/org-src.el @@ -1,6 +1,6 @@ ;;; org-src.el --- Source code examples in Org ;; -;; Copyright (C) 2004-2015 Free Software Foundation, Inc. +;; Copyright (C) 2004-2016 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Bastien Guerry @@ -54,6 +54,7 @@ (declare-function org-trim "org" (s)) (defvar org-element-all-elements) +(defvar org-inhibit-startup) (defcustom org-edit-src-turn-on-auto-save nil "Non-nil means turn `auto-save-mode' on when editing a source block. @@ -495,9 +496,7 @@ as `org-src-fontify-natively' is non-nil." (delete-region (point-min) (point-max)) (insert string " ") ;; so there's a final property change (unless (eq major-mode lang-mode) (funcall lang-mode)) - ;; Avoid `font-lock-ensure', which does not display fonts in - ;; source block. - (font-lock-fontify-buffer) + (org-font-lock-ensure) (setq pos (point-min)) (while (setq next (next-single-property-change pos 'face)) (put-text-property diff --git a/lisp/org-table.el b/lisp/org-table.el index e2d3198..e43f0f8 100644 --- a/lisp/org-table.el +++ b/lisp/org-table.el @@ -1,6 +1,6 @@ ;;; org-table.el --- The table editor for Org mode -;; Copyright (C) 2004-2015 Free Software Foundation, Inc. +;; Copyright (C) 2004-2016 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp @@ -927,9 +927,9 @@ a table." (match-beginning 0)) ;; When the line right after the table is the last line in ;; the buffer with trailing spaces but no final newline - ;; character, trailing spaces, be sure to catch the correct - ;; ending at its beginning. In any other case, ending is - ;; expected to be at point max. + ;; character, be sure to catch the correct ending at its + ;; beginning. In any other case, ending is expected to be + ;; at point max. (t (goto-char (point-max)) (skip-chars-backward " \t") (if (bolp) (point) (line-end-position)))))) @@ -2169,20 +2169,25 @@ If NLAST is a number, only the NLAST fields will actually be summed." Assumes that table is already analyzed. If KEY is given, return the key to this formula. Otherwise return the formula preceded with \"=\" or \":=\"." - (let* ((col (org-table-current-column)) - (name (car (rassoc (list (count-lines org-table-current-begin-pos - (line-beginning-position)) - col) - org-table-named-field-locations))) - (scol (int-to-string col)) - (ref (format "@%d$%d" (org-table-current-dline) col)) - (stored-list (org-table-get-stored-formulas noerror)) - (ass (or (assoc name stored-list) - (assoc ref stored-list) - (assoc scol stored-list)))) - (cond (key (car ass)) - (ass (concat (if (string-match "^[0-9]+$" (car ass)) "=" ":=") - (cdr ass)))))) + (let* ((line (count-lines org-table-current-begin-pos + (line-beginning-position))) + (row (org-table-line-to-dline line))) + (cond + (row + (let* ((col (org-table-current-column)) + (name (car (rassoc (list line col) + org-table-named-field-locations))) + (scol (format "$%d" col)) + (ref (format "@%d$%d" (org-table-current-dline) col)) + (stored-list (org-table-get-stored-formulas noerror)) + (ass (or (assoc name stored-list) + (assoc ref stored-list) + (assoc scol stored-list)))) + (cond (key (car ass)) + (ass (concat (if (string-match "^[0-9]+$" (car ass)) "=" ":=") + (cdr ass)))))) + (noerror nil) + (t (error "No formula active for the current field"))))) (defun org-table-get-formula (&optional equation named) "Read a formula from the minibuffer, offer stored formula as default. @@ -2242,12 +2247,16 @@ column formula? " )) (org-table-store-formulas stored-list)) eq)) -(defun org-table-store-formulas (alist) - "Store the list of formulas below the current table." +(defun org-table-store-formulas (alist &optional location) + "Store the list of formulas below the current table. +If optional argument LOCATION is a buffer position, insert it at +LOCATION instead." (save-excursion - (goto-char (org-table-end)) + (if location + (progn (goto-char location) (beginning-of-line)) + (goto-char (org-table-end))) (let ((case-fold-search t)) - (if (looking-at "\\([ \t]*\n\\)*[ \t]*\\(#\\+tblfm:\\)\\(.*\n?\\)") + (if (looking-at "\\([ \t]*\n\\)*[ \t]*\\(#\\+TBLFM:\\)\\(.*\n?\\)") (progn ;; Don't overwrite TBLFM, we might use text properties to ;; store stuff. @@ -2287,10 +2296,15 @@ column formula? " )) (and as bs (string< as bs)))) ;;;###autoload -(defun org-table-get-stored-formulas (&optional noerror) - "Return an alist with the stored formulas directly after current table." +(defun org-table-get-stored-formulas (&optional noerror location) + "Return an alist with the stored formulas directly after current table. +By default, only return active formulas, i.e., formulas located +on the first line after the table. However, if optional argument +LOCATION is a buffer position, consider the formulas there." (save-excursion - (goto-char (org-table-end)) + (if location + (progn (goto-char location) (beginning-of-line)) + (goto-char (org-table-end))) (let ((case-fold-search t)) (when (looking-at "\\([ \t]*\n\\)*[ \t]*#\\+TBLFM: *\\(.*\\)") (let ((strings (org-split-string (org-match-string-no-properties 2) @@ -2664,7 +2678,6 @@ not overwrite the stored one." (or suppress-analysis (org-table-analyze)) (if (equal arg '(16)) (let ((eq (org-table-current-field-formula))) - (or eq (user-error "No equation active for current field")) (org-table-get-field nil eq) (org-table-align) (setq org-table-may-need-update t)) @@ -3524,62 +3537,70 @@ Parameters get priority." :style toggle :selected org-table-buffer-is-an])) (defvar org-pos) +(defvar org-table--fedit-source nil + "Position of the TBLFM line being edited.") ;;;###autoload (defun org-table-edit-formulas () "Edit the formulas of the current table in a separate buffer." (interactive) - (when (save-excursion (beginning-of-line) - (let ((case-fold-search t)) (looking-at "[ \t]*#\\+TBLFM"))) - (beginning-of-line 0)) - (unless (org-at-table-p) (user-error "Not at a table")) - (org-table-analyze) - (let ((key (org-table-current-field-formula 'key 'noerror)) - (eql (sort (org-table-get-stored-formulas 'noerror) - #'org-table-formula-less-p)) - (pos (point-marker)) - (startline 1) - (wc (current-window-configuration)) - (sel-win (selected-window)) - (titles '((column . "# Column Formulas\n") - (field . "# Field and Range Formulas\n") - (named . "# Named Field Formulas\n")))) - (org-switch-to-buffer-other-window "*Edit Formulas*") - (erase-buffer) - ;; Keep global-font-lock-mode from turning on font-lock-mode - (let ((font-lock-global-modes '(not fundamental-mode))) - (fundamental-mode)) - (org-set-local 'font-lock-global-modes (list 'not major-mode)) - (org-set-local 'org-pos pos) - (org-set-local 'org-window-configuration wc) - (org-set-local 'org-selected-window sel-win) - (use-local-map org-table-fedit-map) - (org-add-hook 'post-command-hook #'org-table-fedit-post-command t t) - (easy-menu-add org-table-fedit-menu) - (setq startline (org-current-line)) - (dolist (entry eql) - (let* ((type (cond - ((string-match "\\`$[<>]" (car entry)) 'column) - ((equal (string-to-char (car entry)) ?@) 'field) - ((string-match "\\'[0-9]" (car entry)) 'column) - (t 'named))) - (title (assq type titles))) - (when title - (unless (bobp) (insert "\n")) - (insert (org-add-props (cdr title) nil 'face font-lock-comment-face)) - (setq titles (remove title titles))) - (when (equal key (car entry)) (setq startline (org-current-line))) - (let ((s (concat (if (member (string-to-char (car entry)) '(?@ ?$)) "" "$") - (car entry) " = " (cdr entry) "\n"))) - (remove-text-properties 0 (length s) '(face nil) s) - (insert s)))) - (when (eq org-table-use-standard-references t) - (org-table-fedit-toggle-ref-type)) - (org-goto-line startline) - (message - (substitute-command-keys "\\\ + (let ((at-tblfm (org-at-TBLFM-p))) + (unless (or at-tblfm (org-at-table-p)) + (user-error "Not at a table")) + (save-excursion + ;; Move point within the table before analyzing it. + (when at-tblfm (re-search-backward "^[ \t]*|")) + (org-table-analyze)) + (let ((key (org-table-current-field-formula 'key 'noerror)) + (eql (sort (org-table-get-stored-formulas t (and at-tblfm (point))) + #'org-table-formula-less-p)) + (pos (point-marker)) + (source (copy-marker (line-beginning-position))) + (startline 1) + (wc (current-window-configuration)) + (sel-win (selected-window)) + (titles '((column . "# Column Formulas\n") + (field . "# Field and Range Formulas\n") + (named . "# Named Field Formulas\n")))) + (org-switch-to-buffer-other-window "*Edit Formulas*") + (erase-buffer) + ;; Keep global-font-lock-mode from turning on font-lock-mode + (let ((font-lock-global-modes '(not fundamental-mode))) + (fundamental-mode)) + (org-set-local 'font-lock-global-modes (list 'not major-mode)) + (org-set-local 'org-pos pos) + (org-set-local 'org-table--fedit-source source) + (org-set-local 'org-window-configuration wc) + (org-set-local 'org-selected-window sel-win) + (use-local-map org-table-fedit-map) + (org-add-hook 'post-command-hook #'org-table-fedit-post-command t t) + (easy-menu-add org-table-fedit-menu) + (setq startline (org-current-line)) + (dolist (entry eql) + (let* ((type (cond + ((string-match "\\`$\\([0-9]+\\|[<>]+\\)\\'" (car entry)) + 'column) + ((equal (string-to-char (car entry)) ?@) 'field) + (t 'named))) + (title (assq type titles))) + (when title + (unless (bobp) (insert "\n")) + (insert + (org-add-props (cdr title) nil 'face font-lock-comment-face)) + (setq titles (remove title titles))) + (when (equal key (car entry)) (setq startline (org-current-line))) + (let ((s (concat + (if (memq (string-to-char (car entry)) '(?@ ?$)) "" "$") + (car entry) " = " (cdr entry) "\n"))) + (remove-text-properties 0 (length s) '(face nil) s) + (insert s)))) + (when (eq org-table-use-standard-references t) + (org-table-fedit-toggle-ref-type)) + (org-goto-line startline) + (message + (substitute-command-keys "\\\ Edit formulas, finish with `\\[org-ctrl-c-ctrl-c]' or `\\[org-edit-special]'. \ -See menu for more commands.")))) +See menu for more commands."))))) (defun org-table-fedit-post-command () (when (not (memq this-command '(lisp-complete-symbol))) @@ -3823,32 +3844,31 @@ a translation reference." With prefix ARG, apply the new formulas to the table." (interactive "P") (org-table-remove-rectangle-highlight) - (if org-table-use-standard-references - (progn - (org-table-fedit-convert-buffer 'org-table-convert-refs-to-rc) - (setq org-table-buffer-is-an nil))) - (let ((pos org-pos) (sel-win org-selected-window) eql var form) + (when org-table-use-standard-references + (org-table-fedit-convert-buffer 'org-table-convert-refs-to-rc) + (setq org-table-buffer-is-an nil)) + (let ((pos org-pos) + (sel-win org-selected-window) + (source org-table--fedit-source) + eql) (goto-char (point-min)) (while (re-search-forward "^\\(@[-+I<>0-9.$@]+\\|@?[0-9]+\\|\\$\\([a-zA-Z0-9]+\\|[<>]+\\)\\) *= *\\(.*\\(\n[ \t]+.*$\\)*\\)" nil t) - (setq var (if (match-end 2) (match-string 2) (match-string 1)) - form (match-string 3)) - (setq form (org-trim form)) - (when (not (equal form "")) - (while (string-match "[ \t]*\n[ \t]*" form) - (setq form (replace-match " " t t form))) - (when (assoc var eql) - (user-error "Double formulas for %s" var)) - (push (cons var form) eql))) - (setq org-pos nil) + (let ((var (match-string 1)) + (form (org-trim (match-string 3)))) + (unless (equal form "") + (while (string-match "[ \t]*\n[ \t]*" form) + (setq form (replace-match " " t t form))) + (when (assoc var eql) + (user-error "Double formulas for %s" var)) + (push (cons var form) eql)))) (set-window-configuration org-window-configuration) (select-window sel-win) - (goto-char pos) - (unless (org-at-table-p) - (user-error "Lost table position - cannot install formulas")) + (goto-char source) (org-table-store-formulas eql) - (move-marker pos nil) + (set-marker pos nil) + (set-marker source nil) (kill-buffer "*Edit Formulas*") (if arg (org-table-recalculate 'all) @@ -3907,13 +3927,13 @@ With prefix ARG, apply the new formulas to the table." (defvar org-show-positions nil) (defun org-table-show-reference (&optional local) - "Show the location/value of the $ expression at point." + "Show the location/value of the $ expression at point. +When LOCAL is non-nil, show references for the table at point." (interactive) (org-table-remove-rectangle-highlight) (when local (org-table-analyze)) (catch 'exit (let ((pos (if local (point) org-pos)) - (table-start (if local org-table-current-begin-pos (org-table-begin))) (face2 'highlight) (org-inhibit-highlight-removal t) (win (selected-window)) @@ -3966,73 +3986,75 @@ With prefix ARG, apply the new formulas to the table." (marker-buffer pos))))) (goto-char pos) (org-table-force-dataline) - (when dest - (setq name (substring dest 1)) + (let ((table-start + (if local org-table-current-begin-pos (org-table-begin)))) + (when dest + (setq name (substring dest 1)) + (cond + ((org-string-match-p "\\`\\$[a-zA-Z][a-zA-Z0-9]*" dest) + (org-table-goto-field dest)) + ((org-string-match-p "\\`@\\([1-9][0-9]*\\)\\$\\([1-9][0-9]*\\)\\'" + dest) + (org-table-goto-field dest)) + (t (org-table-goto-column (string-to-number name)))) + (move-marker pos (point)) + (org-table-highlight-rectangle nil nil face2)) (cond - ((org-string-match-p "\\`\\$[a-zA-Z][a-zA-Z0-9]*" dest) - (org-table-goto-field dest)) - ((org-string-match-p "\\`@\\([1-9][0-9]*\\)\\$\\([1-9][0-9]*\\)\\'" - dest) - (org-table-goto-field dest)) - (t (org-table-goto-column (string-to-number name)))) - (move-marker pos (point)) - (org-table-highlight-rectangle nil nil face2)) - (cond - ((equal dest match)) - ((not match)) - ((eq what 'range) - (ignore-errors (org-table-get-range match table-start nil 'highlight))) - ((setq e (assoc var org-table-named-field-locations)) - (org-table-goto-field var) - (org-table-highlight-rectangle) - (message "Named field, column %d of line %d" (nth 2 e) (nth 1 e))) - ((setq e (assoc var org-table-column-names)) - (org-table-goto-column (string-to-number (cdr e))) - (org-table-highlight-rectangle) - (goto-char table-start) - (if (re-search-forward (concat "^[ \t]*| *! *.*?| *\\(" var "\\) *|") - (org-table-end) t) - (progn - (goto-char (match-beginning 1)) - (org-table-highlight-rectangle) - (message "Named column (column %s)" (cdr e))) - (user-error "Column name not found"))) - ((eq what 'column) - ;; Column number. - (org-table-goto-column (string-to-number (substring match 1))) - (org-table-highlight-rectangle) - (message "Column %s" (substring match 1))) - ((setq e (assoc var org-table-local-parameters)) - (goto-char table-start) - (if (re-search-forward (concat "^[ \t]*| *\\$ *.*?| *\\(" var "=\\)") nil t) - (progn - (goto-char (match-beginning 1)) - (org-table-highlight-rectangle) - (message "Local parameter.")) - (user-error "Parameter not found"))) - ((not var) (user-error "No reference at point")) - ((setq e (assoc var org-table-formula-constants-local)) - (message "Local Constant: $%s=%s in #+CONSTANTS line." - var (cdr e))) - ((setq e (assoc var org-table-formula-constants)) - (message "Constant: $%s=%s in `org-table-formula-constants'." - var (cdr e))) - ((setq e (and (fboundp 'constants-get) (constants-get var))) - (message "Constant: $%s=%s, from `constants.el'%s." - var e (format " (%s units)" constants-unit-system))) - (t (user-error "Undefined name $%s" var))) - (goto-char pos) - (when (and org-show-positions - (not (memq this-command '(org-table-fedit-scroll - org-table-fedit-scroll-down)))) - (push pos org-show-positions) - (push table-start org-show-positions) - (let ((min (apply 'min org-show-positions)) - (max (apply 'max org-show-positions))) - (set-window-start (selected-window) min) - (goto-char max) - (or (pos-visible-in-window-p max) - (set-window-start (selected-window) max)))) + ((equal dest match)) + ((not match)) + ((eq what 'range) + (ignore-errors (org-table-get-range match table-start nil 'highlight))) + ((setq e (assoc var org-table-named-field-locations)) + (org-table-goto-field var) + (org-table-highlight-rectangle) + (message "Named field, column %d of line %d" (nth 2 e) (nth 1 e))) + ((setq e (assoc var org-table-column-names)) + (org-table-goto-column (string-to-number (cdr e))) + (org-table-highlight-rectangle) + (goto-char table-start) + (if (re-search-forward (concat "^[ \t]*| *! *.*?| *\\(" var "\\) *|") + (org-table-end) t) + (progn + (goto-char (match-beginning 1)) + (org-table-highlight-rectangle) + (message "Named column (column %s)" (cdr e))) + (user-error "Column name not found"))) + ((eq what 'column) + ;; Column number. + (org-table-goto-column (string-to-number (substring match 1))) + (org-table-highlight-rectangle) + (message "Column %s" (substring match 1))) + ((setq e (assoc var org-table-local-parameters)) + (goto-char table-start) + (if (re-search-forward (concat "^[ \t]*| *\\$ *.*?| *\\(" var "=\\)") nil t) + (progn + (goto-char (match-beginning 1)) + (org-table-highlight-rectangle) + (message "Local parameter.")) + (user-error "Parameter not found"))) + ((not var) (user-error "No reference at point")) + ((setq e (assoc var org-table-formula-constants-local)) + (message "Local Constant: $%s=%s in #+CONSTANTS line." + var (cdr e))) + ((setq e (assoc var org-table-formula-constants)) + (message "Constant: $%s=%s in `org-table-formula-constants'." + var (cdr e))) + ((setq e (and (fboundp 'constants-get) (constants-get var))) + (message "Constant: $%s=%s, from `constants.el'%s." + var e (format " (%s units)" constants-unit-system))) + (t (user-error "Undefined name $%s" var))) + (goto-char pos) + (when (and org-show-positions + (not (memq this-command '(org-table-fedit-scroll + org-table-fedit-scroll-down)))) + (push pos org-show-positions) + (push table-start org-show-positions) + (let ((min (apply 'min org-show-positions)) + (max (apply 'max org-show-positions))) + (set-window-start (selected-window) min) + (goto-char max) + (or (pos-visible-in-window-p max) + (set-window-start (selected-window) max))))) (select-window win)))) (defun org-table-force-dataline () diff --git a/lisp/org-timer.el b/lisp/org-timer.el index 0758ed2..c363ff3 100644 --- a/lisp/org-timer.el +++ b/lisp/org-timer.el @@ -1,6 +1,6 @@ ;;; org-timer.el --- Timer code for Org mode -;; Copyright (C) 2008-2015 Free Software Foundation, Inc. +;; Copyright (C) 2008-2016 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org-version.el b/lisp/org-version.el index 02a663e..145290b 100644 --- a/lisp/org-version.el +++ b/lisp/org-version.el @@ -5,13 +5,13 @@ (defun org-release () "The release version of org-mode. Inserted by installing org-mode or when a release is made." - (let ((org-release "8.3.3")) + (let ((org-release "8.3.4")) org-release)) ;;;###autoload (defun org-git-version () "The Git version of org-mode. Inserted by installing org-mode or when a release is made." - (let ((org-git-version "8.3.3-dist")) + (let ((org-git-version "8.3.4-dist")) org-git-version)) ;;;###autoload (defvar org-odt-data-dir "/usr/share/emacs/etc/org" diff --git a/lisp/org-w3m.el b/lisp/org-w3m.el index 24693de..894dbef 100644 --- a/lisp/org-w3m.el +++ b/lisp/org-w3m.el @@ -1,6 +1,6 @@ ;;; org-w3m.el --- Support from copy and paste from w3m to Org-mode -;; Copyright (C) 2008-2015 Free Software Foundation, Inc. +;; Copyright (C) 2008-2016 Free Software Foundation, Inc. ;; Author: Andy Stewart ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/org.el b/lisp/org.el old mode 100755 new mode 100644 index 2e5b91d..af68539 --- a/lisp/org.el +++ b/lisp/org.el @@ -1,7 +1,7 @@ ;;; org.el --- Outline-based notes management and organizer ;; Carstens outline-mode for keeping track of everything. -;; Copyright (C) 2004-2015 Free Software Foundation, Inc. +;; Copyright (C) 2004-2016 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Maintainer: Carsten Dominik @@ -2293,17 +2293,17 @@ For more examples, see the system specific constants :group 'org) (defcustom org-directory "~/org" - "Directory with org files. + "Directory with Org files. This is just a default location to look for Org files. There is no need -at all to put your files into this directory. It is only used in the +at all to put your files into this directory. It is used in the following situations: 1. When a capture template specifies a target file that is not an absolute path. The path will then be interpreted relative to `org-directory' -2. When a capture note is filed away in an interactive way (when exiting the - note buffer with `C-1 C-c C-c'. The user is prompted for an org file, - with `org-directory' as the default path." +2. When the value of variable `org-agenda-files' is a single file, any + relative paths in this file will be taken as relative to + `org-directory'." :group 'org-refile :group 'org-capture :type 'directory) @@ -2483,7 +2483,7 @@ fast, while still showing the whole path to the entry." :type 'boolean) (defcustom org-refile-allow-creating-parent-nodes nil - "Non-nil means allow to create new nodes as refile targets. + "Non-nil means allow the creation of new nodes as refile targets. New nodes are then created by adding \"/new node name\" to the completion of an existing node. When the value of this variable is `confirm', new node creation must be confirmed by the user (recommended). @@ -5849,24 +5849,20 @@ prompted for." (defun org-activate-plain-links (limit) "Add link properties for plain links." - (let (f hl) - (when (and (re-search-forward (concat org-plain-link-re) limit t) - (not (member 'org-tag - (get-text-property (1- (match-beginning 0)) 'face))) - (not (org-in-src-block-p))) - (org-remove-flyspell-overlays-in (match-beginning 0) (match-end 0)) - (setq f (get-text-property (match-beginning 0) 'face)) - (setq hl (org-match-string-no-properties 0)) - (if (or (eq f 'org-tag) - (and (listp f) (memq 'org-tag f))) - nil + (when (and (re-search-forward org-plain-link-re limit t) + (not (org-in-src-block-p))) + (let ((face (get-text-property (max (1- (match-beginning 0)) (point-min)) + 'face)) + (link (org-match-string-no-properties 0))) + (unless (if (consp face) (memq 'org-tag face) (eq 'org-tag face)) + (org-remove-flyspell-overlays-in (match-beginning 0) (match-end 0)) (add-text-properties (match-beginning 0) (match-end 0) (list 'mouse-face 'highlight 'face 'org-link - 'htmlize-link `(:uri ,hl) + 'htmlize-link `(:uri ,link) 'keymap org-mouse-map)) - (org-rear-nonsticky-at (match-end 0))) - t))) + (org-rear-nonsticky-at (match-end 0)) + t)))) (defun org-activate-code (limit) (if (re-search-forward "^[ \t]*\\(:\\(?: .*\\|$\\)\n?\\)" limit t) @@ -6240,14 +6236,14 @@ done, nil otherwise." (font-lock-mode 1))) (defun org-activate-tags (limit) - (if (re-search-forward (org-re "^\\*+.*[ \t]\\(:[[:alnum:]_@#%:]+:\\)[ \r\n]") limit t) - (progn - (org-remove-flyspell-overlays-in (match-beginning 1) (match-end 1)) - (add-text-properties (match-beginning 1) (match-end 1) - (list 'mouse-face 'highlight - 'keymap org-mouse-map)) - (org-rear-nonsticky-at (match-end 1)) - t))) + (when (re-search-forward + (org-re "^\\*+.*[ \t]\\(:[[:alnum:]_@#%:]+:\\)[ \t]*$") limit t) + (org-remove-flyspell-overlays-in (match-beginning 1) (match-end 1)) + (add-text-properties (match-beginning 1) (match-end 1) + (list 'mouse-face 'highlight + 'keymap org-mouse-map)) + (org-rear-nonsticky-at (match-end 1)) + t)) (defun org-outline-level () "Compute the outline level of the heading at point. @@ -6501,7 +6497,7 @@ needs to be inserted at a specific position in the font-lock sequence.") (insert s) (let ((org-odd-levels-only odd-levels)) (org-mode) - (font-lock-ensure) + (org-font-lock-ensure) (buffer-string)))) (defvar org-m nil) @@ -7195,7 +7191,7 @@ open and agenda-wise Org files." (defsubst org-entry-beginning-position () "Return the beginning position of the current entry." - (save-excursion (outline-back-to-heading t) (point))) + (save-excursion (org-back-to-heading t) (point))) (defsubst org-entry-end-position () "Return the end position of the current entry." @@ -18755,10 +18751,14 @@ When a buffer is unmodified, it is just killed. When modified, it is saved (append org-tag-alist-for-agenda org-tag-alist org-tag-persistent-alist))) - (if org-group-tags - (setq org-tag-groups-alist-for-agenda - (org-uniquify-alist - (append org-tag-groups-alist-for-agenda org-tag-groups-alist)))) + ;; Merge current file's tag groups into global + ;; `org-tag-groups-alist-for-agenda'. + (when org-group-tags + (dolist (alist org-tag-groups-alist) + (let ((old (assoc (car alist) org-tag-groups-alist-for-agenda))) + (if old + (setcdr old (org-uniquify (append (cdr old) (cdr alist)))) + (push alist org-tag-groups-alist-for-agenda))))) (org-with-silent-modifications (save-excursion (remove-text-properties (point-min) (point-max) pall) @@ -18977,29 +18977,38 @@ looks only before point, not after." (org-in-regexp "\\\\[a-zA-Z]+\\*?\\(\\(\\[[^][\n{}]*\\]\\)\\|\\({[^{}\n]*}\\)\\)*"))) -(defvar org-latex-fragment-image-overlays nil - "List of overlays carrying the images of latex fragments.") -(make-variable-buffer-local 'org-latex-fragment-image-overlays) +(defun org--format-latex-make-overlay (beg end image) + "Build an overlay between BEG and END using IMAGE file." + (let ((ov (make-overlay beg end))) + (overlay-put ov 'org-overlay-type 'org-latex-overlay) + (overlay-put ov 'evaporate t) + (overlay-put ov + 'modification-hooks + (list (lambda (o _flag _beg _end &optional _l) + (delete-overlay o)))) + (if (featurep 'xemacs) + (progn + (overlay-put ov 'invisible t) + (overlay-put ov 'end-glyph (make-glyph (vector 'png :file image)))) + (overlay-put ov + 'display + (list 'image :type 'png :file image :ascent 'center))))) + +(defun org--list-latex-overlays (&optional beg end) + "List all Org LaTeX overlays in current buffer. +Limit to overlays between BEG and END when those are provided." + (org-remove-if-not + (lambda (o) (eq (overlay-get o 'org-overlay-type) 'org-latex-overlay)) + (overlays-in (or beg (point-min)) (or end (point-max))))) (defun org-remove-latex-fragment-image-overlays (&optional beg end) "Remove all overlays with LaTeX fragment images in current buffer. When optional arguments BEG and END are non-nil, remove all -overlays between them instead. Return t when some overlays were -removed, nil otherwise." - (let (removedp) - (setq org-latex-fragment-image-overlays - (let ((beg (or beg (point-min))) - (end (or end (point-max)))) - (org-remove-if - (lambda (o) - (cond ((not (overlay-buffer o)) (delete-overlay o) t) - ((and (>= (overlay-start o) beg) - (<= (overlay-end o) end)) - (delete-overlay o) - (unless removedp (setq removedp t))) - (t nil))) - org-latex-fragment-image-overlays))) - removedp)) +overlays between them instead. Return a non-nil value when some +overlays were removed, nil otherwise." + (let ((overlays (org--list-latex-overlays beg end))) + (mapc #'delete-overlay overlays) + overlays)) (define-obsolete-function-alias 'org-preview-latex-fragment 'org-toggle-latex-fragment "24.4") @@ -19116,11 +19125,12 @@ Some of the options can be changed using the variable (case processing-type (mathjax ;; Prepare for MathJax processing. - (if (eq (char-after beg) ?$) - (save-excursion - (delete-region beg end) - (insert "\\(" (substring value 1 -1) "\\)")) - (goto-char end))) + (if (not (string-match "\\`\\$\\$?" value)) + (goto-char end) + (delete-region beg end) + (if (string= (match-string 0 value) "$$") + (insert "\\[" (substring value 2 -2) "\\]") + (insert "\\(" (substring value 1 -1) "\\)")))) ((dvipng imagemagick) ;; Process to an image. (incf cnt) @@ -19169,25 +19179,7 @@ Some of the options can be changed using the variable (when (eq (overlay-get o 'org-overlay-type) 'org-latex-overlay) (delete-overlay o))) - (let ((ov (make-overlay beg end))) - (overlay-put ov - 'org-overlay-type - 'org-latex-overlay) - (overlay-put ov 'evaporate t) - (if (featurep 'xemacs) - (progn - (overlay-put ov 'invisible t) - (overlay-put - ov 'end-glyph - (make-glyph - (vector 'png :file movefile)))) - (overlay-put - ov 'display - (list 'image - :type 'png - :file movefile - :ascent 'center))) - (push ov org-latex-fragment-image-overlays)) + (org--format-latex-make-overlay beg end movefile) (goto-char end)) (delete-region beg end) (insert @@ -22506,11 +22498,12 @@ and :keyword." (if (looking-at org-radio-target-regexp) (push (org-point-in-group p 0 :radio-target) clist)) (goto-char p)) - ((setq o (car (delq nil - (mapcar - (lambda (x) - (if (memq x org-latex-fragment-image-overlays) x)) - (overlays-at (point)))))) + ((setq o (org-some + (lambda (o) + (and (eq (overlay-get o 'org-overlay-type) + 'org-latex-overlay) + o)) + (overlays-at (point)))) (push (list :latex-fragment (overlay-start o) (overlay-end o)) clist) (push (list :latex-preview @@ -24502,7 +24495,7 @@ respect customization of `org-odd-levels-only'." (outline-next-visible-heading arg))) (defun org-previous-visible-heading (arg) - "Move to the next visible heading. + "Move to the previous visible heading. This function wraps `outline-previous-visible-heading' with `org-with-limited-levels' in order to skip over inline tasks and diff --git a/lisp/ox-ascii.el b/lisp/ox-ascii.el index 2dfd5b8..aa12d9e 100644 --- a/lisp/ox-ascii.el +++ b/lisp/ox-ascii.el @@ -1,6 +1,6 @@ ;;; ox-ascii.el --- ASCII Back-End for Org Export Engine -;; Copyright (C) 2012-2015 Free Software Foundation, Inc. +;; Copyright (C) 2012-2016 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou ;; Keywords: outlines, hypermedia, calendar, wp @@ -35,10 +35,10 @@ ;;; Define Back-End ;; -;; The following setting won't allow to modify preferred charset +;; The following setting won't allow modifying preferred charset ;; through a buffer keyword or an option item, but, since the property -;; will appear in communication channel nonetheless, it allows to -;; override `org-ascii-charset' variable on the fly by the ext-plist +;; will appear in communication channel nonetheless, it allows +;; overriding `org-ascii-charset' variable on the fly by the ext-plist ;; mechanism. ;; ;; We also install a filter for headlines and sections, in order to diff --git a/lisp/ox-beamer.el b/lisp/ox-beamer.el index 4db312e..7afe390 100644 --- a/lisp/ox-beamer.el +++ b/lisp/ox-beamer.el @@ -1,6 +1,6 @@ ;;; ox-beamer.el --- Beamer Back-End for Org Export Engine -;; Copyright (C) 2007-2015 Free Software Foundation, Inc. +;; Copyright (C) 2007-2016 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Nicolas Goaziou diff --git a/lisp/ox-html.el b/lisp/ox-html.el index a2db938..de2e5d9 100644 --- a/lisp/ox-html.el +++ b/lisp/ox-html.el @@ -1,6 +1,6 @@ ;;; ox-html.el --- HTML Back-End for Org Export Engine -;; Copyright (C) 2011-2015 Free Software Foundation, Inc. +;; Copyright (C) 2011-2016 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Jambunathan K @@ -1978,7 +1978,7 @@ INFO is a plist used as a communication channel." (when todo (format "%s" (if (member todo org-done-keywords) "done" "todo") - (plist-get info :html-todo-kwd-class-prefix) + (or (plist-get info :html-todo-kwd-class-prefix) "") (org-html-fix-class-name todo) todo))) @@ -2047,7 +2047,7 @@ is the language used for CODE, as a string, or nil." (funcall lang-mode) (insert code) ;; Fontify buffer. - (font-lock-ensure) + (org-font-lock-ensure) ;; Remove formatting on newline characters. (save-excursion (let ((beg (point-min)) @@ -2963,10 +2963,8 @@ INFO is a plist holding contextual information. See attributes desc)) ;; External link without a description part. - (path (format "%s" - (org-html-encode-plain-text path) - attributes - path)) + (path (let ((path (org-html-encode-plain-text path))) + (format "%s" path attributes path))) ;; No path, only description. Try to do something useful. (t (format "%s" desc))))) @@ -3406,7 +3404,7 @@ contextual information." (when (org-export-table-cell-starts-colgroup-p table-cell info) "\n") - ;; Add a column. Also specify it's alignment. + ;; Add a column. Also specify its alignment. (format "\n%s" (org-html-close-tag "col" (concat " " (format alignspec alignment)) info)) diff --git a/lisp/ox-icalendar.el b/lisp/ox-icalendar.el index 29ba409..f965ddc 100644 --- a/lisp/ox-icalendar.el +++ b/lisp/ox-icalendar.el @@ -1,6 +1,6 @@ ;;; ox-icalendar.el --- iCalendar Back-End for Org Export Engine -;; Copyright (C) 2004-2015 Free Software Foundation, Inc. +;; Copyright (C) 2004-2016 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Nicolas Goaziou @@ -76,7 +76,7 @@ for timed events. If non-zero, alarms are created. (defcustom org-icalendar-exclude-tags nil "Tags that exclude a tree from export. -This variable allows to specify different exclude tags from other +This variable allows specifying different exclude tags from other back-ends. It can also be set with the ICALENDAR_EXCLUDE_TAGS keyword." :group 'org-export-icalendar @@ -909,8 +909,8 @@ This function assumes major mode for current buffer is (org-icalendar--vcalendar org-icalendar-combined-name user-full-name - org-icalendar-combined-description (or (org-string-nw-p org-icalendar-timezone) (cadr (current-time-zone))) + org-icalendar-combined-description contents))) (run-hook-with-args 'org-icalendar-after-save-hook file))) diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el index 1840a54..121a675 100644 --- a/lisp/ox-latex.el +++ b/lisp/ox-latex.el @@ -1,6 +1,6 @@ ;;; ox-latex.el --- LaTeX Back-End for Org Export Engine -;; Copyright (C) 2011-2015 Free Software Foundation, Inc. +;; Copyright (C) 2011-2016 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou ;; Keywords: outlines, hypermedia, calendar, wp @@ -2797,7 +2797,6 @@ contextual information." `(("captionpos" ,(if caption-above-p "t" "b"))) (cond ((assoc "numbers" lst-opt) nil) ((not num-start) '(("numbers" "none"))) - ((zerop num-start) '(("numbers" "left"))) (t `(("firstnumber" ,(number-to-string (1+ num-start))) ("numbers" "left")))))) (let ((local-options (plist-get attributes :options))) @@ -3468,7 +3467,10 @@ Return PDF file name or an error if it couldn't be produced." ;; Check for process failure. Provide collected errors if ;; possible. (if (or (not (file-exists-p pdffile)) - (time-less-p (nth 5 (file-attributes pdffile)) time)) + ;; Only compare times up to whole seconds as some filesystems + ;; (e.g. HFS+) do not retain any finer granularity. + (time-less-p (org-sublist (nth 5 (file-attributes pdffile)) 1 2) + (org-sublist time 1 2))) (error (format "PDF file %s wasn't produced" pdffile)) ;; Else remove log files, when specified, and signal end of ;; process to user, along with any error encountered. diff --git a/lisp/ox-man.el b/lisp/ox-man.el index a5d0d49..df744e8 100644 --- a/lisp/ox-man.el +++ b/lisp/ox-man.el @@ -1,6 +1,6 @@ ;; ox-man.el --- Man Back-End for Org Export Engine -;; Copyright (C) 2011-2015 Free Software Foundation, Inc. +;; Copyright (C) 2011-2016 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou ;; Luis R Anaya diff --git a/lisp/ox-md.el b/lisp/ox-md.el index 602c149..0aaade6 100644 --- a/lisp/ox-md.el +++ b/lisp/ox-md.el @@ -1,6 +1,6 @@ ;;; ox-md.el --- Markdown Back-End for Org Export Engine -;; Copyright (C) 2012-2015 Free Software Foundation, Inc. +;; Copyright (C) 2012-2016 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou ;; Keywords: org, wp, markdown diff --git a/lisp/ox-odt.el b/lisp/ox-odt.el index 75353a0..9fce5e7 100644 --- a/lisp/ox-odt.el +++ b/lisp/ox-odt.el @@ -1,6 +1,6 @@ ;;; ox-odt.el --- OpenDocument Text Exporter for Org Mode -;; Copyright (C) 2010-2015 Free Software Foundation, Inc. +;; Copyright (C) 2010-2016 Free Software Foundation, Inc. ;; Author: Jambunathan K ;; Keywords: outlines, hypermedia, calendar, wp @@ -1383,7 +1383,8 @@ original parsed data. INFO is a plist holding export options." ;; Copy styles.xml. Also dump htmlfontify styles, if there is any. ;; Write styles file. (let* ((styles-file (plist-get info :odt-styles-file)) - (styles-file (and styles-file (read (org-trim styles-file)))) + (styles-file (and (org-string-nw-p styles-file) + (read (org-trim styles-file)))) ;; Non-availability of styles.xml is not a critical ;; error. For now, throw an error. (styles-file (or styles-file @@ -3167,7 +3168,7 @@ and prefix with \"OrgSrc\". For example, (with-temp-buffer (insert code) (funcall lang-mode) - (font-lock-ensure) + (org-font-lock-ensure) (buffer-string)))) (fontifier (if use-htmlfontify-p 'org-odt-htmlfontify-string 'org-odt--encode-plain-text)) diff --git a/lisp/ox-org.el b/lisp/ox-org.el index 5b93104..d9af3f7 100644 --- a/lisp/ox-org.el +++ b/lisp/ox-org.el @@ -1,6 +1,6 @@ ;;; ox-org.el --- Org Back-End for Org Export Engine -;; Copyright (C) 2013-2015 Free Software Foundation, Inc. +;; Copyright (C) 2013-2016 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou ;; Keywords: org, wp @@ -297,7 +297,7 @@ Return output file name." (work-buffer (or visitingp (find-file-noselect filename))) newbuf) (with-current-buffer work-buffer - (font-lock-ensure) + (org-font-lock-ensure) (outline-show-all) (org-show-block-all) (setq newbuf (htmlize-buffer))) diff --git a/lisp/ox-publish.el b/lisp/ox-publish.el index 2ec4137..8e20a81 100644 --- a/lisp/ox-publish.el +++ b/lisp/ox-publish.el @@ -1,5 +1,5 @@ ;;; ox-publish.el --- Publish Related Org Mode Files as a Website -;; Copyright (C) 2006-2015 Free Software Foundation, Inc. +;; Copyright (C) 2006-2016 Free Software Foundation, Inc. ;; Author: David O'Toole ;; Maintainer: Carsten Dominik @@ -1139,7 +1139,7 @@ This function is meant to be used as a final out filter. See Return value is an internal reference, as a string. -This function allows to resolve external links like: +This function allows the resolution of external links like: [[file.org::*fuzzy][description]] [[file.org::#custom-id][description]] diff --git a/lisp/ox-texinfo.el b/lisp/ox-texinfo.el index c8c6554..610874b 100644 --- a/lisp/ox-texinfo.el +++ b/lisp/ox-texinfo.el @@ -1,6 +1,6 @@ ;;; ox-texinfo.el --- Texinfo Back-End for Org Export Engine -;; Copyright (C) 2012-2015 Free Software Foundation, Inc. +;; Copyright (C) 2012-2016 Free Software Foundation, Inc. ;; Author: Jonathan Leech-Pepin ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/lisp/ox.el b/lisp/ox.el index 488c727..b9c99eb 100644 --- a/lisp/ox.el +++ b/lisp/ox.el @@ -1,6 +1,6 @@ ;;; ox.el --- Generic Export Engine for Org Mode -;; Copyright (C) 2012-2015 Free Software Foundation, Inc. +;; Copyright (C) 2012-2016 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou ;; Keywords: outlines, hypermedia, calendar, wp @@ -800,7 +800,7 @@ is nil. You can also allow them through local buffer variables." (defcustom org-export-snippet-translation-alist nil "Alist between export snippets back-ends and exporter back-ends. -This variable allows to provide shortcuts for export snippets. +This variable allows providing shortcuts for export snippets. For example, with a value of \\='((\"h\" . \"html\")), the HTML back-end will recognize the contents of \"@@h:@@\" as @@ -883,7 +883,7 @@ output is restricted to body only, \"s\" when it is restricted to the current subtree, \"v\" when only visible elements are considered for export, \"f\" when publishing functions should be passed the FORCE argument and \"a\" when the export should be -asynchronous). Also, [?] allows to switch back to standard +asynchronous). Also, [?] allows switching back to standard mode." :group 'org-export-general :version "24.4" @@ -3814,8 +3814,8 @@ process, leading to a different order when footnotes are nested." ;; level, relatively to the lower headline level in the parsed tree. ;; ;; `org-export-get-headline-number' returns the section number of an -;; headline, while `org-export-number-to-roman' allows to convert it -;; to roman numbers. With an optional argument, +;; headline, while `org-export-number-to-roman' allows it to be +;; converted to roman numbers. With an optional argument, ;; `org-export-get-headline-number' returns a number to unnumbered ;; headlines (used for internal id). ;; @@ -4265,8 +4265,8 @@ Otherwise, only provided element's type is considered. Optional argument PREDICATE is a function returning a non-nil value if the current element or object should be counted in. It accepts two arguments: the element or object being considered and -the plist used as a communication channel. This allows to count -only a certain type of objects (i.e. inline images). +the plist used as a communication channel. This allows counting +only a certain type of object (i.e. inline images). Return value is a list of numbers if ELEMENT is a headline or an item. It is nil for keywords. It represents the footnote number @@ -5689,7 +5689,7 @@ to `:default' encoding. If it fails, return S." ;; returned results in the current process. ;; ;; At a higher level, `org-export-to-buffer' and `org-export-to-file' -;; allow to export to a buffer or a file, asynchronously or not. +;; allow exporting to a buffer or a file, asynchronously or not. ;; ;; `org-export-output-file-name' is an auxiliary function meant to be ;; used with `org-export-to-file'. With a given extension, it tries @@ -6218,7 +6218,7 @@ is nil when this menu hasn't been selected yet. EXPERTP, when non-nil, triggers expert UI. In that case, no help buffer is provided, but indications about currently active -options are given in the prompt. Moreover, [?] allows to switch +options are given in the prompt. Moreover, [?] allows switching back to standard interface." (let* ((fontify-key (lambda (key &optional access-key) diff --git a/mk/version.mk b/mk/version.mk index efb2985..ba98992 100644 --- a/mk/version.mk +++ b/mk/version.mk @@ -1,2 +1,2 @@ -ORGVERSION ?= 8.3.3 -GITVERSION ?= 8.3.3-dist +ORGVERSION ?= 8.3.4 +GITVERSION ?= 8.3.4-dist -- cgit v1.2.3