Commit Graph

12428 Commits

Author SHA1 Message Date
Bastien Guerry 77a6acff0b Merge branch 'master' of orgmode.org:org-mode 2012-12-19 00:23:46 +01:00
Bastien Guerry 57e0814ac0 Merge branch 'maint' 2012-12-19 00:23:39 +01:00
Bastien Guerry 1c57cd5a7d org-agenda.el (org-agenda-skip): Only check if point is inside a code block, not at a code block.
* org-agenda.el (org-agenda-skip): Only check if point is
inside a code block, not at a code block.

Thanks to Eric Fraga for reporting this problem.
2012-12-19 00:23:30 +01:00
Nicolas Goaziou 27d7d0ea17 org-export: Remove NOEXPAND optional argument from `org-export-as'
* contrib/lisp/org-export.el (org-export-options-alist): Fix
  docstring.
(org-export-as): Remove NOEXPAND argument.
(org-export-to-buffer, org-export-to-file): Apply argument removal.

This argument is not needed since a function removing macros, babel
code and include keywords can be added to
`org-export-before-processing-hook'.
2012-12-18 22:42:00 +01:00
Nicolas Goaziou f1bb17549b org-element: Add tests
* testing/lisp/test-org-element.el: Add tests.
2012-12-18 22:16:01 +01:00
Nicolas Goaziou bc4351ce0d org-element: Fix parsing of links expanded from an abbreviation
* lisp/org-element.el (org-element-object-variables): New variable.
(org-element-parse-secondary-string): Copy some buffer-local variables
to the temporary buffer created to parse the string so links can still
be properly expanded.
(org-element-link-parser): Link expansion and translation are applied
transparently for the parser.
2012-12-18 21:59:05 +01:00
Nicolas Goaziou 76cf2538bb Merge branch 'maint' 2012-12-18 19:33:47 +01:00
Nicolas Goaziou 7739e8b5f7 Small refactoring
* lisp/org.el (org-fill-paragraph): Small refactoring.
2012-12-18 19:32:50 +01:00
Ingo Lohmar 0f3264f690 org-agenda.el: Use `org-todo-keyword-faces' to highlight selected TODO keywords.
* org-agenda.el
(org-agenda-propertize-selected-todo-keywords): New function
to highlight the current agenda todo keywords depending on
`org-todo-keyword-faces'.
(org-todo-list): Use the new function.

TINYCHANGE
2012-12-18 18:47:49 +01:00
Bastien Guerry 0db5f28dd4 org-html.el and org-e-html.el: Add CSS classes to list tags.
* org-html.el (org-html-export-list-line): Add CSS classes to
these list HTML tags: <ul> <dl> and <ol>.

* contrib/lisp/org-e-html.el (org-e-html-begin-plain-list): Add
CSS classes to these list HTML tags: <ul> <dl> and <ol>.
2012-12-18 18:38:20 +01:00
Bastien Guerry bbb451a7b6 Merge branch 'maint' 2012-12-18 15:09:54 +01:00
Bastien Guerry 374efdd63e org.el (org-in-fixed-width-region-p): Rewrite using org-element.el.
* org.el (org-in-fixed-width-region-p): Rewrite using
org-element.el.

Thanks to Nicolas Goaziou for suggesting this.
2012-12-18 15:09:40 +01:00
Bastien Guerry 4996e5bd8e Merge branch 'maint' 2012-12-18 15:04:43 +01:00
Bastien Guerry 9d4dd69b30 org.el (org-fill-paragraph): Fill correctly in source code block.
* org.el (org-fill-paragraph): Fill correctly in source code
block.

Thanks to Sébastien Vauban for reporting this.
2012-12-18 12:49:49 +01:00
Bastien Guerry 1af0b39c01 Allow C-S-<up/down> to sync update clock timestamps by several units.
* org-clock.el (org-clock-timestamps-up)
(org-clock-timestamps-down, org-clock-timestamps-change): Add
an optional argument N to change timestamps by several units.

* org.el (org-shiftcontrolup, org-shiftcontroldown): Ditto.

Thanks to Rainer Stengele for this idea.
2012-12-18 12:16:20 +01:00
Achim Gratz 709bf92950 Backwards compatibility for `user-error´
* lisp/org-compat.el (user-error): Defalias to `error´ for Emacsen
  that don't have it.
