Commit Graph

2689 Commits

Author SHA1 Message Date
Bastien Guerry a002158b9f Merge branch 'maint' 2013-02-27 18:14:16 +01:00
Nicolas Richard 8e22aafe9a Fix b6b509b one more time. 2013-02-27 18:13:48 +01:00
Bastien Guerry 6cc600d074 Merge branch 'maint' 2013-02-27 17:28:38 +01:00
Bastien Guerry 01748861d4 Fix b6b509b again.
Thanks to Nicolas Richard for reporting this.
2013-02-27 17:28:33 +01:00
Bastien Guerry 692f053d80 Merge branch 'maint' 2013-02-27 14:49:46 +01:00
Bastien Guerry c8c26c8e19 Enhance the fix implemented in 41882a99
* org.el (org-mode): Add `org-fix-ellipsis-at-bol' to
`isearch-mode-end-hook' so that any isearch fixes the problem with
ellipsis on the first line.
(org-fix-ellipsis-at-bol): New defsubst.
(org-show-context, org-isearch-end): Use it.
2013-02-27 14:49:30 +01:00
Bastien Guerry 936f13c629 Merge branch 'master' of orgmode.org:org-mode 2013-02-27 13:27:56 +01:00
Nicolas Goaziou 8506223b27 Fix function declaration 2013-02-27 10:36:07 +01:00
Bastien Guerry 7c8e854d9c org.el (org-speed-command-activate): Don't activate speed commands within blocks
* org.el (org-speed-command-activate): Don't activate speed
commands within blocks.

Thanks to Sébastien Vauban for reporting this.
2013-02-27 10:22:20 +01:00
Nicolas Goaziou c086ea0832 Fix infloop when user provides a wrong value for `org-highlight-latex-and-related'
* lisp/org.el (org-do-latex-and-related): Fix infloop when user
  provides a wrong value for `org-highlight-latex-and-related'. In
  this case, `org-latex-and-related-regexp' is the empty string and
  generates an infloop since matching it doesn't move point.
2013-02-27 10:00:40 +01:00
Nicolas Goaziou bb45dd1074 Fix function declaration 2013-02-26 23:47:07 +01:00
Nicolas Goaziou 677433d9b4 ox: Fix bug where properties read from setupfile overwrite previous properties
* lisp/ox.el (org-export--get-inbuffer-options): Remove an optional
  argument.  Rewrite function.  Properties read from a setupfile do
  not overwrite anymore previously computed properties.
(org-export-get-environment): Apply changes to previous function.
* lisp/org.el (org-create-formula--latex-header): Apply arity change
  from `org-export--get-inbuffer-options'.
* testing/lisp/test-ox.el: Add test.
* testing/examples/setupfile.org: New file.
2013-02-26 23:35:36 +01:00
Bastien Guerry 78c4199310 Merge branch 'maint'
Conflicts:
	lisp/org.el
2013-02-26 22:45:41 +01:00
Bastien Guerry 41882a99d3 Fix a longstanding issue with ellispsis on top of the window
* org.el (org-show-context): Remove useless catch.  Make sure the
top of the window is a visible headline.
* org.el (org-activate-plain-links): Remove unused catch.

* org-macs.el (org-get-alist-option): Return nil, not (nil), so
that `org-show-context' DTRT.

Thanks to Samuel Wales for his patience in reporting this.
2013-02-26 22:45:04 +01:00
Bastien Guerry ebe0fbd6a8 Merge branch 'maint' 2013-02-26 22:02:25 +01:00
Bastien Guerry 2b13d090d1 org.el (org-imenu-get-tree): Fix bug when matching against empty headlines
* org.el (org-imenu-get-tree): Fix bug when matching against empty
headlines.

Thanks to Jambunathan for reporting this.
2013-02-26 22:02:13 +01:00
Bastien Guerry 5bdb84ba74 org.el: Add :version and :package-version to `orgstruct-heading-prefix-regexp' 2013-02-26 18:23:53 +01:00
Bastien Guerry 3ee229dcd1 Merge branch 'master' of orgmode.org:org-mode 2013-02-26 18:21:40 +01:00
Bastien Guerry 295b0ba5d1 Bump :version to "24.4" and add :package-version.
The options updated are those who won't be in Emacs 24.3.
2013-02-26 18:21:28 +01:00
Christopher Schmidt ff92e688dd org.el: Rebind structure-related variables within org-run-like-in-org-mode
* org.el (orgstruct-make-binding): Rebind structure-related
variables within org-run-like-in-org-mode.
2013-02-26 17:52:32 +01:00
Bastien Guerry f20ae92e88 Merge branch 'maint' 2013-02-26 16:28:36 +01:00
Bastien Guerry 2efbd0f138 org.el (org-overview): Stay on current line
* org.el (org-overview): Stay on current line.

