From 3492407250f4c2b9a65be7603c46dcc2e68132e5 Mon Sep 17 00:00:00 2001
From: Carsten Dominik <carsten.dominik@gmail.com>
Date: Fri, 18 Sep 2009 18:00:24 +0100
Subject: [PATCH] Rename the Mobileorg capture file

It is now fixed to mobileorg.org, and not configurable.
---
 doc/org.texi       | 8 ++++----
 lisp/ChangeLog     | 3 +++
 lisp/org-mobile.el | 6 ++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/doc/org.texi b/doc/org.texi
index b81c15bdd..986d1be98 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -11692,10 +11692,10 @@ from the WebDAV directory using @file{scp}.
    (shell-command "scp ~/stage/* user@@webdavhost:mobile/")))
 (add-hook 'org-mobile-pre-pull-hook
   (lambda ()
-   (shell-command "scp user@@webdavhost:mobile/mobile-capture.org ~/stage/ ")))
+   (shell-command "scp user@@webdavhost:mobile/mobileorg.org ~/stage/ ")))
 (add-hook 'org-mobile-post-pull-hook
   (lambda ()
-   (shell-command "scp ~/stage/mobile-capture.org user@@webdavhost:mobile/")))
+   (shell-command "scp ~/stage/mobileorg.org user@@webdavhost:mobile/")))
 @end example
 
 @node Pushing to MobileOrg, Pulling from MobileOrg, Setting up the staging area, MobileOrg
@@ -11719,13 +11719,13 @@ files will be downloaded to the iPhone.
 
 When @i{MobileOrg} synchronizes with the WebDAV server, it not only pulls the
 Org files for viewing.  It also appends captured entries and pointers to
-flagged entries to the file @file{mobile-capture.org} on the server.  Org has
+flagged entries to the file @file{mobileorg.org} on the server.  Org has
 a @emph{pull} operation that integrates this information into an inbox file
 and operates on the pointers to flagged entries.  Here is how it works:
 
 @enumerate
 @item
-Org moves all entries found in @file{mobile-capture.org} and appends them to
+Org moves all entries found in @file{mobileorg.org} and appends them to
 the file pointed to by the variable @code{org-mobile-inbox-for-pull}.  Each
 captured entry will be a top-level entry in the inbox file.
 @item
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 54995da52..74f8cf9c7 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2009-09-18  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org-mobile.el (org-mobile-capture-file): Use `mobileorg.org' as
+	the capture file, and make it non-configurable.
+
 	* org.el (org-on-heading-p, org-at-heading-p): Make sure these are
 	always with `invisible-ok'.
 	(org-store-link): No error when there is nothing to link to in the
diff --git a/lisp/org-mobile.el b/lisp/org-mobile.el
index 3fae12c94..4b7bcdf39 100644
--- a/lisp/org-mobile.el
+++ b/lisp/org-mobile.el
@@ -50,11 +50,9 @@ been appended to the file given here."
   :group 'org-mobile
   :type 'file)
 
-(defcustom org-mobile-capture-file "mobile-capture.org"
+(defconst org-mobile-capture-file "mobileorg.org"
   "The capture file where the mobile stores captured notes and flags.
-Relative to `org-mobile-directory'."
-  :group 'org-mobile
-  :type 'file)
+This should not be changed, because MobileOrg assumes this name.")
 
 (defcustom org-mobile-index-file "index.org"
   "The index file with inks to all Org files that should be loaded by MobileOrg.