From 90d646d2007faa462ce0acc0413a4923cf4b9731 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Thu, 29 Jun 2000 17:54:49 +0000
Subject: [PATCH] Clarify selector-interpretation logic in SELECT-MESSAGE.

---
 v7/src/imail/imail-top.scm | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/v7/src/imail/imail-top.scm b/v7/src/imail/imail-top.scm
index 2b325cb73..e1d7bddf7 100644
--- a/v7/src/imail/imail-top.scm
+++ b/v7/src/imail/imail-top.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: imail-top.scm,v 1.200 2000/06/29 17:52:18 cph Exp $
+;;; $Id: imail-top.scm,v 1.201 2000/06/29 17:54:49 cph Exp $
 ;;;
 ;;; Copyright (c) 1999-2000 Massachusetts Institute of Technology
 ;;;
@@ -1717,16 +1717,15 @@ Negative argument means search in reverse."
 		      (if (and index (< index (folder-length folder)))
 			  (get-message folder index)
 			  (last-message folder)))))
+	       ((exact-nonnegative-integer? selector)
+		(if (< selector (folder-length folder))
+		    (get-message folder selector)
+		    (error:bad-range-argument selector 'SELECT-MESSAGE)))
 	       ((not selector)
 		(last-message folder))
-	       ((and (exact-integer? selector)
-		     (<= 0 selector)
-		     (< selector (folder-length folder)))
-		(get-message folder selector))
 	       (else
 		(error:wrong-type-argument selector "message selector"
-					   'SELECT-MESSAGE))))
-	(raw? (if (default-object? raw?) #f raw?)))
+					   'SELECT-MESSAGE)))))
     (if (or (if (default-object? force?) #f force?)
 	    (not (eq? message (buffer-get buffer 'IMAIL-MESSAGE 'UNKNOWN))))
 	(begin
@@ -1740,17 +1739,17 @@ Negative argument means search in reverse."
 	      (lambda ()
 		(if message
 		    (begin
-		      (store-property! message 'RAW? raw?)
+		      (store-property! message 'RAW?
+				       (if (default-object? raw?) #f raw?))
 		      (insert-message message #f 0 mark))
 		    (insert-string "[This folder has no messages in it.]"
 				   mark))))
 	    (mark-temporary! mark))
 	  (set-buffer-point! buffer (buffer-start buffer))
 	  (buffer-not-modified! buffer)))
-    (if message
-	(message-seen message))
+    (if message (message-seen message))
     (folder-event folder 'SELECT-MESSAGE message)))
-
+
 (define (selected-folder #!optional error? buffer)
   (or (let ((buffer
 	     (chase-imail-buffer
-- 
2.25.1