diff -u /home/guerry/install/cvs/emacs/lisp/textmodes/org.el /home/guerry/elisp/testing/emacs/org.el
--- /home/guerry/install/cvs/emacs/lisp/textmodes/org.el	2007-10-26 11:33:11.000000000 +0100
+++ /home/guerry/elisp/testing/emacs/org.el	2007-11-01 20:15:55.000000000 +0000
@@ -12815,7 +12815,7 @@
 		 (replace-match x t t))))
 	;; Turn on org-mode in the remember buffer, set local variables
 	(org-mode)
-	(org-set-local 'org-finish-function 'remember-buffer)
+	(org-set-local 'org-finish-function 'remember-finalize)
 	(if (and file (string-match "\\S-" file) (not (file-directory-p file)))
 	    (org-set-local 'org-default-notes-file file))
 	(if (and headline (stringp headline) (string-match "\\S-" headline))
@@ -12859,7 +12859,7 @@
 	    (replace-match "")
 	  (and (re-search-forward "^[^#\n]" nil t) (backward-char 1))))
     (org-mode)
-    (org-set-local 'org-finish-function 'remember-buffer)))
+    (org-set-local 'org-finish-function 'remember-finalize)))
 
 ;;;###autoload
 (defun org-remember (&optional org-force-remember-template-char)
@@ -12867,7 +12867,7 @@
 If there is an active region, make sure remember uses it as initial content
 of the remember buffer."
   (interactive)
-  (if (eq org-finish-function 'remember-buffer)
+  (if (eq org-finish-function 'remember-finalize)
       (progn
 	(when (< (length org-remember-templates) 2)
 	  (error "No other template available"))

Diff finished.  Thu Nov  1 20:16:01 2007