Commit Graph

30 Commits

Author SHA1 Message Date
Bastien Guerry de42649f7b Manually revert maint to e85080.
e85080 is the last correct commit in the maint branch
before releasing 7.8.04.  The 7.8.05 release should be
done from this commit.
2012-03-17 16:28:46 +01:00
Bastien Guerry 73bb18ba37 Manually revert to the Release 7.8.04 tag. 2012-03-17 15:52:24 +01:00
Bastien Guerry 6e534f9c61 Manually revert back to commit e85080.
This fixes a wrong merge that should not have happened:
commit 7e903a merges the master branch into the maint branch,
while we really want to keep the maint branch a bugfix-only
branch.

This commit reverts back the maint branch to its state before
merging the master branch.  From there, we will fix remaining
problems with the maint branch (e.g. copyright issues) then
release this maint branch as Org-mode 7.8.05.
2012-03-17 14:34:01 +01:00
Bastien Guerry 346ee30e42 Fix trailing whitespaces for *.el files in contrib/. 2012-01-04 16:21:56 +01:00
Bastien Guerry 681914f32b Copyright year fixes for contrib/. 2012-01-04 15:48:18 +01:00
Eric Schulte 0da82db252 org-mime: use dvipng for inline images when export to html mail
* contrib/lisp/org-mime.el (org-mime-htmlize): Use dvipng for inline
  images when export to html mail.
2011-10-19 12:07:48 -06:00
Bastien Guerry 904ed18bc2 Fix copyright years for elisp files in core and contrib.
Also add "This file is not part of GNU Emacs." when this is the case.
2011-08-15 15:23:11 +02:00
Eric Schulte e612d0b9ff org-mime: now possible to set mail subjects using the mail_subject property 2011-01-28 12:53:36 -07:00
Eric Schulte bbde97fb1e org-mime: fixed type -- thanks Niels Giesen 2011-01-15 10:16:18 -07:00
Eric Schulte 079c4a026d org-mime: inherit of MAIL_ properties with `org-mime-use-property-inheritance'
* contrib/lisp/org-mime.el (org-mime-use-property-inheritance): User
  configurable variable to control inheritance of MAIL_ properties.
  (org-mime-send-subtree): Using new custom variable.
  (org-mime-subtree): Using new custom variable.
2011-01-14 06:37:18 -07:00
Eric Schulte b41a340e9e org-mime: now inherits MAIL_* properties
Thanks to niels giesen for this patch
2011-01-13 17:11:29 -07:00
Eric Schulte 40264e9b75 org-mime: call 'org and 'ascii hooks appropriately
patch by Niels Giesen

* contrib/lisp/org-mime.el (org-mime-compose):
2010-12-27 20:57:41 -07:00
Eric Schulte ad6c199ccc ob-mime: one-to-one mapping between output formats and hooks.
Suggested by Niels Giesen.

* contrib/lisp/org-mime.el (lambda): Removing the 'html-ascii hook as
  each hook should be used for a single format.
  (org-mime-compose): Making use of format specific hooks, and apply
  each format hook individually to the body of each mime part as
  appropriate.
2010-12-27 07:48:40 -07:00
Eric Schulte 61470f6ae1 org-mime: hooks run in org-mode buffer when composing an email
Thanks to Ethan Ligon for suggesting this functionality.

  An example hook such as the following will record when emails have
  been composed

    (add-hook 'org-mime-send-subtree-hook
            (lambda ()
              (org-entry-put (point) "mail_composed" (current-time-string))))

* contrib/lisp/org-mime.el (org-mime-send-subtree-hook): Hooks run
  in the org-mode subtree when composing an email.
  (org-mime-send-buffer-hook): Hooks run in the org-mode buffer when
  composing an email.
2010-12-19 18:46:15 -07:00
Eric Schulte 76661a853a org-mime: adding format specific pre-export hooks
Thanks to Niels Giesen for suggesting this change.

* contrib/lisp/org-mime.el (lambda): Adding format specific pre-export
  hooks.
  (org-mime-compose): Call pre-export hooks before export.
2010-12-19 16:36:54 -07:00
Eric Schulte 96c70f3d7e org-mime: now exports subtrees, and can read mail headers from subtree properties
Much of this code is reworking of a very nice function shared on the
  mailing list by Matt Lundin.

* contrib/lisp/org-mime.el (org-mime-htmlize): Fixed indentation.
  (org-mime-try): Short macro for safely checking for properties.
  (org-mime-send-subtree): Drops the current subtree into a mail
  buffer possible exported and mime-encoded.
  (org-mime-send-buffer): Drops the current buffer into a mail
  buffer possible exported and mime-encoded.
  (org-mime-compose): Exports and mime-encodes a string of org-mode
  text for sending via email.
  (org-mime-org-buffer-htmlize): Create an email buffer containing the
  current org-mode file exported to html and encoded in both html and
  in org formats as mime alternatives.
  (org-mime-subtree): Create an email buffer containing the current
  org-mode subtree exported to a org format or to the format specified
  by the MAIL_FMT property of the subtree.
2010-12-17 14:20:44 -07:00
Eric Schulte f68f1e6055 org-mime: set message subject from buffer title
* contrib/lisp/org-mime.el (org-mime-org-buffer-htmlize): Set message
  subject from buffer title.
2010-12-16 18:25:00 -07:00
Eric Schulte 943b6701c4 org-mime: insert contents *before* signature
Thanks to Rainer M. Krug for reporting

* contrib/lisp/org-mime.el (org-mime-org-buffer-htmlize): Insert
  contents *before* signature.
2010-12-16 18:18:24 -07:00
Eric Schulte 3c66db85f0 org-mime: Use new org-export-string function
* contrib/lisp/org-mime.el (org-mime-htmlize): Use new
  org-export-string function.
  (org-mime-org-buffer-htmlize): Use new org-export-string function.
2010-12-16 18:12:08 -07:00
Eric Schulte 859a1b277e org-mime: removed call to defunct function
* contrib/lisp/org-mime.el (org-mime-htmlize): removed call to defunct
  function
2010-10-27 12:04:10 -06:00
Eric Schulte e6c9936373 suggesting a new function org-export-string
The attached patch adds a new functions org-export-string.

,----
| org-export-string is a Lisp function in `org-exp.el'.
|
| (org-export-string STRING FMT &optional DIR)
|
| Export STRING to FMT using existing export facilities.
| During export STRING is saved to a temporary file whose location
| could vary.  Optional argument DIR can be used to force the
| directory in which the temporary file is created during export
| which can be useful for resolving relative paths.  Dir defaults
| to the value of `temporary-file-directory'.
`----