2012-12-17 19:08:12 +01:00
Jonathan Leech-Pepin 676180a5fb org-e-texinfo.el: Fix link export to account for alternate TOC names
* contrib/lisp/org-e-texinfo.el (org-e-texinfo-link): Texinfo uses the
menu/TOC names for finding cross-references.  Use the menu-title as
the link destination.  Also ensures link descriptions are used as
link titles.
2012-12-17 10:58:25 -05:00
Nicolas Goaziou 83b567925a org-export: Fix docstring
* contrib/lisp/org-export.el (org-export-define-backend): Fix
  docstring to include asynchronous export and additional sub-menus.
2012-12-16 08:22:41 +01:00
Nicolas Goaziou 442b2ad15d Merge branch 'maint'
Conflicts:
	lisp/org-element.el
2012-12-16 00:49:22 +01:00
Nicolas Goaziou 20839ced71 org-element: Fix parsing of a list in a block in a list
* lisp/org-element.el (org-element--parse-elements,
  org-element-at-point): Fix parsing of a list in a block in a list.
* testing/lisp/test-org-element.el: Add test.
2012-12-16 00:45:17 +01:00
Eric Schulte 458824493d Revert "tangled files should not be writable"
This reverts commit 5e3b8259c7.
2012-12-15 15:14:01 -07:00
Nicolas Goaziou 457c27d05b org-e-confluence: Add asynchronous export support
* contrib/lisp/org-e-confluence.el (org-e-confluence-export-as-confluence):
  Add asynchronous export support.
2012-12-15 20:22:46 +01:00
Bastien Guerry fa0e8feea8 org-test.el (org-test-with-temp-text-in-file): Wrap ,@body into (progn ...).
* org-test.el (org-test-with-temp-text-in-file): Wrap ,@body
into (progn ...) so that tests don't have to wrap it themselves.

Fix the testing suite to use this.
Also fix formatting and trailing whitespaces.
Fix test-org-src/blank-line-block so that it
checks editing of a code block with a whitespace
with point on the #+begin_src line.

Thanks to Michael Brand for spotting the (progn ...) problem.
2012-12-15 08:49:23 +01:00
Bastien Guerry c8452bfca0 Merge branch 'maint' 2012-12-15 08:05:02 +01:00
Bastien Guerry c0675b478e test-org-src.el: Fix a test.
* lisp/test-org-src.el (test-org-src/blank-line-block): Use
`org-test-with-temp-text-in-file' because `org-in-src-block-p'
checks against an Org mode text property.  Don't check for the
word at point.

