Fix file name for source export

Hsiu-Khuern writes:

> Hi all,
>
> The footnote at the bottom of section 13.1.4 ("Publishing
> action") of the Org manual says that publishing org files to
> the same directory using org-publish-org-to-org results in
> files named like file-source.org.  It actually results in
> file.org-source, which is not as nice.  I believe the
> problem is in the org-export-as-org function in org-exp.el.

lisp/ChangeLog

@@ -1,5 +1,8 @@
 2009-08-01  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org-exp.el (org-export-as-org): Insert the "-source" string
+	before the extension.
+
 	* org.el (org-read-date): Make sure the calendar is in the current
 	frame.
 	(org-set-emph-re): Remove the ? from the post-match.

lisp/org-exp.el

@@ -2509,7 +2509,9 @@ directory."
 	 (filename (and filename
 			(if (equal (file-truename filename)
 				   (file-truename bfname))
-			    (concat filename "-source")
+			    (concat (file-name-sans-extension filename)
+				    "-source."
+				    (file-name-extension filename))
 			  filename)))
 	 (backup-inhibited t)
 	 (buffer (find-file-noselect filename))