Commit Graph

17730 Commits

Author SHA1 Message Date
Nicolas Goaziou 9c5588377f Fix COMMENT fontification
* lisp/org.el (org-set-font-lock-defaults): Fix regexp.

Reported-by: Martin Carlé <mc@aiguphonie.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/100404>
2015-08-23 22:45:27 +02:00
Nicolas Goaziou 9a792523d6 Merge branch 'maint' 2015-08-23 09:44:45 +02:00
Nikolai Weibull 983170c0bc Redo Agenda in more cases even in sticky mode
* org-agenda.el (org-agenda-maybe-redo): Test for
org-agenda-this-buffer-name as well.

The Agenda buffer will have a different name if it’s in sticky mode,
but some commands that alter the agenda should still redo it, for
example, org-agenda-remove-restriction-lock, just like
org-agenda-filter-by-category does.
2015-08-23 09:44:13 +02:00
Kyle Meyer 8b8476e995 Merge branch 'maint' 2015-08-22 16:52:07 -04:00
Kyle Meyer 6629a9b5ba org.texi: Fix typo
* doc/org.texi (Clocking commands): Fix typo.
2015-08-22 16:51:42 -04:00
Kyle Meyer 0712154a0b Backport commit c1cacb0 from Emacs master branch
* lisp/org-gnus.el (org-gnus-no-new-news):
Prefer (substitute-command-keys "`\\[foo-command]'")
to "`M-x foo-command'" in docstrings and the like.

Avoid hard-coding "M-x command" in docstrings
c1cacb09948928287bfc32745f2a92604d3291c4
Paul Eggert
Fri Aug 21 14:09:47 2015 -0700
2015-08-22 16:51:38 -04:00
Nicolas Goaziou 6615d57cce Merge branch 'maint' 2015-08-22 21:43:28 +02:00
Nicolas Goaziou 949fc352cb org-datetree: Fix DATE_TREE search
* lisp/org-datetree.el (org-datetree-find-date-create): Ignore case and
  discard false positives (e.g., a fake property in an example block).

* testing/lisp/test-org-datetree.el: New file.
2015-08-22 21:40:54 +02:00
Nicolas Goaziou 77c8fff219 Merge branch 'maint' 2015-08-22 00:59:16 +02:00
Nicolas Goaziou 3a6c9f5f06 org-capture: Fix bindings in header line
* lisp/org-capture.el (org-capture-mode): Display currently used
  bindings in header line.
2015-08-22 00:54:14 +02:00
Nicolas Goaziou e4cb441915 Merge branch 'maint' 2015-08-22 00:28:20 +02:00
Nicolas Goaziou e1ac95736c org-datetree: Fix datetree capture
* lisp/org-datetree.el (org-datetree-add-timestamp): Clarify docstring.
(org-datetree-insert-line): Leave point on new entry.
2015-08-22 00:25:04 +02:00
Marc Ihm 33ec3be7b1 org-index.el version 4.3 2015-08-21 23:56:52 +02:00
Nicolas Goaziou 2316925ecb Revert "org-capture: Fix datetree capture"
This reverts commit a834a5939f.
2015-08-21 23:48:36 +02:00
Nicolas Goaziou 1e62fefeee Merge branch 'maint' 2015-08-21 23:33:13 +02:00
Nicolas Goaziou a834a5939f org-capture: Fix datetree capture
* lisp/org-capture.el (org-capture-set-target-location): Fix
  file+datetree capture with non-nil `org-datetree-add-timestamp.

Reported-by: Gregor Zattler <telegraph@gmx.net>
<http://permalink.gmane.org/gmane.emacs.orgmode/100300>
2015-08-21 23:31:23 +02:00
Rasmus dbf2c95774 Revert "Merge branch 'maint'"
This reverts commit cadb9f3603, reversing
changes made to f6be2b5aa3.
2015-08-21 22:26:11 +02:00
Rasmus a53620d841 Revert "org.el: Update Version and Package-Requires header"
This reverts commit 97d43ff681.
2015-08-21 22:26:00 +02:00
Rasmus 6d3c988561 Revert "org.el: Add version header"
This reverts commit 182552ee75.
2015-08-21 22:23:42 +02:00
Nicolas Goaziou 93fc10a141 Merge branch 'maint' 2015-08-21 14:46:55 +02:00
Nicolas Goaziou 56cd178cae org-indent: Fix indentation in inline tasks
* lisp/org-indent.el (org-indent-add-properties): Indent inline tasks'
  contents according to current outline level, not inlinetask's.  This
  is consistent with hard indentation, using `org-indent-line'.