This circumvents a bug in hide-sublevels which displays the
"..." ellipsis on top of the window when hiding levels that
are past the middle of the window---at least this is the
way I could understand the problem.

Thanks to Samuel Wales for reporting the problem, Arun Persaud and
William for creating reproducible recipes, Suvayu Ali, Nick Dokos
and Achim Gratz for further help.
2013-02-26 16:28:30 +01:00
Bastien Guerry 95375260e5 Fix commit 83bebfd880 2013-02-26 16:13:39 +01:00
Bastien Guerry 04fd44708a Merge branch 'maint' 2013-02-26 15:14:42 +01:00
Bastien Guerry 6042e93fa4 org.el (org-map-entries): Fix docstring
* org.el (org-map-entries): Fix docstring.

Thanks to Christopher Schmidt for reporting this.
2013-02-26 15:14:37 +01:00
Bastien Guerry 889d671277 Fix typo. 2013-02-26 14:37:05 +01:00
Bastien Guerry 83bebfd880 Use `org-autoload' instead of `autoload'. 2013-02-26 14:35:25 +01:00
Nicolas Goaziou 58fc1b4bf4 Use `org-latex-compile' when processing formulas with imagemagick
* lisp/ox-latex.el (org-latex-compile): Add an optional argument for
  latex snippet previewing.
* lisp/org.el (org-create-formula-image-with-imagemagick): Use
  `org-latex-compile' instead of rewriting it.
2013-02-26 13:43:48 +01:00
Bastien Guerry 0c9b468545 Merge branch 'maint' 2013-02-26 11:09:06 +01:00
Bastien Guerry 467f7ff9b5 Fix commit b6b509.
Thanks to Sébastien Vauban for reporting this.
2013-02-26 11:08:50 +01:00
Nicolas Goaziou ef6c1498b4 Re-introduce #+latex_header value when previewing a LaTeX snippet
* lisp/org.el (org-create-formula--latex-header): New function.
(org-create-formula-image-with-dvipng,
org-create-formula-image-with-imagemagick): Use new function.

This functionality was removed in
0484c5c64d, when clearing out old export
framework from "org.el".
2013-02-26 00:04:05 +01:00
Nicolas Goaziou 11033a97dc sub/superscript character has to follow a non-blank character
* lisp/org.el (org-match-substring-regexp,
  org-match-substring-with-braces-regexp): Update regexp.
  A sub/superscript cannot start anymore at the beginning of the line
  or after a space.
2013-02-25 21:53:14 +01:00
Nicolas Goaziou e024beaa7e org-element: Refactor object parsing
* lisp/org-element.el (org-element--get-next-object-candidates):
  Rewrite function to simplify algorithm.
(org-element-context, (org-element--parse-elements)): Apply
changes.
* lisp/org.el (org-fill-paragraph): Apply changes.
2013-02-25 21:52:54 +01:00
Christopher Schmidt de5ff236d4 org.el: Bind org-shift* in orgstruct-mode.
* org.el (orgstruct-setup): Bind org-shift*.
2013-02-25 17:12:21 +01:00
Bastien Guerry 372a3ecda8 New compatibility macro `org-with-silent-modifications'
* org-macs.el: Don't define `with-silent-modifications' for
emacsen that don't have it.

* org-compat.el (org-with-silent-modifications): New
compatibility macro.

* org.el (org-refresh-category-properties)
(org-refresh-properties, org-entry-blocked-p)
(org-agenda-prepare-buffers):
* org-indent.el (org-indent-remove-properties)
(org-indent-add-properties):
* org-colview.el (org-columns-display-here)
(org-columns-remove-overlays, org-columns-quit)
(org-columns-edit-value, org-columns-compute-all)
(org-columns-compute, org-agenda-colview-compute):
* org-clock.el (org-clock-sum): Use the compatibility macro
`org-with-silent-modifications' instead of
`with-silent-modifications'.

