0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-22 21:10:42 +00:00
Commit graph

11647 commits

Author SHA1 Message Date
Bastien Guerry 7babf1f1a0 org-freemind.el (org-freemind-write-node): Enhance links conversion in nodes
* org-freemind.el (org-freemind-write-node): Enhance links
conversion in nodes.

Thanks to Bill Day for requesting this.
2012-09-19 10:46:14 +02:00
Bastien Guerry 09ad83efe9 org-freemind.el (org-freemind-write-node): Convert links in nodes
* org-freemind.el (org-freemind-write-node): Convert links in
nodes.

Thanks to Bill Day for reporting this.
2012-09-19 09:22:12 +02:00
Robert Klein 7dd9573450 org-e-publish.el (org-e-publish-org-to-html): Fix typo
* org-e-publish.el (org-e-publish-org-to-html): Fix typo.

TINYCHANGE
2012-09-19 08:07:36 +02:00
Achim Gratz 18069f578d Merge branch 'maint' 2012-09-18 21:37:07 +02:00
Achim Gratz 23531cce62 do not use an explicit nil argument for package requirements
* mk/server.mk: Do not use an explicit nil argument for package
  requirements.

Marmalade chokes on this, thanks to E. Schulte for the report.
2012-09-18 21:36:44 +02:00
Achim Gratz 6f2b04f6da Revert "remove explicit nil requirements from elpa packages"
This reverts commit ef125abe61.

This was committed to the wrong branch and deletes a variable that
should be kept.  Will be re-done differently from maint.
2012-09-18 21:28:27 +02:00
Bastien Guerry 4600e9eca8 Merge branch 'maint' 2012-09-18 17:18:55 +02:00
Bastien Guerry 5b8999b708 org.el: Use "capture" instead of "remember" in docstrings.
* org.el (org-link-to-org-use-id, org-directory)
(org-default-notes-file, org-reverse-note-order)
(org-extend-today-until, org-finish-function)
(org-store-link-functions): Use "capture" instead of
"remember" in docstrings.  Also use the `org-capture' group
when it makes sense.
2012-09-18 17:18:33 +02:00
Bastien Guerry 48ca87cd4a org.el (org-toggle-inline-images): Only send a message when called interactively
* org.el (org-toggle-inline-images): Only send a message when
called interactively.
2012-09-18 16:27:57 +02:00
Bastien Guerry 39da4f455a Merge branch 'maint' 2012-09-18 16:22:03 +02:00
Bastien Guerry c19364464a org.texi (Activation): Adding org-mode to `auto-mode-alist' is not needed for versions of Emacs > 22.1
* org.texi (Activation): Adding org-mode to `auto-mode-alist'
is not needed for versions of Emacs > 22.1.

Thanks to Robert P. J. Day for suggesting this.
2012-09-18 16:21:36 +02:00
Bastien Guerry 9c7a081f21 Merge branch 'maint' 2012-09-18 16:06:54 +02:00
Bastien Guerry b81485d5ff org-agenda.el: Fix bug when showing indirect agenda in another frame
* org-agenda.el (org-agenda-tree-to-indirect-buffer): Find the
correct agenda buffer.  Don't split the agenda window when the
indirect buffer is displayed in another frame.

Thanks Viktor Rosenfeld for reporting this.
2012-09-18 16:06:46 +02:00
Bastien Guerry 8205e25c08 Merge branch 'maint' 2012-09-18 12:25:30 +02:00
Bastien Guerry 90565f2ede org.el (org-mode): Try to set the org-hide face correctly
* org.el (org-mode): Try to set the org-hide face correctly.

Thanks to Arne Babenhauserheide for reporting a related problem.
2012-09-18 12:24:05 +02:00
Bastien Guerry 0ca6614154 org-exp.el (org-export): Set the mark correctly when exporting a subtree
* org-exp.el (org-export): Set the mark correctly when
exporting a subtree.

Thanks to Tyler Smith for reporting this problem.
2012-09-18 11:09:25 +02:00
Bastien Guerry a82797356c org-agenda.el: Fix the display of the number of commands for block agendas
* org-agenda.el (org-agenda-get-restriction-and-command): Fix
the display of the number of commands for block agendas.

Thanks to Sébastien Vauban for reporting this.
2012-09-18 09:09:41 +02:00
Bastien Guerry 6cc7ff1092 org-agenda.el: Allow `org-agenda-finalize-hook' to modify the buffer
* org-agenda.el (org-agenda-before-write-hook)
(org-agenda-add-entry-text-maxlines): Enhance phrasing.
(org-agenda-finalize-hook, org-agenda-mode-hook): Tell that
the buffer is writable when the hook is called.
(org-agenda-finalize): Allow org-agenda-finalize-hook to
modify the buffer.

Thanks to Moritz Ulrich and to Aaron Ecay for triggering this fix.
2012-09-18 08:40:11 +02:00
Bastien Guerry 7cf6bbeeac Merge branch 'maint' 2012-09-17 19:02:35 +02:00
Bastien Guerry a67676809c org-agenda.el: Fix the declaration/check of org-habit variables
* org-agenda.el (org-habit-show-all-today): Only use defvar
to silent the byte-compiler.
(org-agenda-get-scheduled): Check whether some org-habit.el
options have been defined.

