1272458926
Merge branch 'fix-indent' into maint
2015-08-20 21:04:32 +02:00
41b7c46519
Merge branch 'maint'
2015-08-20 14:05:27 +02:00
a72c58178d
Fix f4d7646
...
* lisp/org.el (org-deadline):
(org-schedule): Remove spurious argument.
2015-08-20 14:02:39 +02:00
4e74897153
org-indent: Fix indentation with proportional font
...
* lisp/org-indent.el (org-indent-max):
(org-indent-max-levels):
(org-indent-strings):
(org-indent-stars): Remove unused variables.
(org-indent-initialize): Remove function.
(org-indent-boundary-char): Remove unnecessary comment. Do not rely on
function above.
(org-indent): Make sure characters used for virtual indentation are
invisible since they are not necessarily white spaces.
(org-indent-set-line-properties): Fix indentation with proportional
font, i.e., do not use only white spaces to indent.
(org-indent-add-properties): Apply changes above.
Reported-by: Jakub Szypulka <jakub@szypulka.de>
<http://permalink.gmane.org/gmane.emacs.orgmode/100252 >
2015-08-20 13:58:00 +02:00
5269279bf4
Merge branch 'maint'
2015-08-19 16:51:29 +02:00
f9f35bc79b
ox-latex: Allow nil for `org-latex-hyperref-template'
...
* lisp/ox-latex.el (org-latex-hyperref-template): Allow nil value. Make
`org-latex-with-hyperref' an obsolete alias for the variable.
<http://permalink.gmane.org/gmane.emacs.orgmode/100222 >
2015-08-19 16:51:07 +02:00
aa7dfd54de
Revert "ox-latex.el: Resurrect `org-latex-with-hyperref'"
...
This reverts commit 6f41105bd9
2015-08-19 16:45:01 +02:00
016d84fe8f
Merge branch 'maint'
2015-08-19 16:24:55 +02:00
eb62138ed0
Fix 93b73bd
...
* lisp/org-element.el (org-element-link-parser): Fix 93b73bd
2015-08-19 16:24:34 +02:00
ad685348fd
Merge branch 'maint'
2015-08-19 16:09:13 +02:00
f4d76465be
Fix new time logging upon rescheduling
...
* lisp/org.el (org-deadline):
(org-schedule): Properly store new time so it is accessible using "%s"
in `org-log-note-headings'.
Reported-by: Malcolm Purvis <malcolm@purvis.id.au>
<http://permalink.gmane.org/gmane.emacs.orgmode/100211 >
2015-08-19 16:07:22 +02:00
3733658bb5
Merge branch 'maint'
2015-08-19 15:23:47 +02:00
93b73bd303
Fix translated link
...
* lisp/org-element.el (org-element-link-parser): Call
`org-link-translation-function' if required.
(org-element-link-interpreter): Build link from type and path instead of
simply pasting raw value.
* lisp/org.el (org-translate-link): Call parser to extract proper path
and type.
* testing/lisp/test-org-element.el (test-org-element/link-interpreter):
Add test.
Reported-by: Sergei Nosov <sergei.nosov@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/100227 >
2015-08-19 15:22:22 +02:00
c5cbc6936e
Merge branch 'maint'
2015-08-19 11:15:52 +02:00
1abc4887a2
Fix `org-entry-properties' with default priority
...
* lisp/org.el (org-entry-properties): When no priority is explicitly
set, report `org-default-priority' instead.
* testing/lisp/test-org.el (test-org/entry-properties): Update test.
2015-08-19 11:12:43 +02:00
cf31ea1660
ox-html: Rename `org-html-html5-fancy-p' to `org-html--html5-fancy-p'
...
* lisp/ox-html.el (org-html--html5-fancy-p): Renamed from
`org-html-html5-fancy-p'. Add docstring.
(org-html--wrap-image):
(org-html-template):
(org-html-toc):
(org-html-special-block): Apply renaming.
As an internal function, it should follow the convention of double
hyphens in its name.
2015-08-19 11:07:06 +02:00
c9872990ed
Merge branch 'maint'
2015-08-18 19:24:27 +02:00
6f41105bd9
ox-latex.el: Resurrect `org-latex-with-hyperref'
...
* ox-latex.el (latex): Resurrect :latex-hyperref-p.
(org-latex-with-hyperref): Resurrect.
(org-latex-template): Use :latex-hyperref-p.
* org.texi (Beamer specific export settings)
(@LaTeX{} specific export settings): Mention both
`org-latex-hyperref-template' and `org-latex-with-hyperref'.
Thanks to Scott Randby for raising this issue.
2015-08-18 19:23:34 +02:00
88cc2a422d
Merge branch 'maint'
2015-08-18 18:02:57 +02:00
ffbf9119cd
org.texi: Fix case of `results' header-arg node
...
* org.texi (Top, Specific header arguments, var)
(Results of evaluation): Lowercase "results".
2015-08-18 18:02:30 +02:00
afa64d6f10
Merge branch 'maint'
2015-08-18 17:59:09 +02:00
f149060678
Add function to better guard html5 exports
...
* lisp/ox-html.el (org-html-html5-fancy-p): New function to check
that we are exporting to HTML5 and that the user has requested
fancy elements.
(org-html--wrap-image, org-html-template, org-html-toc)
(org-html-special-block): Use the new function.
2015-08-18 17:59:01 +02:00
34c458929a
Merge branch 'maint'
2015-08-18 11:53:54 +02:00
682bb962f3
org.el (org-occur): Match timestamps at the end of a headline
...
* org.el (org-occur): Workaround to match timestamps at the
end of a headline.
2015-08-18 11:53:45 +02:00
af7ea548b0
Merge branch 'maint'
2015-08-17 20:43:03 +02:00
a03cd64994
Fix c6d9a4ec
...
* org.el (org-check-before-date, org-check-after-date): Save
match data.
2015-08-17 20:42:50 +02:00
40b4ef3345
org-element: Use pcase instead of case
...
* lisp/org-element.el (org-element--set-regexps):
(org-element-copy):
(org-element-item-interpreter):
(org-element-latex-fragment-parser):
(org-element-timestamp-parser):
(org-element-timestamp-interpreter):
(org-element--next-mode):
(org-element--object-lex):
(org-element--cache-find):
(org-element--cache-after-change): Use pcase instead of case.
2015-08-17 10:58:57 +02:00
7b6bd0b858
Merge branch 'maint'
2015-08-16 19:31:01 +02:00
17a225621c
ox-odt: Small refactoring
...
* lisp/ox-odt.el (org-odt-footnote-reference): Small refactoring.
2015-08-16 19:30:39 +02:00
86170ff501
Merge branch 'maint'
2015-08-16 16:02:20 +02:00
55544780e2
ox-html.el (org-html-use-unicode-chars): Delete.
...
* ox-html.el (org-html-use-unicode-chars): Delete.
(html, org-html-final-function): Update.
* org.texi (Publishing options): Don't mention
`org-html-use-unicode-chars'.
Thanks to Vladimir Alexiev for raising this.
2015-08-16 16:01:57 +02:00
102def89d8
mk/server.mk: Add etc/ORG-NEWS to the ELPA package
2015-08-16 15:34:32 +02:00
97ae158e88
Merge branch 'maint'
2015-08-16 15:22:22 +02:00
43fa7d9535
etc/ORG-NEWS: Minor rephrasing
2015-08-16 15:21:38 +02:00
da83bf584d
Merge branch 'maint'
2015-08-16 15:15:09 +02:00
c27c101fa3
org.el: Fix `org-comment-string' fontification
...
* org.el (org-set-font-lock-defaults): Don't fontify
`org-comment-string' when not in a headline.
2015-08-16 15:14:27 +02:00
d25d9fd447
Merge branch 'maint'
2015-08-16 14:59:24 +02:00
d3fd2d04ba
Document :environment for LaTeX export of example blocks
2015-08-16 14:59:12 +02:00
25b02e7cc8
Merge branch 'maint'
2015-08-15 23:50:27 +02:00
8d00cd8966
ox-odt: Fix footnote export
...
* lisp/ox-odt.el (org-odt-footnote-reference): Only inline footnotes are
to be wrapped within a paragraph.
Reported-by: Gerald Wildgruber <Gerald.Wildgruber@unibas.ch> <>
<http://permalink.gmane.org/gmane.emacs.orgmode/100084 >
2015-08-15 23:46:55 +02:00
69b0db33a1
Merge branch 'maint'
2015-08-15 10:31:00 +02:00
23e629545b
Rearrange; better advertize changes about COMMENT
2015-08-15 10:30:26 +02:00
b29bd5ce8a
Fix links: use the new cgit interface
2015-08-15 10:29:44 +02:00
80a6262ca1
Silence byte-compiler
...
* lisp/ox.el (org-export-backend):
(org-export-define-backend):
(org-export-define-derived-backend):
(org-export--get-subtree-options):
(org-export--get-inbuffer-options):
(org-export--collect-headline-numbering):
(org-export--selected-trees):
(org-export--skip-p):
(org-export--delete-comments):
(org-export--remove-uninterpreted-data-1):
(org-export--merge-external-footnote-definitions):
(org-export-insert-default-template):
(org-export-expand-include-keyword):
(org-export--inclusion-absolute-lines):
(org-export-collect-footnote-definitions):
(org-export-get-footnote-number):
(org-export-get-reference):
(org-export-get-ordinal):
(org-export-unravel-code):
(org-export-format-code):
(org-export-format-code-default):
(org-export-table-has-header-p):
(org-export-table-row-group):
(org-export-table-cell-alignment):
(org-export-table-row-number):
(org-export-table-dimensions):
(org-export-table-cell-address):
(org-export-get-table-cell-at):
(org-export--smart-quote-status):
(org-export-get-previous-element):
(org-export-get-next-element):
(org-export-dispatch):
(org-export--dispatch-ui):
(org-export--dispatch-action): Silence byte-compiler.
2015-08-15 00:33:11 +02:00
d47f03ca24
ox: Activate lexical binding
...
* lisp/ox.el (org-export-define-backend):
(org-export-define-derived-backend): Remove unused argument.
(org-export--get-inbuffer-options):
(org-export--list-bound-variables):
(org-export--selected-trees):
(org-export-transcoder):
(org-export--prune-tree):
(org-export--merge-external-footnote-definitions):
(org-export--footnote-reference-map):
(org-export-get-alt-title):
(org-export-get-node-property):
(org-export-table-row-is-special-p):
(org-export-table-dimensions):
(org-export-stack-refresh): Refactor code.
* testing/lisp/test-ox.el (org-test-default-backend):
(test-org-export/with-backend):
(test-org-export/footnote-first-reference-p): Comply to lexical binding.
2015-08-15 00:11:20 +02:00
425f4a8e60
org-element: Activate lexical binding
...
* lisp/org-element.el (org-element-section-parser):
(org-element-planning-interpreter):
(org-element-table-row-parser):
(org-element-timestamp-interpreter): Silence byte-compiler. Tiny
refactoring.
(org-element--parse-objects): Tiny refactoring.
(org-element-interpret-data): Refactor code.
(org-element--interpret-data-1): Remove function.
(org-element-center-block-interpreter):
(org-element-item-parser):
(org-element-plain-list-interpreter):
(org-element-property-drawer-interpreter):
(org-element-quote-block-interpreter):
(org-element-section-interpreter):
(org-element-babel-call-interpreter):
(org-element-clock-interpreter):
(org-element-comment-interpreter):
(org-element-comment-block-interpreter):
(org-element-diary-sexp-interpreter):
(org-element-example-block-interpreter):
(org-element-export-block-interpreter):
(org-element-fixed-width-interpreter):
(org-element-horizontal-rule-interpreter):
(org-element-keyword-interpreter):
(org-element-latex-environment-interpreter):
(org-element-node-property-interpreter):
(org-element-paragraph-interpreter):
(org-element-src-block-interpreter):
(org-element-verse-block-interpreter):
(org-element-bold-interpreter):
(org-element-code-interpreter):
(org-element-entity-interpreter):
(org-element-export-snippet-interpreter):
(org-element-inline-babel-call-interpreter):
(org-element-inline-src-block-interpreter):
(org-element-italic-interpreter):
(org-element-latex-fragment-interpreter):
(org-element-line-break-interpreter):
(org-element-link-parser):
(org-element-macro-interpreter):
(org-element-radio-target-interpreter):
(org-element-statistics-cookie-interpreter):
(org-element-strike-through-interpreter):
(org-element-table-cell-interpreter):
(org-element-target-interpreter):
(org-element-underline-interpreter):
(org-element-verbatim-interpreter):
(org-element-map):
(org-element-normalize-contents): Silence byte-compiler.
2015-08-14 23:10:08 +02:00
b9b500afd9
Merge branch 'maint'
2015-08-14 22:36:51 +02:00
80b1ebc681
Remove references to ChangeLog
...
* README_contribute: Remove references to ChangeLog. Instead,
reference the Emacs `CONTRIBUTE' file which documents how to
format git commit messages.
TINYCHANGE
2015-08-14 22:34:41 +02:00
453492ca95
org.el: Fix recursive regexp backtracking
...
* org.el (org-link-search): Avoid recursive regexp backtracking behavior
when following search links.
<http://article.gmane.org/gmane.emacs.orgmode/100010 >
TINYCHANGE
2015-08-14 22:33:08 +02:00
fc7ce0777d
org-lint: Fix compilation error
...
* lisp/org-lint.el (org-lint-wrong-include-link-parameter): Remove
spurious argument.
2015-08-14 18:19:05 +02:00
Nicolas Goaziou
Bastien
Grant Rettke
Eric Abrahamsen
Philip