Merge lp:~akwm/vm/thread-folding into lp:vm

[Arik]

Add thread folding option to summary view

Adding thread folding to the normal thread view in summary. Options include showing number of threads at root message indicator along with folding on movement. Toggle/Expand/Collapse functions exist for flexibility, and indicator in the first cursor position shows toggle state.

New messages always display, allowing long conversations to take up less space in mailbox yet still remain in focus. Default binding to "T" for toggling thread fold state is simple and obvious. Is option controlled so does not affect summary both when not viewing in thread mode or when it's own master switch is off, i.e. changes here are available but not required.

[Uday Reddy (reddyuday)]

Dear Arik,

Thanks very much for all your good work! I have tested your additions
quite strenusously, and they looked quite solid. So, I have now
merged them into the trunk. I have made a few changes along the way,
including renaming variables/functions. I have also added a page in
the "Summaries" chapter of the info manual. If you look at this page,
you will get a quick summary of the changes I made.

I have logged on Launchpad a few problems that I have found as bug
reports. I will now assign them to you.

I have also added you to the VM development team. I am hoping that
this will enable you to make changes to the trunk and check them in.
If it doesn't allow it, then you can always make a personal branch and
we can merge the changes later.

Cheers,
Uday

Arik writes:

> Arik has proposed merging lp:~akwm/vm/thread-folding into lp:vm.
>
> Requested reviews:
> Uday (uday)
>
>
> Adding thread folding to the normal thread view in summary. Options include
> showing number of threads at root message indicator along with folding on
> movement. Toggle/Expand/Collapse functions exist for flexibility, and indicator
> in the first cursor position shows toggle state.
>
> New messages always display, allowing long conversations to take up less space
> in mailbox yet still remain in focus. Default binding to "T" for toggling
> thread fold state is simple and obvious. Is option controlled so does not
> affect summary both when not viewing in thread mode or when it's own master
> switch is off, i.e. changes here are available but not required.
> --
> https://code.launchpad.net/~akwm/vm/thread-folding/+merge/29020
> You are subscribed to branch lp:vm.
>

[Uday Reddy (reddyuday)]

Sorry, it looks like the merge didn't get pushed to the Launchpad yet. I will push it tonight from my home computer.

Cheers,
Uday

=== modified file 'lisp/vm-motion.el'
--- lisp/vm-motion.el	2010-05-06 21:20:17 +0000
+++ lisp/vm-motion.el	2010-07-01 17:00:54 +0000
@@ -56,7 +56,11 @@
       (if (eq vm-message-pointer cons)
 	  (vm-preview-current-message)
 	(vm-record-and-change-message-pointer vm-message-pointer cons)
-	(vm-preview-current-message)))))
+	(vm-preview-current-message)
+	;;(message "start of message you want is: %s" (vm-su-start-of (car vm-message-pointer)))
+	(if (get-text-property (+ (vm-su-start-of (car vm-message-pointer)) 2) 'invisible vm-summary-buffer)
+	    (vm-expand-thread))
+	))))
 
 ;;;###autoload
 (defun vm-goto-message-last-seen ()
@@ -158,7 +162,8 @@
   ;;
   ;; Note that interactively all args are 1, so error signaling
   ;; and retries apply to all interactive moves.
-  (interactive "p\np\np")
+  (interactive "p\np\np")  
+  ;;(message "running vm next message")
   (if (interactive-p)
       (vm-follow-summary-cursor))
   (vm-select-folder-buffer-and-validate)
@@ -195,15 +200,21 @@
 			(setq count 1)
 		      ;; reset for next pass
 		      (setq oldmp vm-message-pointer))))