Thanks to Robert Horn for reporting this.
2012-09-17 18:57:58 +02:00
Suvayu Ali a86fd71719 Fix org-e-beamer subtree export options template
Prepend "EXPORT_" to LaTeX_CLASS* properties in the beamer subtree
export options template.
2012-09-17 18:48:44 +02:00
Bastien Guerry 660913986e Merge branch 'maint' 2012-09-17 18:45:07 +02:00
Bastien Guerry 2791177308 Fix two compiler warnings 2012-09-17 18:44:58 +02:00
Bastien Guerry e109fac771 Fix two compiler warnings 2012-09-17 18:44:42 +02:00
Bastien Guerry 3c0155c6e4 Merge branch 'maint' 2012-09-17 18:42:19 +02:00
Bastien Guerry d66cbad3d9 org-capture.el: Fix bug in `org-capture-string'
* org-capture.el (org-capture-entry): New variable.
(org-capture-string, org-capture): Use it to possibly skip the
interactive prompt for a capture template.
2012-09-17 18:42:11 +02:00
Nicolas Goaziou a99402facf org-e-latex: Consistently change label names
* contrib/lisp/org-e-latex.el (org-e-latex--caption/label-string,
  org-e-latex--wrap-label, org-e-latex-latex-environment):
  Consistently call `org-export-solidify-link-text' so references can
  match labels.
2012-09-16 09:25:31 +02:00
Nicolas Goaziou a5756f5e1d ob-exp: More accurate white space handling when evaluating inline code
* lisp/ob-exp.el (org-babel-exp-non-block-elements): More accurate
white space handling when evaluating inline-src-block, babel-call and
inline-babel-call elements or objects.  Also removed use of
`org-babel-examplize-region' since it would never be called anyway
(return value from `org-babel-exp-do-export' is never nil).
2012-09-16 00:07:15 +02:00
Eric Schulte ef125abe61 remove explicit nil requirements from elpa packages
Some ELPA servers choke on the explicit nil.

* mk/server.mk (elpa-dirty): Remove explicit nil requirements from elpa
  packages.
2012-09-15 14:01:54 -06:00
Achim Gratz 4357cd0fcd Merge branch 'maint' 2012-09-15 20:07:12 +02:00
Achim Gratz f1f1fc8d48 mk/server.mk: fix previous commit 2012-09-15 20:06:53 +02:00
Achim Gratz 950789d26a mk/server.mk: orgplus must be the package name for package manager to recognize it
* mk/server.mk: Rename org-pkg.el to orgplus-pkg.el, rename the
  package to orgplus also.  The package manager will otherwise not
  recognize the package.  This means we will need to educate users not
  to install both packages at the same time or try to introduce this
  dependency in a different way.
2012-09-15 19:52:18 +02:00
Achim Gratz 5a122cf7aa Merge branch 'maint' 2012-09-15 19:20:56 +02:00
Achim Gratz f6f9d3a5cd mk/server.mk: implement ELPA archive including all contrib files - "orgplus"
* mk/server.mk: Add new targets elpaplus, eplaplus-up, eplaplus-dirty
  and upload-eplaplus as copy of respective epla targets, but with all
  files from contrib added.

* .gitignore: Add orgplus EPLA archive to the patterns.
2012-09-15 18:54:32 +02:00
Achim Gratz 400bb88f9c Makefile: add contrib already for autoloads so that uncompiled can have contrib/, too
* mk/targets.mk: Add contrib files already for autoloads so that
  uncompiled can have contrib/lisp/ added, too.  Remove all files from
  contrib/lisp/ that are found in lisp/ for `cleanlisp´ so that
  switching between different contrib configurations becomes easier.
  Remove variable ORG_TO_LISP since it is not needed anymore.
2012-09-15 18:54:29 +02:00
Eric Schulte f68da4f5ab testing export of inline src blocks
* testing/lisp/test-ob-exp.el (ob-exp/exports-inline): Testing export of
  inline src blocks.
2012-09-15 10:19:55 -06:00
Philipp Kroos c092c8e29d org-e-latex: Introduced org-e-latex-known-errors
* contrib/lisp/org-e-latex.el: new customizable org-e-latex-known-errors
  is an alist of possible errors, taken from org-e-latex--collect-errors

* contrib/lisp/org-e-latex.el (org-e-latex--collect-errors):
  More concise code.
  The previous explicit search for errors is replaced by an iteration
  over the alist org-e-latex-known-errors.
2012-09-15 15:18:49 +02:00
Nicolas Goaziou f0bcf780a3 org-export: Fix collision between old export menu and new one
* contrib/lisp/org-export.el (org-export-dispatch-ui): Do not use same
  buffer name as previous export dispatcher.  Also make sure the
  temporary buffer is deleted once the export is done.
2012-09-14 13:54:43 +02:00
Bastien Guerry 275412a4a2 Merge branch 'maint' 2012-09-14 09:39:07 +02:00
Abdó Roig-Maranges cb34324a82 Fix the ltxpng path for HTML and ODT exporters
* org-html.el (org-export-html-preprocess)
(org-export-html-format-image): Use
`org-latex-preview-ltxpng-directory'.

