浏览代码

Rename the Mobileorg capture file

It is now fixed to mobileorg.org, and not configurable.
Carsten Dominik 15 年之前
父节点
当前提交
3492407250
共有 3 个文件被更改,包括 9 次插入8 次删除
  1. 4 4
      doc/org.texi
  2. 3 0
      lisp/ChangeLog
  3. 2 4
      lisp/org-mobile.el

+ 4 - 4
doc/org.texi

@@ -11692,10 +11692,10 @@ from the WebDAV directory using @file{scp}.
    (shell-command "scp ~/stage/* user@@webdavhost:mobile/")))
    (shell-command "scp ~/stage/* user@@webdavhost:mobile/")))
 (add-hook 'org-mobile-pre-pull-hook
 (add-hook 'org-mobile-pre-pull-hook
   (lambda ()
   (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
 (add-hook 'org-mobile-post-pull-hook
   (lambda ()
   (lambda ()
-   (shell-command "scp ~/stage/mobile-capture.org user@@webdavhost:mobile/")))
+   (shell-command "scp ~/stage/mobileorg.org user@@webdavhost:mobile/")))
 @end example
 @end example
 
 
 @node Pushing to MobileOrg, Pulling from MobileOrg, Setting up the staging area, MobileOrg
 @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
 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
 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
 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:
 and operates on the pointers to flagged entries.  Here is how it works:
 
 
 @enumerate
 @enumerate
 @item
 @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
 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.
 captured entry will be a top-level entry in the inbox file.
 @item
 @item

+ 3 - 0
lisp/ChangeLog

@@ -1,5 +1,8 @@
 2009-09-18  Carsten Dominik  <carsten.dominik@gmail.com>
 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
 	* org.el (org-on-heading-p, org-at-heading-p): Make sure these are
 	always with `invisible-ok'.
 	always with `invisible-ok'.
 	(org-store-link): No error when there is nothing to link to in the
 	(org-store-link): No error when there is nothing to link to in the

+ 2 - 4
lisp/org-mobile.el

@@ -50,11 +50,9 @@ been appended to the file given here."
   :group 'org-mobile
   :group 'org-mobile
   :type 'file)
   :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.
   "The capture file where the mobile stores captured notes and flags.
-Relative to `org-mobile-directory'."
+This should not be changed, because MobileOrg assumes this name.")
-  :group 'org-mobile
-  :type 'file)
 
 
 (defcustom org-mobile-index-file "index.org"
 (defcustom org-mobile-index-file "index.org"
   "The index file with inks to all Org files that should be loaded by MobileOrg.
   "The index file with inks to all Org files that should be loaded by MobileOrg.