This function should be useful in user code, and can already reduce the
amount of code in ob-org.el and org-mime.el.

>From e51017e4d7051aad31384a470f0a695dca0d6716 Mon Sep 17 00:00:00 2001
From: Eric Schulte <schulte.eric@gmail.com>
Date: Sun, 17 Oct 2010 15:17:13 -0600
Subject: [PATCH] org-export-string -- exports a string of org-mode markup text

* lisp/org-exp.el (org-export-string): new function org-export-string
  can be used to convert a string of test in org-mode markup to a
  specified format

* contrib/lisp/org-mime.el (org-mime-htmlize): now using new
  org-export-string function for exportation

* lisp/ob-org.el (org-babel-execute:org): now using new
  org-export-string function for exportation
2010-10-22 06:48:32 -06:00
Eric Schulte 9c1c4b3f8d org-mime: fixed major error -- was exporting entire as text/plain mime part
Thanks to Ethan Ligon for pointing this out

* contrib/lisp/org-mime.el (org-mime-org-buffer-htmlize): fixed major
  error -- was exporting entire as text/plain mime part, now when
  region is active, only that region is exported
2010-07-30 15:08:27 -06:00
Eric Schulte 507e06f586 org-mime: now allows style customization based on class attributes 2010-06-04 10:56:56 -06:00
Eric Schulte a16e887fff org-mime: now using `temporary-file-directory' instead of "/tmp" -- thanks to Uday S Reddy for catching this 2010-05-04 09:49:07 -06:00
Eric Schulte 3652689944 org-mime: removed short string " xx " from semi syntax 2010-04-16 09:21:36 -06:00
Eric Schulte 3b5c85fb95 org-mime: WL is now fully supported -- thanks to Eric S. Fraga 2010-04-15 09:40:03 -06:00
Eric Schulte a2769bef61 org-mime: bug fixes, thanks to Eric S Fraga and Andrew Hyatt for their debugging help 2010-04-14 09:12:41 -06:00
Eric Schulte b617a457ae org-mime: change `org-mime-org-export' to more closely mimic `org-run-like-in-org-mode' 2010-04-12 11:21:59 -06:00
Eric Schulte 722dd7eb5c org-mime: cleaned `org-mime-default-header' from text/plain exports 2010-04-10 15:15:05 -06:00
Eric Schulte 8258daf439 added org-mime.el to contrib -- allows HTML email composition with Org-mode
see http://orgmode.org/worg/org-contrib/org-mime.php for
  documentation

  much thanks to everyone on the "using orgmode to send html mail"
  thread (see http://thread.gmane.org/gmane.emacs.orgmode/23153)
  especially David Maus for ideas, discussion, and suggestions
2010-04-09 10:26:57 -06:00