* org-odt.el (org-export-odt-do-preprocess-latex-fragments):
Ditto.

Commit 8474115b20 breaks LaTeX
image exports as HTML and ODT.  This fixes it.
2012-09-14 09:38:10 +02:00
Jambunathan K dd44a62c7e org-e-odt.el: Fix earlier commit
Handle the case when latex fragment/environment fails to yield an
image or formula file.
2012-09-14 02:42:17 +05:30
Jambunathan K 3501be303e org-e-odt.el: Pre-process LaTeX fragments
Handle enumeration more robustly.  Numbered OpenDocument formula no
longer uses a table for typesetting of formula and it's number.

Also some renaming and moving around.
2012-09-14 02:11:03 +05:30
Jambunathan K 5ab9eaaabb OrgOdtStyles.xml: Typeset numbered formula differently
* etc/styles/OrgOdtStyles.xml (OrgFormula): New paragraph style.
(OrgFormulaCaptionFrame): Modified.
2012-09-14 02:08:00 +05:30
Abdó Roig-Maranges 5029a8bcf9 fix dvipng latex export with Transparent background
* org.el (org-create-formula-image-with-dvipng): Fixes a bug
introduced in 149cc04782 that made it
fail with no :foreground and :background attributes set, due to bad
handling of "Transparent" color.
2012-09-14 01:09:52 +05:30
Nicolas Goaziou cedf5190e5 org-export: Update code comments 2012-09-13 21:01:10 +02:00
Nicolas Goaziou 4d06f3349d ob-exp: Preserve affiliated keywords when replacing a code block
* lisp/ob-exp.el (org-export-blocks-preprocess): Preserve affiliated
  keywords when replacing a code block.
2012-09-13 20:46:33 +02:00
Nicolas Goaziou 7efd61249b org-e-latex: Ignore empty captions in lstlisting environments
* contrib/lisp/org-e-latex.el (org-e-latex-src-block): Ignore empty
  captions in lstlisting environments.
2012-09-13 18:27:39 +02:00
Nicolas Goaziou a0e3e84edc org-e-html/org-e-odt: Changes to caption handling
* contrib/lisp/org-e-html.el (org-e-html--caption/label-string,
  org-e-html--wrap-label, org-e-html--find-verb-separator): Remove
  functions.
(org-e-html-center-block, org-e-html-drawer, org-e-html-dynamic-block,
org-e-html-fixed-width, org-e-html-inline-src-block,
org-e-html-inlinetask, org-e-html-latex-environment,
org-e-html-plain-list, org-e-html-quote-block,
org-e-html-special-block, org-e-html-verse-block): Apply functions
removal.
(org-e-html-example-block, org-e-html-src-block): Allow textarea. Use
new caption scheme.
(org-e-html-horizontal-rule): Cleanup.
(org-e-html-link--inline-image, org-e-html-table): Use new caption
scheme.
* contrib/lisp/org-e-odt.el (org-e-odt--wrap-label,
  org-e-odt--caption/label-string): Remove functions.
(org-e-odt-format-label): Use new caption scheme.
(org-e-odt-center-block, org-e-odt-drawer, org-e-odt-dynamic-block,
org-e-odt-example-block, org-e-odt-fixed-width,
org-e-odt-horizontal-rule, org-e-odt-inlinetask,
org-e-odt-latex-environment, org-e-odt-plain-list,
org-e-odt-quote-block, org-e-odt-special-block,
org-e-odt-verse-block): Apply functions removal.

In e-html export, textareas are now possible with the following
attribute:

  #+ATTR_HTML: :textarea t :width 80 :height 10

:width and :height keywords are optional.
2012-09-13 17:33:46 +02:00
Nicolas Goaziou 1e1a476824 org-e-groff/org-e-man: Changes to caption handling
* contrib/lisp/org-e-groff.el (org-e-groff--caption/label-string):
  Change signature.
(org-e-groff-link--inline-image, org-e-groff-src-block,
org-e-groff-table--org-table): Use `org-export-read-attribute'. Apply
signature change.
* contrib/lisp/org-e-man.el (org-e-man--caption/label-string): Change
  signature.
(org-e-man-src-block): Remove unused caption code.
(org-e-man-table--org-table): Use `org-export-read-attribute'. Apply
signature change.
2012-09-13 17:33:46 +02:00
Nicolas Goaziou 28f8ca60c7 org-e-ascii/org-e-latex/org-e-md: Use new caption tool
* contrib/lisp/org-e-ascii.el (org-e-ascii--build-caption,
  org-e-ascii--list-listings, org-e-ascii--list-tables): Use new
  caption tool.
* contrib/lisp/org-e-latex.el (org-e-latex--caption/label-string): New
  signature.  Use new caption tool.
(org-e-latex-link--inline-image, org-e-latex-src-block,
org-e-latex-table--org-table): Apply signature change.
* contrib/lisp/org-md.el (org-md-link): Use new caption tool.
2012-09-13 17:33:46 +02:00