Thanks to Achim for a preliminary patch.
2013-02-25 11:44:27 +01:00
Bastien Guerry 988240d5fd Merge branch 'master' of orgmode.org:org-mode 2013-02-25 11:21:25 +01:00
Bastien Guerry 662cb98684 org.el (org-sort-remove-invisible): Remove emphasis markers
* org.el (org-sort-remove-invisible): Remove emphasis markers.
2013-02-25 11:12:55 +01:00
Bastien Guerry 1ab872c51e Revert "org.el (org-sort-remove-invisible): Truly returns the visible part of the string"
This reverts commit 30d6dc8baa.
2013-02-25 11:00:55 +01:00
Nicolas Goaziou f26547e320 Fix false positives in `org-in-verbatim-emphasis'
* lisp/org.el (org-in-verbatim-emphasis): Fix false positive when
  point is just after the closing emphasis marker.
2013-02-25 10:53:19 +01:00
Bastien Guerry 30d6dc8baa org.el (org-sort-remove-invisible): Truly returns the visible part of the string
* org.el (org-sort-remove-invisible): Use defsust.  Do not
only check against invisible links, truly returns the visible
part of the string.

Thanks to François Pinard for suggesting this.
2013-02-25 10:24:29 +01:00
Bastien Guerry 5700a0eb2d Merge branch 'master' of orgmode.org:org-mode 2013-02-25 10:15:49 +01:00
Bastien Guerry 49772f1f26 Remove hidden links when comparing items or entries.
* org.el (org-sort-remove-invisible): Add a docstring.
(org-sort-entries): Remove hidden links when comparing
entries.

* org-list.el (org-sort-list): Remove hidden links when
comparing list items.

Thanks to François Pinard for suggesting this.
2013-02-25 10:15:44 +01:00
Nicolas Goaziou 8838585a42 Do not move point when filling a table
* lisp/org.el (org-fill-paragraph): Do not move point when filling
  a table.
* testing/lisp/test-org.el: Add test.
2013-02-25 10:06:58 +01:00
Bastien Guerry bd4750f24a Merge branch 'maint'
Conflicts:
	lisp/org-clock.el
	lisp/org.el
2013-02-24 19:19:01 +01:00
Bastien Guerry ac44a7af06 Move `org-at-clock-log-p' from org-clock.el to org.el
* org.el (org-at-clock-log-p): Delete.
* org-clock.el (org-at-clock-log-p): Move here.
2013-02-24 19:16:33 +01:00
Bastien Guerry 109f7314a3 org.el (org-agenda-prepare-buffers): Don't use `with-silent-modifications' too early
* org.el (org-agenda-prepare-buffers): Don't use
`with-silent-modifications' too early.

Thanks to J. David Boyd for reporting this and to Florian Beck for
confirming the problem.
2013-02-24 10:49:30 +01:00
Bastien Guerry 43c8aa02cc Use `with-silent-modifications' instead of `org-unmodified' when it makes sense
* org-macs.el: Add a comment on when to use `org-unmodified'
and when to use `with-silent-modifications'.

* org-colview.el (org-columns-display-here)
(org-columns-remove-overlays, org-columns-quit)
(org-columns-edit-value, org-columns-compute-all)
(org-columns-compute, org-agenda-colview-compute):
* org-clock.el (org-clock-sum):
* org.el (org-refresh-category-properties)
(org-refresh-properties, org-entry-blocked-p)
(org-agenda-prepare-buffers): Use `with-silent-modifications'
instead of `org-unmodified'.

Thanks to Stefan Monnier for reminding me about `with-silent-modifications'!
2013-02-23 14:57:51 +01:00
Bastien Guerry 64aae2fd29 Merge branch 'maint' 2013-02-23 14:42:45 +01:00
Bastien Guerry b6b509bfd4 org.el (org-tsr-regexp-both): Don't activate dates in links
* org.el (org-tsr-regexp-both): Don't activate dates in links.
(org-activate-dates): Change match boundaries according to the
new value of `org-tsr-regexp-both'.

Thanks to Richard Huang for reporting a related issue.
2013-02-23 14:42:11 +01:00
Bastien Guerry 8ee6c13c7f Fix typo: an headline -> a headline. 2013-02-23 13:47:44 +01:00