2015-08-21 14:44:26 +02:00
Nicolas Goaziou a8a60cc7f7 Merge branch 'maint' 2015-08-21 14:08:14 +02:00
Nicolas Goaziou 183348cda5 Fix typo
* lisp/org.el (org-open-at-point): Fix typo.

Reported-by: Sergei Nosov <sergei.nosov@gmail.com>
2015-08-21 14:07:26 +02:00
Nicolas Goaziou 5f217e6fd5 Merge branch 'maint' 2015-08-21 13:59:10 +02:00
Nicolas Goaziou daa8e23175 Fix expansion of archived trees
* lisp/org.el (org-hide-archived-subtrees): Do not assume BEG is at
  beginning of line.  This matters when function is called with point in
  the middle of an archived headline.

Reported-by: Hymie! <hymie@lactose.homelinux.net>
<http://permalink.gmane.org/gmane.emacs.orgmode/100291>
2015-08-21 13:56:50 +02:00
Nicolas Goaziou fa0876fe2e Merge branch 'maint' 2015-08-20 21:09:38 +02:00
Nicolas Goaziou 1272458926 Merge branch 'fix-indent' into maint 2015-08-20 21:04:32 +02:00
Nicolas Goaziou 41b7c46519 Merge branch 'maint' 2015-08-20 14:05:27 +02:00
Nicolas Goaziou a72c58178d Fix f4d7646
* lisp/org.el (org-deadline):
(org-schedule): Remove spurious argument.
2015-08-20 14:02:39 +02:00
Nicolas Goaziou 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
Nicolas Goaziou 5269279bf4 Merge branch 'maint' 2015-08-19 16:51:29 +02:00
Nicolas Goaziou 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
Nicolas Goaziou aa7dfd54de Revert "ox-latex.el: Resurrect `org-latex-with-hyperref'"
This reverts commit 6f41105bd9.
2015-08-19 16:45:01 +02:00
Nicolas Goaziou 016d84fe8f Merge branch 'maint' 2015-08-19 16:24:55 +02:00
Nicolas Goaziou eb62138ed0 Fix 93b73bd
* lisp/org-element.el (org-element-link-parser): Fix 93b73bd.
2015-08-19 16:24:34 +02:00
Nicolas Goaziou ad685348fd Merge branch 'maint' 2015-08-19 16:09:13 +02:00
Nicolas Goaziou 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
Nicolas Goaziou 3733658bb5 Merge branch 'maint' 2015-08-19 15:23:47 +02:00
Nicolas Goaziou 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
Nicolas Goaziou c5cbc6936e Merge branch 'maint' 2015-08-19 11:15:52 +02:00
Nicolas Goaziou 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
Nicolas Goaziou 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
Bastien c9872990ed Merge branch 'maint' 2015-08-18 19:24:27 +02:00
Bastien 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
Bastien 88cc2a422d Merge branch 'maint' 2015-08-18 18:02:57 +02:00
Grant Rettke 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
Bastien afa64d6f10 Merge branch 'maint' 2015-08-18 17:59:09 +02:00
Eric Abrahamsen 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
Bastien 34c458929a Merge branch 'maint' 2015-08-18 11:53:54 +02:00
Bastien 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