-	      (vm-decrement count)))
+		(if (not (and vm-summary-toggle-thread-folding 
+			      vm-summary-show-threads 
+			      (get-text-property (vm-su-start-of (car vm-message-pointer)) 'invisible vm-summary-buffer)))
+		    (vm-decrement count))
+		))
 	(beginning-of-folder (setq error 'beginning-of-folder))
 	(end-of-folder (setq error 'end-of-folder))))
      (t
       (condition-case ()
-	  (progn
+	  (progn	    
 	    (vm-move-message-pointer direction)
-	    (while (and (not (eq oldmp vm-message-pointer))
-			(vm-should-skip-message vm-message-pointer t))
+	    (while (or (and (not (eq oldmp vm-message-pointer))
+			    (vm-should-skip-message vm-message-pointer t)			
+			    )
+		       (get-text-property (vm-su-start-of (car vm-message-pointer)) 'invisible vm-summary-buffer))
 	      (vm-move-message-pointer direction))
 	    ;; Retry the move if we've gone a complete circle and
 	    ;; retries are allowed and there are other messages
@@ -235,6 +246,9 @@
 	(end-of-folder
 	 ;; we bumped into the end of the folder without finding
 	 ;; a suitable stopping point; retry the move if we're allowed.
+	 (if (get-text-property (vm-su-start-of (car vm-message-pointer)) 'invisible vm-summary-buffer)
+	     (progn (setq error 'end-of-folder) (setq retry nil)))
+
 	 (setq vm-message-pointer oldmp)
 	 ;; if the retry fails, we make sure the message pointer
 	 ;; is restored to its old value.
@@ -281,9 +295,23 @@
   (vm-select-folder-buffer)
   (vm-display nil nil '(vm-next-message-no-skip)
 	      '(vm-next-message-no-skip))
+
+  (if (and vm-summary-toggle-thread-folding vm-summary-show-threads vm-summary-thread-folding-on-motion)
+      (let ((m nil))
+	(set-buffer vm-summary-buffer)
+	(setq m (get-text-property (+ (point) 3) 'vm-message))
+	(if (< (+ (vm-su-end-of m) 3) (buffer-size))
+	    (progn
+	      (if (get-text-property (+ (vm-su-end-of m) 3) 'invisible) (vm-expand-thread))
+	      (if (not (get-text-property (+ (vm-su-end-of m) 3) 'thread-root))
+		  (vm-collapse-thread t))
+	      ))
+	))
+  
   (let ((vm-skip-deleted-messages nil)
 	(vm-skip-read-messages nil))
     (vm-next-message count nil t)))
+
 ;; backward compatibility
 (fset 'vm-Next-message 'vm-next-message-no-skip)
 
@@ -296,9 +324,27 @@
   (vm-select-folder-buffer)
   (vm-display nil nil '(vm-previous-message-no-skip)
 	      '(vm-previous-message-no-skip))
+
+  (if (and vm-summary-toggle-thread-folding vm-summary-show-threads vm-summary-thread-folding-on-motion)
+      (let ((m nil))
+	(set-buffer vm-summary-buffer)
+	(setq m (get-text-property (+ (point) 3) 'vm-message))
+	(if (> (- (vm-su-start-of m) 3) 0)
+	    (if (get-text-property (- (vm-su-start-of m) 3) 'invisible) 
+		(save-excursion
+		  (goto-char (- (vm-su-start-of m) 4))
+		  (vm-expand-thread))))
+	(if (not (get-text-property (+ (point) 3) 'thread-root))
+	    (vm-collapse-thread))
+	))
+
   (let ((vm-skip-deleted-messages nil)
 	(vm-skip-read-messages nil))
-    (vm-previous-message count)))
+    (vm-previous-message count))
+
+  )
+
+
 ;; backward compatibility
 (fset 'vm-Previous-message 'vm-previous-message-no-skip)
 
@@ -446,22 +492,32 @@
 	       ;; the position at eob belongs to the last message
 	       ((and (eobp) (= (vm-su-end-of (car message-pointer)) point))
 		nil )
+	       ((eobp)
+		(save-excursion
+		  (while (get-text-property (- (point) 3) 'invisible)
+		    (goto-char (- (vm-su-start-of (get-text-property (- (point) 3) 'vm-message)) 3)))
+		  (vm-goto-message (string-to-number (vm-number-of (get-text-property (- (point) 3) 'vm-message)))))
+		t)
 	       ;; make the position at eob belong to the last message
-	       ((eobp)
-		(setq mp (vm-last message-pointer))
-		(save-excursion
-		  (set-buffer vm-mail-buffer)
-		  (vm-record-and-change-message-pointer vm-message-pointer mp)
-		  (vm-preview-current-message)
-		  ;; return non-nil so the caller will know that
-		  ;; a new message was selected.
-		  t ))
+	       ;; ((eobp)
+	       ;; 	(while (get-text-property (point) 'invisible)
+	       ;; 	  (goto-char (1- (point)))
+	       ;; 	  setq mp 
+	       ;; 	  ;;(setq mp (vm-last message-pointer))
+	       ;; 	(save-excursion
+	       ;; 	  (set-buffer vm-mail-buffer)
+	       ;; 	  (vm-record-and-change-message-pointer vm-message-pointer mp)
+	       ;; 	  (vm-preview-current-message)
+	       ;; 	  ;; return non-nil so the caller will know that
+	       ;; 	  ;; a new message was selected.
+	       ;; 	  t ))
 	       (t
 		(if (< point (vm-su-start-of (car message-pointer)))
 		    (setq mp message-list)
 		  (setq mp (cdr message-pointer) message-pointer nil))
-		(while (and (not (eq mp message-pointer))
-			    (>= point (vm-su-end-of (car mp))))
+		(while (or (and (not (eq mp message-pointer))
+				(>= point (vm-su-end-of (car mp))))
+			   (get-text-property (+ (vm-su-start-of (car mp)) 3) 'invisible))			    
 		  (setq mp (cdr mp)))
 		(if (not (eq mp message-pointer))
 		    (save-excursion

=== modified file 'lisp/vm-page.el'
--- lisp/vm-page.el	2010-06-16 19:35:45 +0000
+++ lisp/vm-page.el	2010-07-01 17:00:54 +0000
@@ -230,6 +230,7 @@
 	 (vm-emit-eom-blurb))))
 
 (defun vm-emit-eom-blurb ()
+<<<<<<< TREE
   "Prints a minibuffer message when the end of message is reached, but
 it is suppressed if the variable `vm-auto-next-message' is nil."
   (interactive)
@@ -248,6 +249,18 @@
   (interactive)
   (if vm-emit-messages-for-mime-decoding
       (message str)))
+=======
+  (interactive)
+  (let ((vm-summary-uninteresting-senders-arrow "")
+	(case-fold-search nil))
+    (message (if (and (stringp vm-summary-uninteresting-senders)
+		      (string-match vm-summary-uninteresting-senders
+				    (vm-su-from (car vm-message-pointer))))
+		 "End of message %s to %.50s..."
+	       "End of message %s from %.50s...")
+	     (vm-number-of (car vm-message-pointer))
+	     (vm-summary-sprintf "%F" (car vm-message-pointer)))))
+>>>>>>> MERGE-SOURCE
 
 ;;;###autoload
 (defun vm-scroll-backward (&optional arg)
@@ -750,8 +763,12 @@
 		  (vm-unread-flag (car vm-message-pointer)))
 	    (vm-run-message-hook (car vm-message-pointer)
 				 'vm-select-unread-message-hook)))
+<<<<<<< TREE
 
      ;; 3. prepare the Presentation buffer
+=======
+     
+>>>>>>> MERGE-SOURCE
      (vm-narrow-for-preview (not need-preview))
      (if (or vm-always-use-presentation-buffer
              vm-mime-display-function
@@ -929,8 +946,9 @@
          (vm-update-summary-and-mode-line)
 	 (vm-howl-if-eom))
      (vm-update-summary-and-mode-line)))
-  (if vm-summary-toggle-thread-folding
-      (vm-summary-toggle-thread-folding 1)))
+  ;;(if vm-summary-toggle-thread-folding
+  ;;    (vm-summary-toggle-thread-folding 1))
+  )
 
 ;;;###autoload
 (defun vm-expose-hidden-headers ()

=== modified file 'lisp/vm-summary.el'
--- lisp/vm-summary.el	2010-06-03 19:14:45 +0000
+++ lisp/vm-summary.el	2010-07-01 17:00:54 +0000
@@ -117,7 +117,7 @@
 argument START-POINT (a list of messages) or, if it is nil, all
 the messages in the current folder."
   (let ((m-list (or start-point vm-message-list))
-	mp m tr trs tre
+	mp m tr trs tre ntc mmmr mmm nm
 	(n 0)
 	(modulus 10)
 	(do-mouse-track
@@ -158,8 +158,9 @@
                   (when (and vm-summary-toggle-thread-folding
                              vm-summary-show-threads)
                     (if (= 0 (vm-thread-indentation-of m))
-                        (setq tr m trs s tre e)
+                        (setq tr m trs s tre e ntc 0)
                       (save-excursion
+<<<<<<< TREE
                         (when (and tr trs
                                    (progn (goto-char (1+ (vm-su-start-of tr)))
                                           (not (looking-at "-"))))
@@ -176,6 +177,48 @@
 		  (message "Generating summary... %d" n)
 		  (if debug (debug "vm-debug-summary: Generating summary"))
 		  (setq debug nil)))
+=======
+			(if (not tr)
+			    (progn
+			      (setq mmm (get-text-property (- (vm-su-start-of m) 3) 'vm-message))
+			      (setq mmmr (get-text-property (+ (vm-su-start-of mmm) 2) 'thread-root))
+			      (if mmmr (setq tr mmmr) (setq tr mmm))
+			      (setq trs (vm-su-start-of tr) tre (vm-su-end-of tr))
+			      ;; this sucks, do we really have to recount all of the threads
+			      ;; for this root message? 
+			      (setq ntc -1)
+			      (setq nm (get-text-property (+ (vm-su-end-of tr) 3) 'vm-message))
+			      ;;(message "next message is: %s" nm)
+			      (while (and (not (null nm)) (> (vm-thread-indentation-of nm) 0))
+				(setq ntc (1+ ntc))
+				(if (< (+ (vm-su-end-of nm) 3) (buffer-size))
+				    (setq nm (get-text-property (+ (vm-su-end-of nm) 3) 'vm-message))
+				  (setq nm nil)))			      
+			      ))
+			(progn
+			  (when (and tr trs
+				     (progn (goto-char (vm-su-start-of tr))
+					    (not (looking-at "-"))))
+			    (if (not (vm-new-flag m))
+				(put-text-property s e 'invisible t))
+			  (goto-char (vm-su-start-of tr))
+			  (delete-char 1)
+			  (insert "+"))
+			  (put-text-property s e 'thread-root tr)
+			  (setq ntc (1+ ntc))
+			  (goto-char (+ (vm-su-start-of tr) 5 (- (length (vm-padded-number-of m)) 3)))
+			  (put-text-property (vm-su-start-of tr) (vm-su-end-of tr) 'thread-count ntc)
+			  (if vm-summary-show-thread-count
+			      (progn
+				(delete-char 4)
+				(insert (format "+%-3s" ntc))))
+			)))
+		  ))    
+	      (setq mp (cdr mp) n (1+ n))
+	      )
+		;;(if (zerop (% n modulus))
+		;;    (message "Generating summary... %d" n)))
+>>>>>>> MERGE-SOURCE
 	      ;; now convert the ints to markers.
 	      ;; no need for another message - it is fast enough
 	      ;; (if (>= n modulus)
@@ -199,6 +242,7 @@
 	(unless vm-summary-debug 
 	  (message "Generating summary... done")))))
 
+<<<<<<< TREE
 (defun vm-summary-toggle-thread-folding (&optional visible)
   "Toggle the thread folding at point."
   (interactive)
@@ -220,6 +264,95 @@
           (insert (if i "+" "-"))
           (goto-char (vm-su-start-of m))
           (delete-char 1))))))
+=======
+(defun vm-expand-thread ()
+  "expand the thread associated with the message at point. This
+will make visible all invisible elements of the thread tree and
+place a '-' character at the pointer position indicated the
+thread can be collapsed."
+  (interactive)
+  (if (and vm-summary-toggle-thread-folding vm-summary-show-threads)
+      (progn
+	(vm-select-folder-buffer)
+	(vm-follow-folders-summary-cursor)
+	(set-buffer vm-summary-buffer)
+	(let ((buffer-read-only nil)
+	      r nm
+	      )
+	  (setq r (get-text-property (+ (point) 3) 'thread-root))
+	  (if (null r)
+	      (setq r (get-text-property (+ (point) 3) 'vm-message)))
+	  (save-excursion	    
+	    (goto-char (vm-su-start-of  r))
+	    (insert "-")
+	    (delete-char 1)
+	    )
+	  (setq nm (get-text-property (+ (vm-su-end-of r) 2) 'vm-message))
+	  (while (and  (not (null nm)) (> (vm-thread-indentation-of nm) 0) )
+	    (put-text-property (vm-su-start-of nm) (vm-su-end-of nm) 'invisible nil)
+	    (if (< (+ (vm-su-end-of nm) 2) (buffer-size))
+		(setq nm (get-text-property (+ (vm-su-end-of nm) 2) 'vm-message))
+	      (setq nm nil)))))))
+
+(defun vm-collapse-thread (&optional nomove)
+  "collapse the thread associated with the message at point. This
+will make invisible all read and non-new elements of the thread
+tree and will place a '+' character at the pointer position
+indicating the thread can be expanded. Optional argument nomove
+directs vm-collapse-thread to not take the default action of
+moving the pointer to the thread root after collapsing."
+  (interactive "P")
+  (if (and vm-summary-toggle-thread-folding vm-summary-show-threads)
+      (progn
+	(vm-select-folder-buffer)
+	(vm-follow-folders-summary-cursor)
+	(set-buffer vm-summary-buffer)
+	(let ((buffer-read-only nil)
+	      r nm
+	      )
+	  (setq r (get-text-property (+ (point) 3) 'thread-root))
+	  (if (null r)
+	      (setq r (get-text-property (+ (point) 3) 'vm-message)))
+	  (save-excursion	    
+	    (goto-char (vm-su-start-of  r))
+	    (insert "+")
+	    (delete-char 1)
+	    )
+	  (if (< (+ (vm-su-end-of r) 3) (buffer-size))
+	      (progn
+		(setq nm (get-text-property (+ (vm-su-end-of r) 3) 'vm-message))
+		(while (and  (not (null nm)) (> (vm-thread-indentation-of nm) 0))
+		  (if (not (vm-new-flag nm))
+		      (put-text-property (vm-su-start-of nm) (vm-su-end-of nm) 'invisible t))
+		  (if (< (+ (vm-su-end-of nm) 3) (buffer-size))
+		      (setq nm (get-text-property (+ (vm-su-end-of nm) 3) 'vm-message)) (setq nm nil))
+		  )
+		))
+	  ;; move to the parent thread
+	  (if (not nomove)
+	      (progn
+		(vm-select-folder-buffer)
+		(vm-goto-message (string-to-number (vm-number-of r)))))))))
+
+(defun vm-toggle-expand-thread ()
+  "toggle collapse/expand thread associated with message at point.
+see vm-expand-thread and vm-collapse thread for a description of
+action."
+  (interactive)
+  (if (and vm-summary-toggle-thread-folding vm-summary-show-threads)
+      (progn
+	(vm-select-folder-buffer)
+	(vm-follow-folders-summary-cursor)
+	(set-buffer vm-summary-buffer)
+	(let ((buffer-read-only nil)
+	      r nm
+	      )
+	  (setq r (get-text-property (+ (point) 3) 'thread-root))
+	  (if (null r)
+	      (setq r (get-text-property (+ (point) 3) 'vm-message)))
+	  (goto-char (vm-su-start-of r))
+	  (if (looking-at "-") (vm-collapse-thread) (vm-expand-thread))))))	  
+>>>>>>> MERGE-SOURCE
 
 (defun vm-do-needed-summary-rebuild ()
   "Rebuild the summary lines of all the messages starting at
@@ -257,6 +390,7 @@
 	  (setq summary (vm-su-summary m))
 	  (set-buffer (marker-buffer (vm-su-start-of m)))
 	  (let ((buffer-read-only nil)
+		n s e r i
 		(selected nil)
 		(modified (buffer-modified-p)))
 	    (unwind-protect
@@ -282,11 +416,17 @@
 		  ;; pushes the point marker into the next
 		  ;; summary entry. We achieve (1) by inserting a
 		  ;; placeholder character at the end of the
-		  ;; summary entry before deleting the region.
+		  ;; summary entry before deleting the region.		  
                   (goto-char (vm-su-end-of m)) 		
                   (insert-before-markers "z")
 		  (goto-char (vm-su-start-of m))
+		  (setq s (vm-su-start-of m))
+		  (setq e (vm-su-end-of m))
+		  (setq r (get-text-property (+ s 2) 'thread-root))		  
+		  (setq n (get-text-property (+ s 2) 'thread-count))
+		  (setq i (get-text-property (+ s 2) 'invisible))
 		  (delete-region (point) (1- (vm-su-end-of m)))
+<<<<<<< TREE
 		  (if vm-summary-toggle-thread-folding
 		      ;; Rob's thread-folding version
 		      (if (not selected)
@@ -308,9 +448,29 @@
 		    (if (not selected)
 			(insert vm-summary-no-=>)
 		      (insert vm-summary-=>)))
+=======
+		  (if (not selected)
+                      (if (not (get-text-property (point) 'thread-end))
+                          (insert vm-summary-no-=>)
+                        (if (get-text-property (1+ (vm-su-end-of vm-summary-pointer))
+                                               'invisible)
+                            (insert "x ")
+                          (insert "u ")))
+                    (if (not (get-text-property (point) 'thread-end))
+                        (insert vm-summary-=>)
+                      (if (get-text-property (1+ (vm-su-end-of vm-summary-pointer))
+                                             'invisible)
+                          (insert "x>")
+                        (insert "y>"))))
+>>>>>>> MERGE-SOURCE
 		  (vm-tokenized-summary-insert m (vm-su-summary m))
-                  (delete-char 1)
-                  (run-hooks 'vm-summary-update-hook)
+	          (delete-char 1)
+		  (if (and n vm-summary-show-thread-count)
+		      (progn
+			(goto-char (+ (vm-su-start-of m) 5 (- (length (vm-padded-number-of m)) 3)))
+			(delete-char 4)
+			(insert (format "+%-3s" n))))
+		  (run-hooks 'vm-summary-update-hook)
 		  (and do-mouse-track
 		       (vm-mouse-set-mouse-track-highlight
 			(vm-su-start-of m)
@@ -319,7 +479,13 @@
 		  (if (and selected vm-summary-highlight-face)
 		      (vm-summary-highlight-region (vm-su-start-of m) (point)
 						   vm-summary-highlight-face)))
-	      (set-buffer-modified-p modified)))))))
+	      (set-buffer-modified-p modified)
+	      (if (not (null r))
+		  (put-text-property s e 'thread-root r) 
+		  (put-text-property s e 'thread-count n))
+	      (put-text-property s e 'vm-message m)
+	      (put-text-property s e 'invisible i)
+	      ))))))
 
 (defun vm-set-summary-pointer (m)
   (if vm-summary-buffer
@@ -329,6 +495,7 @@
 		  (vm-mouse-support-possible-p)))
 	    (old-window nil))
 	(vm-save-buffer-excursion
+<<<<<<< TREE
 	 (unwind-protect
 	     (progn
 	       (set-buffer vm-summary-buffer)
@@ -381,6 +548,70 @@
 		 (and w vm-auto-center-summary (vm-auto-center-summary))
 		 (run-hooks 'vm-summary-pointer-update-hook)))
 	   (and old-window (select-window old-window)))))))
+=======
+	  (unwind-protect
+	      (progn
+		(set-buffer vm-summary-buffer)
+		(if w
+		    (progn
+		      (setq old-window (selected-window))
+		      (select-window w)))
+		(let ((buffer-read-only nil))
+		  (if (and vm-summary-pointer
+			   (vm-su-start-of vm-summary-pointer))
+		      (progn
+			(goto-char (vm-su-start-of vm-summary-pointer))
+			(if (not (get-text-property (+ (point) 3) 'invisible))
+			    (progn 
+			      (if (not (null (get-text-property (+ (point) 3) 'thread-count)))
+				  (if (looking-at "+") (progn (insert "+ ") (delete-char (length vm-summary-=>))) (progn (insert "- ") (delete-char (length vm-summary-=>))))
+			      (progn (insert vm-summary-no-=>)
+				     (delete-char (length vm-summary-=>))))
+			      )
+			  (progn
+			    (delete-char (length vm-summary-=>))
+			    (insert vm-summary-no-=>)
+			    ;; re-invisible it so we dont have problems
+			    (put-text-property (- (point) (length vm-summary-no-=>)) (point) 'invisible t)
+			    )
+			  )
+			(and do-mouse-track
+			     (vm-mouse-set-mouse-track-highlight
+			      (vm-su-start-of vm-summary-pointer)
+			      (vm-su-end-of vm-summary-pointer)
+			      (vm-su-summary-mouse-track-overlay-of
+			       vm-summary-pointer)))))
+		  (setq vm-summary-pointer m)
+		  (goto-char (vm-su-start-of m))
+		  (let ((modified (buffer-modified-p)))
+		    (unwind-protect
+			(progn
+
+                          ;; (if (not (get-text-property (point) 'thread-end))
+                          ;;     (insert vm-summary-=>)
+                          ;;   (if (get-text-property (+ (vm-su-end-of vm-summary-pointer) 2)
+                          ;;                          'invisible)
+                          ;;       (insert "+>")
+                          ;;     (insert "->")))
+			  (if  (and (< (+ (vm-su-end-of m) 3) (buffer-size)) (get-text-property (+ (vm-su-end-of m) 3) 'invisible))
+			      (insert "+>")
+			    (insert vm-summary-=>))
+			  (delete-char (length vm-summary-=>))
+
+			  (and do-mouse-track
+			       (vm-mouse-set-mouse-track-highlight
+				(vm-su-start-of m) (vm-su-end-of m)
+				(vm-su-summary-mouse-track-overlay-of m))))
+		      (set-buffer-modified-p modified)))
+		  (forward-char (- (length vm-summary-=>)))
+		  (if vm-summary-highlight-face
+		      (vm-summary-highlight-region
+		       (vm-su-start-of m) (vm-su-end-of m)
+		       vm-summary-highlight-face))
+		  (and w vm-auto-center-summary (vm-auto-center-summary))
+		  (run-hooks 'vm-summary-pointer-update-hook)))
+	    (and old-window (select-window old-window)))))))
+>>>>>>> MERGE-SOURCE
 
 (defun vm-summary-highlight-region (start end face)
   (vm-summary-xxxx-highlight-region start end face 'vm-summary-overlay))
@@ -510,7 +741,16 @@
 						     (- end start))))))))
 		 (setq group-list (cdr group-list))))
 	      ((eq token 'number)
-	       (insert (vm-padded-number-of message)))
+	       (let (mynum)
+		 (if (and vm-summary-show-thread-count vm-summary-toggle-thread-folding vm-summary-show-threads)
+		     (if (> (vm-th-thread-indentation message) 0)
+			 (setq mynum (concat "  " (vm-padded-number-of message) " ")) (setq mynum (concat (vm-padded-number-of message) "   "))
+			 )
+		   (setq mynum (vm-padded-number-of message))
+		   )
+		 (insert mynum)
+		 )
+	       )
 	      ((eq token 'mark)
 	       (insert (vm-su-mark message)))
 	      ((eq token 'thread-indent)
@@ -1773,6 +2013,7 @@
 		  (delete-region (point) (1- (vm-fs-end-of fs)))
 		  (insert
 		   (vm-folders-summary-sprintf vm-folders-summary-format fs))
+		  
 		  (delete-char 1)
 		  (and do-mouse-track
 		       (vm-mouse-set-mouse-track-highlight

=== modified file 'lisp/vm-vars.el'
--- lisp/vm-vars.el	2010-06-27 09:45:03 +0000
+++ lisp/vm-vars.el	2010-07-01 17:00:54 +0000
@@ -4834,6 +4834,7 @@
     (define-key map "\M-W" 'vm-show-no-warranty)
     (define-key map "\C-c\C-s" 'vm-mime-save-all-attachments)
     (define-key map "\C-c\C-d" 'vm-mime-delete-all-attachments)
+    (define-key map "T" 'vm-toggle-expand-thread)
     ;; suppress-keymap provides these, but now that we don't use
     ;; suppress-keymap anymore...
     (define-key map "0" 'digit-argument)
@@ -4865,6 +4866,18 @@
   "Enables folding of threads in VM summary windows.  (This
 functionality is highly experimental!)")
 
+(defvar vm-summary-show-thread-count t
+  "when set to 't' and thread folding is enabled (see 
+vm-summary-toggle-thread-folding) this will display the current
+number of thread in the thread root message number indicator. 
+Note that this takes up 4 extra character in your summary")
+
+(defvar vm-summary-thread-folding-on-motion nil
+  "when set to 't' and thread folding is enabled, calling
+vm-next/previous-message-no-skip will ('N' or 'P' respectively)
+will expand or collapse the thread upon moving into or out of
+its extreme most members")
+
 (defvar vm-summary-mode-map vm-mode-map
   "Keymap for VM Summary mode")
 

=== modified file 'lisp/vm-version.el'
--- lisp/vm-version.el	2010-05-23 09:36:08 +0000
+++ lisp/vm-version.el	2010-07-01 17:00:54 +0000
@@ -32,6 +32,8 @@
 (defun vm-version ()
   "Return the value of the variable `vm-version'."
   (interactive)
+  (if (not vm-version)
+      (setq vm-version "None"))
   (when (interactive-p)
     (or (and (stringp vm-version)
 	     (string-match "[0-9]" vm-version))