--- orig/planner.el
+++ mod/planner.el
@@ -343,6 +343,24 @@
   :prefix "planner-"
   :group 'applications)
 
+(defcustom planner-carry-tasks-forward nil
+  "If non-nil, always carry undone tasks forward automatically."
+  :type 'boolean
+  :group 'planner)
+
+(defcustom planner-directory "~/Plans"
+  "The directory that contains your planning files."
+  :require 'planner
+  :type 'directory
+  :set 'planner-option-customized
+  :group 'planner)
+
+(defcustom planner-publishing-directory emacs-wiki-publishing-directory
+  "The directory where the planner wiki is published to."
+  :type 'directory
+  :set 'planner-option-customized
+  :group 'planner)
+
 (defcustom planner-reverse-chronological-notes t
   "*If non-nil, notes are added to the beginning of the section."
   :type 'boolean
@@ -353,11 +371,6 @@
   :type 'boolean
   :group 'planner)
 
-(defcustom planner-mode-hook nil
-  "A hook that is run when planner mode is entered."
-  :type 'hook
-  :group 'planner)
-
 (defcustom planner-annotation-functions
   '(planner-annotation-from-planner-note
     planner-annotation-from-planner
@@ -369,11 +382,6 @@
   :type 'hook
   :group 'planner)
 
-(defcustom planner-carry-tasks-forward nil
-  "If non-nil, always carry undone tasks forward automatically."
-  :type 'boolean
-  :group 'planner)
-
 (defcustom planner-day-page-template "* Tasks\n\n\n* Schedule\n\n\n* Notes\n\n\n"
   "Template to be inserted into blank daily pages."
   :type 'string
@@ -389,19 +397,6 @@
   :type 'boolean
   :group 'planner)
 
-(defcustom planner-directory "~/Plans"
-  "The directory that contains your planning files."
-  :require 'planner
-  :type 'directory
-  :set 'planner-option-customized
-  :group 'planner)
-
-(defcustom planner-publishing-directory emacs-wiki-publishing-directory
-  "The directory where the planner wiki is published to."
-  :type 'directory
-  :set 'planner-option-customized
-  :group 'planner)
-
 (defcustom planner-custom-variables nil
   "A list of planner-specific Emacs-Wiki variable settings.
 You can customize any emacs-wiki variable to be used specially within
@@ -1659,7 +1654,7 @@
     (when entry
       (replace-match
        (funcall (cdr entry)
-                (substring (match-string 0) (+ (length protocol) 2)))
+                (substring (match-string 0) (+ (length protocol) 1)))
        t t))))
 
 (defun planner-past-notes-tag (beg end &optional attrs)