Nicolas Goaziou
3271cbab65
Merge branch 'maint'
2016-11-30 00:17:49 +01:00
Nicolas Goaziou
c3146209ec
org-agenda: Fix priority for deadlines
...
* lisp/org-agenda.el (org-agenda-get-deadlines): Fix priority
computation.
Reported-by: Matt Lundin <mdl@imapmail.org>
<http://permalink.gmane.org/gmane.emacs.orgmode/110519 >
2016-11-30 00:16:56 +01:00
Nicolas Goaziou
28f6fa844d
Merge branch 'maint'
2016-11-29 23:56:50 +01:00
Nicolas Goaziou
ba06303016
org-agenda: Fix time of day presence
...
* lisp/org-agenda.el (org-agenda-get-deadlines): Small refactoring.
(org-agenda-get-scheduled): Do no insert a time of day when current
entry is only a reminder of a previously scheduled task.
Reported-by: Matt Lundin <mdl@imapmail.org>
<http://permalink.gmane.org/gmane.emacs.orgmode/110517 >
2016-11-29 23:55:15 +01:00
Nicolas Goaziou
e53452c76c
Merge branch 'maint'
2016-11-29 09:30:10 +01:00
Lixin Chin
f5916c4fbb
Relax the match criteria for MathML header line
...
* lisp/org.el (org-create-math-formula): Allow the xmlns attribute to
be preceded by any other mathml header attribute.
The problem here was that the match criteria for MathML assumed that
the xmlns attribute is the first listed in the top level MathML <math>
element. Some LaTeX -> MathML converters (e.g., pandoc) will add
attributes before xmlns, which is still valid MathML.
2016-11-29 09:28:06 +01:00
Lixin Chin
73694b21d7
ox-odt.el: Fix LaTeX formulae in opendocument exports
...
* lisp/ox-odt.el (org-odt--translate-latex-fragments): Apply signature
change for `org-format-latex'.
Commit a24f339f58
changed the signature
for `org-format-latex' (lisp/org.el) to add `beg' and `end' optional
parameters. This led to an error in ox-odt.el when exporting an
odt document containing LaTeX formulae.
2016-11-29 09:24:11 +01:00
Kyle Meyer
3d80b3545e
Merge branch 'maint'
2016-11-28 18:56:17 -05:00
Kyle Meyer
6983f8e8bf
Issue user-error when trying to drag before first element
...
* lisp/org.el (org-drag-element-backward):
(org-drag-element-forward): Check that org-element-at-point returns a
non-nil value to avoid a type-error when called before first element.
* testing/lisp/test-org.el (test-org/drag-element-backward):
(test-org/drag-element-forward): Add test for when point is before
first element. Adjust existing should-error calls to specify
user-error.
2016-11-28 18:40:43 -05:00
Nicolas Goaziou
9d5e9dc312
Merge branch 'maint'
2016-11-28 01:37:01 +01:00
Nicolas Goaziou
9299efa351
org-agenda: Fix deadlines
...
* lisp/org-agenda.el (org-agenda-get-deadlines): Fix deadlines
display. Also improve priority adjustment.
2016-11-28 01:35:21 +01:00
Nicolas Goaziou
aa15dc1820
Merge branch 'maint'
2016-11-27 23:46:13 +01:00
Nicolas Goaziou
6907766913
org-agenda: Fix docstrings
...
* lisp/org-agenda.el (org-agenda-skip-scheduled-if-done): Tiny rewording.
(org-agenda-skip-deadline-if-done): Fix typo.
2016-11-27 23:45:35 +01:00
Nicolas Goaziou
abbf497b84
org-agenda: Fix done scheduled display
...
* lisp/org-agenda.el (org-agenda-get-scheduled): Skip done scheduled
unconditionally whenever the base date is not the one currently
considered.
2016-11-27 23:43:00 +01:00
Nicolas Goaziou
345449d088
Merge branch 'maint'
2016-11-27 23:09:48 +01:00
Nicolas Goaziou
4b99ed5eb0
org-agenda: Fix repeated time stamps
...
* lisp/org-agenda.el (org-agenda-get-timestamps): Properly handle
repeated time stamps. Refactor code. Improve docstring.
2016-11-27 23:09:23 +01:00
Nicolas Goaziou
2998a139c4
Tiny fix
...
* lisp/org.el (org-at-clock-log-p): Use `beginning-of-line' instead of
`move-beginning-of-line'.
2016-11-27 23:09:15 +01:00
Nicolas Goaziou
8887e1de1c
Merge branch 'maint'
2016-11-27 12:20:30 +01:00
Nicolas Goaziou
7fc980f75e
Tiny docstring fix
...
* lisp/org.el (org-compile-file): Fix docstring.
2016-11-27 12:20:01 +01:00
Nicolas Goaziou
8165eb9156
Merge branch 'maint'
2016-11-27 12:09:23 +01:00
Nicolas Goaziou
289363d510
Fix LaTeX preview
...
* lisp/org.el (org-compile-file): Introduce new %O placeholder.
(org-preview-latex-process-alist): Use it.
* lisp/ox-latex.el (org-latex-pdf-process):
* lisp/ox-man.el (org-man-pdf-process):
* lisp/ox-texinfo.el (org-texinfo-info-process): Document it.
Reported-by: Scott Otterson <scotto@sharpleaf.org>
<http://permalink.gmane.org/gmane.emacs.orgmode/110464 >
2016-11-27 12:07:11 +01:00
Chunyang Xu
4ea7ffe50d
org-mac-link: Add autoload cookies for all commands
...
* contrib/lisp/org-mac-link.el (org-mac-grab-link):
(org-mac-firefox-get-frontmost-url):
(org-mac-firefox-insert-frontmost-url):
(org-mac-vimperator-get-frontmost-url):
(org-mac-vimperator-insert-frontmost-url):
(org-mac-chrome-get-frontmost-url):
(org-mac-chrome-insert-frontmost-url):
(org-mac-safari-get-frontmost-url):
(org-mac-safari-insert-frontmost-url):
(org-mac-together-get-selected):
(org-mac-together-insert-selected):
(org-mac-finder-item-get-selected):
(org-mac-finder-insert-selected):
(org-mac-addressbook-item-get-selected):
(org-mac-addressbook-insert-selected):
(org-mac-skim-get-page):
(org-mac-skim-insert-page):
(org-mac-acrobat-get-page):
(org-mac-acrobat-insert-page):
(org-mac-outlook-message-get-links):
(org-mac-outlook-message-insert-selected):
(org-mac-outlook-message-insert-flagged):
(org-mac-evernote-note-insert-selected):
(org-mac-devonthink-item-insert-selected):
(org-mac-message-get-links):
(org-mac-message-insert-selected):
(org-mac-message-insert-flagged): Add autoload cookie.
2016-11-26 11:39:59 +01:00
Nicolas Goaziou
dffd30b24e
Merge branch 'maint'
2016-11-26 00:18:28 +01:00
Nicolas Goaziou
ee7721f795
org-clock: Fix clock tables with file list scope
...
* lisp/org-clock.el (org-dblock-write:clocktable): Handle scope as
a list of files.
Reported-by: Nikolay Kudryavtsev <nikolay.kudryavtsev@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/110452 >
2016-11-26 00:15:44 +01:00
Nicolas Goaziou
f50c44897a
Merge branch 'maint'
2016-11-25 18:02:11 +01:00
Nicolas Goaziou
b77ef877ab
org-agenda: Fix "no-catch --cl-block-nil--"
...
* lisp/org-agenda.el (org-agenda-get-category-icon): Use `cl-dolist'
instead of `dolist'.
Reported-by: Karl Voit <devnull@Karl-Voit.at>
<http://permalink.gmane.org/gmane.emacs.orgmode/110443 >
2016-11-25 17:49:13 +01:00
Nicolas Goaziou
8bf0d32aed
Merge branch 'maint'
2016-11-25 12:23:24 +01:00
Nicolas Goaziou
2e35a59763
ox-latex: Fix error when compiling in a different than source file
...
* lisp/ox-latex.el (org-latex-compile): List logfiles with their full
name instead of relative ones.
Reported-by: Éric Würbel <eric.wurbel@univ-amu.fr>
<http://permalink.gmane.org/gmane.emacs.orgmode/110402 >
2016-11-25 12:22:54 +01:00
Nicolas Goaziou
b769b57ec4
Merge branch 'maint'
2016-11-25 02:08:46 +01:00
Nicolas Goaziou
26828778c6
org-agenda: Fix previous commit
...
* lisp/org-agenda.el (org-agenda-get-timestamps):
(org-agenda-get-deadlines): Apply `org-agenda--timestamp-to-absolute'
signature change.
2016-11-25 02:07:54 +01:00
Nicolas Goaziou
d82811a4f9
Merge branch 'maint'
2016-11-25 01:54:14 +01:00
Nicolas Goaziou
69ec6258b6
org-agenda: Fix scheduled dates display
...
* lisp/org.el (org-time-string-to-absolute): Change signature.
* lisp/org-agenda.el (org-agenda-get-scheduled): Fix various glitches
in scheduled dates display. Also fix such dates when
`org-agenda-repeating-timestamp-show-all' is nil. Apply signature
change.
Reported-by: Samuel Wales <samologist@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/110116 >
2016-11-25 01:51:42 +01:00
Nicolas Goaziou
a43eaccfce
Merge branch 'maint'
2016-11-21 23:25:51 +01:00
Nicolas Goaziou
0dd024aa92
ob-js: Fix error when code block ends with a comment
...
* lisp/ob-js.el (org-babel-js-function-wrapper): Isolate body within
wrapper.
Reported-by: Compro Prasad <comproprasad@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/110390 >
2016-11-21 23:21:23 +01:00
Nicolas Goaziou
b06259357a
Merge branch 'maint'
2016-11-20 09:38:13 +01:00
Nicolas Goaziou
0bdf18befd
test-ob: Fix failing test on MacOS
...
* testing/lisp/test-ob.el (test-ob/indented-cached-org-bracket-link):
Use `expand-file-name' to prevent introducing "//" patterns in file
name.
Reported-by: David Talmage <david.talmage@shoutpoint.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/110285 >
2016-11-20 09:36:42 +01:00
Nicolas Goaziou
e257da172c
Merge branch 'maint'
2016-11-19 23:18:38 +01:00
Nicolas Goaziou
1319a3be44
ox-html: Fix %d placeholder in pre/postamble string
...
* lisp/ox-html.el (org-html-format-spec): Correctly apply
`org-html-metadata-timestamp-format' on %d placeholder.
Reported-by: Pavel Panchekha <me@pavpanchekha.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/110374 >
2016-11-19 23:17:32 +01:00
Nicolas Goaziou
db0377ddc6
Merge branch 'maint'
2016-11-19 23:09:33 +01:00
Nicolas Goaziou
c3c33841eb
Merge branch 'maint' of orgmode.org:org-mode into maint
2016-11-19 23:08:33 +01:00
Nicolas Goaziou
9e2dc98eef
Fix error when exporting body only of an empty buffer
...
* lisp/ox.el (org-export-filter-apply-functions): Return empty string
instead of nil when a filter returns the empty string.
* testing/lisp/test-ox.el (test-org-export/export-scope): Add test.
(test-org-export/filter-apply-functions): New test.
Reported-by: "Stefan-W. Hahn" <stefan.hahn@s-hahn.de>
<http://permalink.gmane.org/gmane.emacs.orgmode/110371 >
2016-11-19 23:08:12 +01:00
Kyle Meyer
bc0bebbc43
Merge branch 'maint'
2016-11-19 16:50:37 -05:00
Eli Zaretskii
d31c8ef17c
Backport commit 5b0cddd from Emacs
...
* doc/orgcard.tex: Change "GNU Emacs" to "this document" in copyright
notices. (Bug#24520)
More fixes in copyright notices in etc/refcards/
5b0cddd91535025bbf0c69d17e2d4e470dd350c5
Eli Zaretskii
Tue Nov 15 19:01:07 2016 +0200
2016-11-19 16:50:27 -05:00
Eli Zaretskii
68760e703e
Backport commit f994c20 from Emacs
...
* doc/orgcard.tex: Update the copyright blurb. (Bug#24520)
Update copyright text in refcards
f994c2046588b168c1a4a900879cdffaf9d02f01
Eli Zaretskii
Sun Nov 13 18:20:59 2016 +0200
2016-11-19 16:49:19 -05:00
Paul Eggert
ad5e2aed21
Backport commit dc152c5 from Emacs
...
Apple changed the spelling of its operating system again, to "macOS",
effective with macOS 10.12 Sierra (2016-09-20). Change Emacs
documentation and comments to match this. Stick with older OS
spellings ("OS X", "Mac OS X") when talking about older releases where
the older names are more correct.
Modernize usage of 'macOS' in doc and comments
dc152c54f4e44f5f2040883b03f71ff6aa66c893
Paul Eggert
Sun Nov 6 00:42:03 2016 -0700
2016-11-19 16:49:15 -05:00
Nicolas Goaziou
2c466ebff2
ob-clojure: Normalize :show-process syntax
...
* lisp/ob-clojure.el (org-babel-execute:clojure): :show-process
requires a non-nil (and non "no") value.
2016-11-19 07:39:05 +01:00
Nicolas Goaziou
cd4186c5c3
ob-clojure: Small refactoring
...
* lisp/ob-clojure.el (org-babel-execute:clojure): Small refactoring.
2016-11-19 07:35:23 +01:00
Frederick Giasson
56c0ce4a8d
ob-clojure: Add :show-process
...
* lisp/ob-clojure.el (org-babel-clojure-sync-nrepl-timeout): New variable.
(org-babel-execute:clojure): Implement :show-process. Better error
handling.
2016-11-19 00:30:39 +01:00
Nicolas Goaziou
68df8bc4fd
Merge branch 'maint'
2016-11-18 23:04:15 +01:00
Nicolas Goaziou
b3125dc84b
ox-icalendar: Use \r\n instead of \n as line breaks
...
* lisp/ox-icalendar.el (org-icalendar-fold-string): Break lines with
\r\n instead of \n, per RFC 5545.
Reported-by: Stephen Eglen <sje30@cam.ac.uk>
<http://permalink.gmane.org/gmane.emacs.orgmode/110306 >
2016-11-18 23:03:01 +01:00