* calendar/todos.el (todos-item-start): Restore commented out code

to prevent wrongly moving point in widened buffer.

2 files changed, 11 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0ee809b5d2f..9fe801d3f06 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2012-09-19  Stephen Berman  <stephen.berman@gmx.net>
 
+        * calendar/todos.el (todos-item-start): Restore commented out code
+        to prevent wrongly moving point in widened buffer.
+
+2012-09-19  Stephen Berman  <stephen.berman@gmx.net>
+
         * calendar/todos.el: Remove old commentary from todo-mode.el; add
         and revise further doc strings and comments; require cl.el at
         compile time for remove-duplicates; use function powerset from
diff --git a/lisp/calendar/todos.el b/lisp/calendar/todos.el
index 34a1c10df70..457e49c267e 100644
--- a/lisp/calendar/todos.el
+++ b/lisp/calendar/todos.el
@@ -3369,10 +3369,12 @@ below the todo items."
 
 (defun todos-item-start ()
   "Move to start of current Todos item and return its position."
-  (unless (looking-at "^$")
-          ;; (or (looking-at "^$")       ; last item or between done and not done
-          ;;     ;; FIXME: need this? (was needed by abandoned todos-count-items)
-          ;;     (looking-at (regexp-quote todos-category-beg)))
+  (unless (or
+           ;; Point is either on last item in this category or on the empty
+           ;; line between done and not done items.
+           (looking-at "^$")
+           ;; There are no done items in this category yet.
+           (looking-at (regexp-quote todos-category-beg)))
     (goto-char (line-beginning-position))
     (while (not (looking-at todos-item-start))
       (forward-line -1))