From xemacs-m  Thu Aug  7 04:09:26 1997
Received: from bittersweet.inetarena.com (karlheg@bittersweet.inetarena.com [206.129.216.38])
	by xemacs.org (8.8.5/8.8.5) with ESMTP id EAA28870
	for <xemacs-beta@xemacs.org>; Thu, 7 Aug 1997 04:09:24 -0500 (CDT)
Received: (from karlheg@localhost)
	by bittersweet.inetarena.com (8.8.6/8.8.6/Debian/GNU) id CAA28900;
	Thu, 7 Aug 1997 02:09:33 -0700
To: XEmacs Beta <xemacs-beta@xemacs.org>
Subject: [patch] `info.el', `man.el' : correction to my `flet' formatting.
X-Face: /Q}=yl}1_v7nP)xXo5XjG8+tl@=uVu7o5u6)f]zN?+<hB!K.m9:[|*p34jVN`O;:XZXVSy>/\R>qDt(t8w!-i{(y0"`jFw^uk8inzO9wXabd'CdjUWfC\GHi:6nO*YC89#-qD>Q4r%9!V"<RYJ=7D#$";q=zML5'!=wvXk^$`6FT=5CMofQX)WUKt0p:OKl.mFOXx/D
Mime-Version: 1.0 (generated by tm-edit 7.108)
Content-Type: multipart/mixed;
 boundary="Multipart_Thu_Aug__7_02:09:32_1997-1"
Content-Transfer-Encoding: 7bit
From: karlheg+xemacs@inetarena.com (Karl M. Hegbloom)
Date: 07 Aug 1997 02:09:32 -0700
Message-ID: <87g1sml5pv.fsf@bittersweet.inetarena.com>
Lines: 111
X-Mailer: Gnus v5.4.64/XEmacs 20.3(beta16) - "Budapest"

--Multipart_Thu_Aug__7_02:09:32_1997-1
Content-Type: text/plain; charset=US-ASCII

 I found an example that shows proper formatting for `labels' and
`flet' functions.  Here's two patches to apply on top of the ones I
mailed earlier, that can be considered as part of them.  Next time it
will be right the first time.


--Multipart_Thu_Aug__7_02:09:32_1997-1
Content-Type: text/plain; charset=US-ASCII

Index: lisp/packages/info.el
===================================================================
RCS file: /usr/local/cvsroot/xemacs-20/lisp/packages/info.el,v
retrieving revision 1.1.1.2.2.4
diff -u -r1.1.1.2.2.4 info.el
--- info.el	1997/08/06 22:25:38	1.1.1.2.2.4
+++ info.el	1997/08/07 09:03:13
@@ -2525,13 +2525,14 @@
 	up-p prev-p next-p menu xrefs subnodes in)
     (save-excursion
       ;; `one-space' fixes "Notes:" xrefs that are split across lines.
-      (flet ((one-space (text)
-	       (let (i)
-		 (while (setq i (string-match "[ \n\t]+" text i))
-		   (setq text (concat (substring text 0 i) " "
-				      (substring text (match-end 0))))
-		   (setq i (1+ i)))
-		 text)))
+      (flet
+	  ((one-space (text)
+		      (let (i)
+			(while (setq i (string-match "[ \n\t]+" text i))
+			  (setq text (concat (substring text 0 i) " "
+					     (substring text (match-end 0))))
+			  (setq i (1+ i)))
+			text)))
 	(goto-char (point-min))
 	(if (looking-at ".*\\bNext:") (setq next-p t))
 	(if (looking-at ".*\\bPrev:") (setq prev-p t))

--Multipart_Thu_Aug__7_02:09:32_1997-1
Content-Type: text/plain; charset=US-ASCII

Index: lisp/packages/man.el
===================================================================
RCS file: /usr/local/cvsroot/xemacs-20/lisp/packages/man.el,v
retrieving revision 1.1.1.2.2.2
diff -u -r1.1.1.2.2.2 man.el
--- man.el	1997/08/07 01:41:15	1.1.1.2.2.2
+++ man.el	1997/08/07 09:07:38
@@ -200,10 +200,11 @@
     (if (equal section "-k")
 	(setq apropos-mode t))
 
-    (let ((bufname (flet ((maybe-star ()
-			    (if buffers-menu-submenus-for-groups-p
-				""
-			      "*")))
+    (let ((bufname (flet
+		       ((maybe-star ()
+				    (if buffers-menu-submenus-for-groups-p
+					""
+				      "*")))
 		     (if apropos-mode
 			 (concat (maybe-star) "man apropos " topic (maybe-star))
 		       (concat (maybe-star)
@@ -261,10 +262,11 @@
 		 (set-buffer-modified-p nil)
 		 (Manual-mode)))))
 
-      (let ((page (flet ((maybe-star ()
-			   (if buffers-menu-submenus-for-groups-p
-			       ""
-			     "*")))
+      (let ((page (flet
+		      ((maybe-star ()
+				   (if buffers-menu-submenus-for-groups-p
+				       ""
+				     "*")))
 		    (if section
 			(concat (maybe-star) topic "(" section ")" (maybe-star))
 		      topic))))
@@ -646,10 +648,11 @@
 		  (setq manpage (buffer-substring (match-beginning 1)
 						  (match-end 1)))
 		(setq manpage "???"))
-	      (flet ((maybe-star ()
-		       (if buffers-menu-submenus-for-groups-p
-			   "*"
-			 "")))
+	      (flet
+		  ((maybe-star ()
+			       (if buffers-menu-submenus-for-groups-p
+				   "*"
+				 "")))
 		(setq buffer
 		      (rename-buffer
 		       (generate-new-buffer-name (concat (maybe-star)


--Multipart_Thu_Aug__7_02:09:32_1997-1
Content-Type: text/plain; charset=US-ASCII

mailto:karlheg+sig@inetarena.com (Karl M. Hegbloom)
http://www.inetarena.com/~karlheg
Portland, OR  USA
Debian GNU 1.3  Linux 2.0.30+parport AMD K5 PR-133

--Multipart_Thu_Aug__7_02:09:32_1997-1--

