tsd@tsdye.com (Thomas S. Dye) writes:

> Bernt Hansen <bernt@norang.ca> writes:
>
>> tsd@tsdye.com (Thomas S. Dye) writes:
>>
>>> With this patch, #+CAPTION: [Short caption]{Long caption.} in the
>>> Org-mode source exports to \caption[Short caption]{Long caption.} in the
>>> LaTeX export, which is, I think, as it should be.
>>
>> Hi Thomas,
>>
>> Thanks for the patch!
>>
>> Please add the above details (without the 'With this patch' and ', which
>> is, I think, as it should be') to body of the commit message (starting
>> on line 3).  This makes it possible to read just the commit log message
>> 6 months from now and know what the patch is about without the necessity
>> of reading the code changes.
>>
>> Regards,
>> Bernt
>>
>
> 6 months ... yikes!
>
> I think this is what you're asking for.  Let me know if it falls short.

Close :)

The attached patch would be better I think.  After applying it 
git log shows the following:

,----
| ~/git/org-mode$ git log -1
| commit cec944435abb688dd1e4b5acbe6d9bcc557c171b
| Author: Tom Dye <tsd@tsdye.com>
| Date:   Sun May 8 13:16:15 2011 -1000
| 
|     Activate optional argument to LaTeX caption command
|     
|     * doc/org.texi (Images and tables): Document optional #+CAPTION: form
|     * lisp/org-exp.el: Add support for optional caption form
|     * lisp/org-latex.el: Add support for optional caption form
|     
|     Captions of the form
|        #+CAPTION: [Short caption]{Long caption.}
|     export to
|        \caption[Short caption]{Long caption.} in the LaTeX export.
`----

git needs the blank line separating the subject from the body and I've
added the changelog entries (although you might want to reword them if
they are incorrect.

The updated patch is attached.

Regards,
Bernt