Aaron Ecay
a42b4609c2
Merge branch 'maint' into remove-get-header
2015-10-29 19:21:24 +00:00
Aaron Ecay
54d3032cdc
babel: fix header arg duplication
...
* lisp/ob-core.el (org-babel-process-params): Make idempotent.
* testing/lisp/test-ob.el (ob/process-params-no-duplicates): New test.
2015-10-29 19:10:08 +00:00
Nicolas Goaziou
8bccb21313
ox-latex: Use lexical binding
...
* lisp/ox-latex.el (org-latex-format-drawer-function):
(org-latex-bold):
(org-latex-clock):
(org-latex-code):
(org-latex-entity):
(org-latex-example-block):
(org-latex-export-block):
(org-latex-export-snippet):
(org-latex-fixed-width):
(org-latex-footnote-reference):
(org-latex-format-headline-default-function):
(org-latex-horizontal-rule):
(org-latex-inline-src-block):
(org-latex-format-inlinetask-default-function):
(org-latex-italic):
(org-latex-keyword):
(org-latex-latex-environment):
(org-latex-latex-fragment):
(org-latex-line-break):
(org-latex-node-property):
(org-latex-paragraph):
(org-latex-planning):
(org-latex-property-drawer):
(org-latex-matrices):
(org-latex-matrices-tree-filter):
(org-latex-math-block-tree-filter):
(org-latex-math-block-options-filter):
(org-latex-math-block):
(org-latex-section):
(org-latex-src-block):
(org-latex-statistics-cookie):
(org-latex-strike-through):
(org-latex--script-size):
(org-latex-subscript):
(org-latex-superscript):
(org-latex-target):
(org-latex-timestamp):
(org-latex-underline):
(org-latex-verbatim):
(org-latex-compile): Silence byte-compiler. Refactor `mapc' + `lambda'
into `dolist'.
2015-10-29 19:08:26 +01:00
Nicolas Goaziou
6ea83b5660
ox-beamer: Silence byte-compiler
...
* lisp/ox-beamer.el (org-beamer-export-block): Silence byte-compiler.
2015-10-29 18:54:31 +01:00
Nicolas Goaziou
ef9c2a8b4b
ox-icalendar: Use lexical binding
...
* lisp/ox-icalendar.el (org-icalendar-get-categories):
(org-icalendar-clear-blank-lines):
(org-icalendar-export-agenda-files):
(org-icalendar-combine-agenda-files): Silence byte-compiler. Refactor
`mapc' + `lambda' into `dolist'.
2015-10-29 18:53:03 +01:00
Nicolas Goaziou
d51e27e4fe
ox-beamer: Use lexical binding
...
* lisp/ox-beamer.el (org-beamer-bold):
(org-beamer-export-block):
(org-beamer-export-snippet):
(org-beamer-item):
(org-beamer-link):
(org-beamer-target): Silence byte-compiler.
2015-10-29 18:39:29 +01:00
Nicolas Goaziou
0198e3955d
ox-html: Use lexical binding
...
* lisp/ox-html.el (org-html-infojs-install-script):
(org-html-format-drawer-function):
(org-html--has-caption-p):
(org-html--make-string):
(org-html-footnote-section):
(org-html--build-mathjax-config):
(org-html--build-pre/postamble):
(org-html--priority):
(org-html--toc-text):
(org-html-bold):
(org-html-center-block):
(org-html-clock):
(org-html-code):
(org-html-dynamic-block):
(org-html-entity):
(org-html-example-block):
(org-html-export-snippet):
(org-html-export-block):
(org-html-fixed-width):
(org-html-footnote-reference):
(org-html-headline):
(org-html-format-headline-default-function):
(org-html-horizontal-rule):
(org-html-inline-src-block):
(org-html-italic):
(org-html-keyword):
(org-html-latex-environment):
(org-html-latex-fragment):
(org-html-line-break):
(org-html-node-property):
(org-html-plain-list):
(org-html-convert-special-strings):
(org-html-planning):
(org-html-property-drawer):
(org-html-quote-block):
(org-html-src-block):
(org-html-statistics-cookie):
(org-html-strike-through):
(org-html-subscript):
(org-html-superscript):
(org-html-table-row):
(org-html-table--table.el-table):
(org-html-target):
(org-html-timestamp):
(org-html-underline):
(org-html-verbatim):
(org-html-verse-block):
(org-html-final-function): Silence byte-compiler. Refactor `mapc' +
`lambda' into `dolist'.
2015-10-29 18:35:20 +01:00
Nicolas Goaziou
72c3f5e8e5
org-agenda: Fix `org-agenda-get-scheduled'
...
* lisp/org-agenda.el (org-agenda-get-scheduled): Rewrite function.
Comment code. Fix fontification and sorting issues introduced in
9e18583
.
2015-10-28 14:48:48 +01:00
Nicolas Goaziou
10a3d601ec
org-agenda: Fix small bug
...
* lisp/org-agenda.el (org-agenda-get-day-entries): Rewrite function to
avoid O(n^2) complexity. Also fix empty deadline list passed as
argument when :deadline (or :deadline*) is not the first symbol.
2015-10-28 14:48:48 +01:00
Nicolas Goaziou
c29eee4836
org-agenda: Rename `org-agenda-todayp' as `org-agenda-today-p'
...
* lisp/org-agenda.el (org-agenda-today-p): New function.
(org-agenda-todayp): Deprecate function.
(org-agenda-get-day-face):
(org-agenda-get-deadlines):
(org-agenda-todo): Apply renaming.
2015-10-28 14:48:43 +01:00
Nicolas Goaziou
f774552a00
org-agenda: Clarify docstring
...
* lisp/org-agenda.el (org-scheduled-past-days): Clarify docstring.
2015-10-28 12:19:56 +01:00
Kyle Meyer
b9676a2575
Merge branch 'maint'
2015-10-28 01:47:43 -04:00
Kyle Meyer
1c740023f7
Rewrite org-format-outline-path
...
* lisp/org.el (org-format-outline-path): Avoid out-of-range error when
the length of PREFIX is greater than the value given for WIDTH.
Prevent result from extending beyond WIDTH. Simplify code.
* testing/lisp/test-org.el (test-org/format-outline-path): Add tests.
Reported-by: Simon Thum <simon.thum@gmx.de>
<http://permalink.gmane.org/gmane.emacs.orgmode/102241 >
2015-10-28 01:26:16 -04:00
Marco Wahl
4552a8915b
Merge branch 'maint'
2015-10-27 10:16:01 +01:00
Marco Wahl
3efb519ff5
doc/org.texi: Add index for Archive mode
2015-10-27 10:14:10 +01:00
Marco Wahl
5f56a73c77
testing/README: Add hint to existence of 'make test'
2015-10-26 22:30:31 +01:00
Marco Wahl
ab763a8d7b
Merge branch 'master' of orgmode.org:org-mode
2015-10-26 21:42:38 +01:00
Marco Wahl
ca8a0234fc
ox-latex: Fix typo in docstring
2015-10-26 21:38:04 +01:00
Nicolas Goaziou
9e18583242
Fix 3072cb2
...
* lisp/org-agenda.el (org-agenda-get-deadlines):
(org-agenda-get-scheduled): When closest scheduled/deadline date is
today, also report all days since original timestamp.
2015-10-26 21:29:12 +01:00
Nicolas Goaziou
7706714200
Switch some Babel-related libraries to lexical binding
...
* lisp/ob-sed.el:
* lisp/ob-shen.el:
(org-babel-execute:shen):
* lisp/ob-sql.el:
(org-babel-prep-session:sql):
* lisp/ob-sqlite.el:
(org-babel-execute:sqlite):
(org-babel-prep-session:sqlite):
* lisp/ob-stan.el:
(org-babel-prep-session:stan):
* lisp/ob-table.el: Switch some libraries to lexical binding.
2015-10-26 16:58:34 +01:00
Rasmus
385f2381f9
ox-latex: Add mapping for R src blocks with minted
...
* ox-latex.el (org-latex-listings-langs): Add mapping for R.
2015-10-26 15:39:52 +01:00
Nicolas Goaziou
e868ef0886
Silence byte-compiler
2015-10-26 09:29:13 +01:00
Nicolas Goaziou
f0bf77e82a
Activate lexical binding in some libraries
...
* lisp/ob-C.el (org-babel-prep-session:C):
(org-babel-load-session:C):
* lisp/ob-J.el:
(org-babel-expand-body:J):
(org-babel-execute:J):
* lisp/ob-R.el:
(org-babel-expand-body:R):
* lisp/ob-abc.el:
(org-babel-execute:abc):
(org-babel-prep-session:abc):
* lisp/ob-asymptote.el:
(org-babel-execute:asymptote):
(org-babel-prep-session:asymptote):
* lisp/ob-awk.el:
(org-babel-expand-body:awk):
* lisp/ob-calc.el:
(org-babel-expand-body:calc):
* lisp/ob-clojure.el:
* lisp/ob-comint.el:
(org-babel-comint-in-buffer):
(org-babel-comint-with-output):
(org-babel-comint-eval-invisibly-and-wait-for-file):
* lisp/ob-coq.el:
* lisp/ob-css.el:
(org-babel-execute:css):
(org-babel-prep-session:css):
* lisp/ob-ditaa.el:
(org-babel-execute:ditaa):
(org-babel-prep-session:ditaa):
* lisp/ob-dot.el:
(org-babel-execute:dot):
(org-babel-prep-session:dot):
* lisp/ob-ebnf.el:
* lisp/ob-emacs-lisp.el:
* lisp/ob-eval.el:
* lisp/ob-forth.el:
* lisp/ob-fortran.el:
(org-babel-execute:fortran):
(org-babel-prep-session:fortran):
(org-babel-load-session:fortran):
* lisp/ob-gnuplot.el:
(org-babel-expand-body:gnuplot):
(org-babel-prep-session:gnuplot):
(org-babel-gnuplot-initiate-session):
* lisp/ob-groovy.el:
(org-babel-prep-session:groovy):
(org-babel-groovy-initiate-session):
* lisp/ob-haskell.el:
(org-babel-haskell-initiate-session):
* lisp/ob-io.el:
(org-babel-prep-session:io):
(org-babel-io-initiate-session):
* lisp/ob-java.el:
(org-babel-execute:java):
* lisp/ob-js.el:
* lisp/ob-keys.el:
* lisp/ob-latex.el:
(org-babel-prep-session:latex):
* lisp/ob-ledger.el:
(org-babel-execute:ledger):
(org-babel-prep-session:ledger):
* lisp/ob-lilypond.el:
(org-babel-lilypond-commands):
(org-babel-lilypond-process-basic):
(org-babel-prep-session:lilypond):
(org-babel-lilypond-parse-line-num):
* lisp/ob-lisp.el:
* lisp/ob-makefile.el:
(org-babel-execute:makefile):
(org-babel-prep-session:makefile):
* lisp/ob-matlab.el:
* lisp/ob-maxima.el:
(org-babel-prep-session:maxima):
* lisp/ob-mscgen.el:
(org-babel-prep-session:mscgen):
* lisp/ob-ocaml.el:
(org-babel-execute:ocaml):
(org-babel-prep-session:ocaml):
* lisp/ob-octave.el:
(org-babel-execute:octave):
(org-babel-octave-initiate-session):
* lisp/ob-org.el:
(org-babel-prep-session:org):
* lisp/ob-perl.el:
(org-babel-prep-session:perl):
(org-babel-perl--var-to-perl):
(org-babel-perl-initiate-session):
* lisp/ob-picolisp.el:
(org-babel-expand-body:picolisp):
(org-babel-execute:picolisp):
* lisp/ob-plantuml.el:
(org-babel-execute:plantuml):
(org-babel-prep-session:plantuml):
* lisp/ob-processing.el:
(org-babel-prep-session:processing):
* lisp/ob-python.el:
(org-babel-python-initiate-session):
* lisp/ob-ref.el:
(org-babel-ref-resolve):
* lisp/ob-ruby.el:
(org-babel-ruby-initiate-session):
* lisp/ob-sass.el:
(org-babel-execute:sass):
(org-babel-prep-session:sass):
* lisp/ob-scala.el:
(org-babel-execute:scala):
(org-babel-prep-session:scala):
(org-babel-scala-initiate-session):
* lisp/ob-scheme.el:
* lisp/ob-screen.el:
(org-babel-prep-session:screen):
(org-babel-screen-session-write-temp-file):
(org-babel-screen-test):
* lisp/ob.el:
* lisp/org-colview.el:
(org-columns-todo):
(org-columns-set-tags-or-toggle):
(org-columns-new):
(org-columns-uncompile-format):
(org-agenda-colview-summarize):
* lisp/org-footnote.el:
(electric-indent-mode):
* lisp/org-indent.el:
(org-indent-refresh-maybe):
* lisp/org-list.el:
* lisp/org-macro.el:
(org-macro--collect-macros):
* lisp/org-src.el:
* lisp/org-table.el:
(sort-fold-case):
(org-table-create):
(org-table-field-info):
(org-table-transpose-table-at-point):
(org-table-remove-rectangle-highlight):
(orgtbl-create-or-convert-from-region):
(org-define-lookup-function):
* lisp/ox-ascii.el:
(org-ascii-format-drawer-function):
(org-ascii--has-caption-p):
(org-ascii-bold):
(org-ascii-center-block):
(org-ascii-clock):
(org-ascii-code):
(org-ascii-dynamic-block):
(org-ascii-entity):
(org-ascii-example-block):
(org-ascii-export-snippet):
(org-ascii-export-block):
(org-ascii-fixed-width):
(org-ascii-footnote-reference):
(org-ascii-horizontal-rule):
(org-ascii-inline-src-block):
(org-ascii-format-inlinetask-default):
(org-ascii-italic):
(org-ascii-keyword):
(org-ascii-latex-environment):
(org-ascii-latex-fragment):
(org-ascii-line-break):
(org-ascii-node-property):
(org-ascii-planning):
(org-ascii-quote-block):
(org-ascii-radio-target):
(org-ascii-special-block):
(org-ascii-src-block):
(org-ascii-statistics-cookie):
(org-ascii-subscript):
(org-ascii-superscript):
(org-ascii-strike-through):
(org-ascii-timestamp):
(org-ascii-underline):
(org-ascii-verbatim):
(org-ascii-verse-block):
(org-ascii-filter-headline-blank-lines):
(org-ascii-filter-paragraph-spacing):
(org-ascii-filter-comment-spacing): Use lexical binding.
2015-10-26 01:56:00 +01:00
Nicolas Goaziou
b4af3f0852
Allow more characters in emphasis
...
* lisp/org.el (org-emphasis-regexp-components): Allow singe quote,
double quote and comma as the last character in an emphasis string.
Reported-by: Marcin Borkowski <mbork@mbork.pl>
<http://permalink.gmane.org/gmane.emacs.orgmode/102191 >
2015-10-25 19:20:25 +01:00
Nicolas Goaziou
3072cb28e8
org-agenda: Improve display for repeaters
...
* lisp/org-agenda.el (org-agenda-get-deadlines):
(org-agenda-get-scheduled): For past repeaters, compute the number of
scheduled or deadline days since original date, not closest repeater.
Suggested-by: cesar mena <cmena@pobox.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/101884 >
2015-10-25 18:21:03 +01:00
Nicolas Goaziou
dae03e8790
Fix failing tests
...
* testing/lisp/test-org.el (test-org/closest-date): Remove tests that no
longer apply to current code.
2015-10-25 16:50:41 +01:00
Nicolas Goaziou
ebe2d83eea
Partly revert "Change `org-agenda-repeating-timestamp-show-all' targets"
...
* lisp/org.el (org-closest-date): Handle every type of repeater.
Reported-by: Matt Lundin <mdl@imapmail.org>
<http://permalink.gmane.org/gmane.emacs.orgmode/102021 >
2015-10-25 16:48:50 +01:00
Nicolas Goaziou
842c5f7cb7
Merge branch 'maint'
2015-10-25 15:55:44 +01:00
Nicolas Goaziou
541aa0f62d
org-clock: Fix clocking in
...
* lisp/org-clock.el (org-clock-find-position): Correctly position cursor
on the correct headline.
Reported-by: Jan Malakhovski <oxij@oxij.org>
<http://permalink.gmane.org/gmane.emacs.orgmode/102170 >
2015-10-25 15:51:53 +01:00
Nicolas Goaziou
ba4d3376c1
org-lint: Allow sorting by warning message.
...
* lisp/org-lint.el (org-lint--report-mode): Allow sorting by warning message.
Suggested-by: Rainer M Krug <Rainer@krugs.de>
<http://permalink.gmane.org/gmane.emacs.orgmode/102047 >
2015-10-24 11:41:44 +02:00
Nicolas Goaziou
9508cc4eef
Merge branch 'maint'
2015-10-24 11:39:09 +02:00
Nicolas Goaziou
9277e63352
ob-core: Fix "wrong-type-argument stringp nil"
...
* lisp/ob-core.el (org-babel-merge-params): Tolerate empty :exports
parameter.
Reported-by: Rainer M Krug <Rainer@krugs.de>
<http://permalink.gmane.org/gmane.emacs.orgmode/102005 >
2015-10-24 11:37:46 +02:00
Kyle Meyer
666fd99175
Merge branch 'maint'
2015-10-23 11:19:16 -04:00
Kyle Meyer
8c763ab08c
Restore behavior of '.' in org-read-date
...
* lisp/org.el (org-read-date-minibuffer-local-map): Fix period behavior
broken by e802936
.
Reported-by: Matt Lundin <mdl@imapmail.org>
<http://permalink.gmane.org/gmane.emacs.orgmode/102071 >
2015-10-23 11:15:44 -04:00
Nick Dokos
30ec973c8b
Fix org-bbdb-anniversaries-future.
...
Forgot the mapcar in commit 75f91f0bb7
.
2015-10-20 21:10:52 -04:00
Oleh Krehel
481719fbd5
Clear non-repeated SCHEDULED when marking a repeated DEADLINE done
...
* lisp/org.el (org-auto-repeat-maybe): When a TODO has a DEADLINE
that's repeatable, but SCHEDULED that isn't repeatable, clear the
SCHEDULED after setting the current repeat to DONE.
The repeatable SCHEDULED will be re-scheduled as before.
Reference:
http://stackoverflow.com/questions/18123972/emacs-org-mode-clear-non-repeated-scheduled-time-when-deadline-is-repeated
2015-10-19 14:03:58 +02:00
Nicolas Goaziou
a709aed145
ox: Tiny refactoring
2015-10-18 23:06:08 +02:00
Nicolas Goaziou
9f18368311
Add tests for broken links handling
...
* testing/lisp/test-ox.el (test-org-export/handle-options): Add tests.
2015-10-18 23:02:15 +02:00
Nicolas Goaziou
c2eeaca0ca
ox: Preserve compatibility for Emacs 24.3
2015-10-18 11:02:51 +02:00
Nicolas Goaziou
af4e118870
Merge branch 'maint'
2015-10-18 09:49:15 +02:00
Nicolas Goaziou
4e864643bd
Fix `org-return-follows-link' on links with emphasis
...
* lisp/org.el (org-return): Properly follow links when description is
emphasized. Also tolerate links and timestamps in otherwise forbidden
areas (e.g., comments, node properties...), much like
`org-open-at-point'.
* testing/lisp/test-org.el (test-org/return): Add tests.
Reported-by: Samuel Wales <samologist@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/101977 >
2015-10-18 09:48:54 +02:00
Nicolas Goaziou
486d947761
Merge branch 'maint'
2015-10-18 09:28:30 +02:00
Nicolas Goaziou
8e4650c887
ox-ascii: Fix code typo
...
* lisp/ox-ascii.el (org-ascii--describe-links): Fix code typo introduced
in d6a718a
.
2015-10-18 09:27:28 +02:00
Nicolas Goaziou
bf91460d39
Merge branch 'maint'
2015-10-18 01:41:21 +02:00
Nicolas Goaziou
f01b3fadbc
org-clock: Fix clock drawer creation
...
* lisp/org-clock.el (org-clock-find-position): Create clock drawer when
a drawer is missing, even though requested, but some clocks are
already present in the entry.
Reported-by: Nikolay Kudryavtsev <nikolay.kudryavtsev@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/101973 >
2015-10-18 01:39:36 +02:00
Nicolas Goaziou
158e40f58d
Merge branch 'maint'
2015-10-18 00:03:36 +02:00
Nicolas Goaziou
d6a718a93f
ox-ascii: Fix external id links
...
* lisp/ox-ascii.el (org-ascii--describe-links): Fix export when id link
targets an external file.
Reported-by: Samuel Wales <samologist@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/101978 >
2015-10-18 00:02:31 +02:00
Nicolas Goaziou
b369da2339
org-agenda: Fix last commit
...
* lisp/org-agenda.el (org-agenda-get-deadlines):
(org-agenda-get-scheduled): Fix last commit.
2015-10-17 21:57:53 +02:00
Nicolas Goaziou
005aa06ed5
org-agenda: Skip SCHEDULED and DEADLINE false positives
...
* lisp/org-agenda.el (org-agenda-get-deadlines):
(org-agenda-get-scheduled): Check point is really on a planning line
before proceeding.
2015-10-17 15:49:45 +02:00
Nicolas Goaziou
59761024b1
ox: Add an option to ignore broken links
...
* lisp/ox.el (org-export-with-broken-links): New variable.
(org-export-options-alist): Add new OPTIONS item.
(org-link-broken): New error type.
(org-export-resolve-coderef):
(org-export-resolve-fuzzy-link):
(org-export-resolve-id-link): Raise appropriate error symbol when a link
cannot be resolved.
(org-export-data): Handle new error type.
* doc/org.texi (Export settings): Document new feature.
* testing/lisp/test-ox.el (test-org-export/resolve-id-link):
(test-org-export/resolve-fuzzy-link):
(test-org-export/resolve-coderef): Update tests.
2015-10-17 14:42:07 +02:00