Thanks to Nick Dokos for reporting this failed test.
2012-12-15 08:04:43 +01:00
Bastien Guerry 8f3b8ee44c testing/org-test.el: Fix `org-test-with-temp-text'.
* org-test.el (org-test-with-temp-text): No need to kill a
temporary buffer.  Don't use (prog1 ,@body ...), only expand
,@body.

Thanks to Nick Dokos for pointing this.
2012-12-15 08:00:30 +01:00
Bastien Guerry e77f26e121 contrib/lisp/org-e-confluence.el: New file by Sébastien Delafond 2012-12-15 07:36:05 +01:00
Bastien Guerry 20940bb18f contrib/lisp/org-bullets.el: New file by Evgeni Sabof
Implements a minor mode to show org-mode bullets as UTF-8 characters.
2012-12-15 07:22:49 +01:00
Bastien Guerry db5881f33e Merge branch 'master' of orgmode.org:org-mode 2012-12-15 06:40:05 +01:00
Bastien Guerry beea46fab5 Merge branch 'maint' 2012-12-15 06:39:42 +01:00
Bastien Guerry 0b44eb6961 Add doclicense.texi to include the GNU FDL license and fix the copyright notice.
The GNU FDLv1.3 is now included in both the manual and the guide.
The Back-Cover Texts does not mention that you can buy copies from
the FSF as this is not true.
2012-12-15 06:39:33 +01:00
Nicolas Goaziou e556812db5 org-export: Fix docstring
* contrib/lisp/org-export.el (org-export-stack-mode): Fix docstring.
2012-12-14 19:02:34 +01:00
Nicolas Goaziou 68d4de2f2c org-koma-letter: Add asynchronous export support
* contrib/lisp/org-koma-letter.el (org-koma-letter-export-as-latex,
  org-koma-letter-export-to-latex, org-koma-letter-export-to-pdf): Add
  asynchronous export support.
2012-12-14 16:55:17 +01:00
Jonathan Leech-Pepin a223d1a011 * contrib/lisp/org-e-texinfo.el: Remove messages used for debugging
(org-e-texinfo--generate-menu-items): Remove messages used for debugging.
2012-12-14 09:21:22 -05:00
Bastien Guerry 2dbd84ecaa Merge branch 'maint' 2012-12-14 11:48:08 +01:00
Bastien Guerry 6f5b4a8b73 orgguide.texi: Fix the copyright notice.
See http://orgmode.org/cgit.cgi/org-mode.git/commit/?id=cd2496
for explanations on the same change for org.texi.
2012-12-14 11:48:02 +01:00
Bastien Guerry 6af6e957df Merge branch 'maint' 2012-12-14 11:35:57 +01:00
Bastien Guerry cd249629de org.texi: Update copyright notice.
There are no invariant sections and no cover texts.

See http://www.gnu.org/prep/maintain/html_node/License-Notices-for-Documentation.html
for details on why we don't need invariant sections and cover texts.
2012-12-14 11:35:45 +01:00
Bastien Guerry db51b80d2b Merge branch 'maint' 2012-12-14 10:34:49 +01:00
Bastien Guerry df099175e7 org.el (org-edit-special): Fix bug about editing special environments.
* org.el (org-in-fixed-width-region-p): New function.
(org-edit-special): Fix bug: make sure to DTRT in every
special environment.  Also use the new function to check
against fixed-width environment.

Thanks to Bernt Hansen for reporting a bug in this area.
2012-12-14 10:30:16 +01:00
Bastien Guerry 81d5ebce8d org-src.el (org-edit-src-code): Check if we are in a source code block with `org-in-src-block-p'.
* org-src.el (org-edit-src-code): Check if we are in a source
code block with `org-in-src-block-p'.  Slightly reformat the
docstring.
2012-12-14 10:10:40 +01:00
Bastien Guerry a7afe7df1a org.el (org-in-src-block-p): Return t when on #+BEGIN|END_SRC lines.
* org.el (org-in-src-block-p): Return t when point is at the
#+BEGIN_SRC/#+END_SRC lines unless the new optional parameter
'inside is set to t.
2012-12-14 10:02:25 +01:00
Bastien Guerry b8662049e7 Merge branch 'maint' 2012-12-14 00:02:30 +01:00
Bastien Guerry c4bf1eeed4 Remove gplmanual.pl as we are not allowed to dual-license the Org manual. 2012-12-14 00:02:19 +01:00
Bastien Guerry 6202df567c Merge branch 'master' of orgmode.org:org-mode 2012-12-13 23:47:39 +01:00
Bastien Guerry 2c164be668 Merge branch 'maint' 2012-12-13 23:47:17 +01:00
Michael Gauland 4524a02b39 Edit source: fix 'end' initialisation
* org-src.el: Create a marker to pass to copy-marker.

This fixes a 'wrong type argument' error when running
org-edit-src-code (observed on Emacs 23.2.1).

The problem was that copy-marker expects a marker, and it was given
nil. This change gives it a marker that doesn't point anywhere, but
still lets us set the insertion type of the end marker.

TINYCHANGE
2012-12-13 23:47:07 +01:00
Bastien Guerry 22e4a4ecb9 Revert "org-src.el (org-edit-src-code): Fix bug on Emacs <24.1."
This reverts commit 7a770c10c1.
2012-12-13 23:45:55 +01:00
Nicolas Goaziou 286fd7f250 org-e-beamer/html: Asynchronous export ignores `org-export-show-temporary-export-buffer'
* contrib/lisp/org-e-beamer.el (org-e-beamer-export-as-latex): Ignore
  `org-export-show-temporary-export-buffer' when export is
  asynchronous.
* contrib/lisp/org-e-html.el (org-e-html-export-as-html): Ignore
  `org-export-show-temporary-export-buffer' when export is
  asynchronous.

Export output always goes in the Export Stack.
2012-12-13 23:13:35 +01:00
Bastien Guerry 26d24900e1 Merge branch 'maint' 2012-12-13 17:37:04 +01:00