From xemacs-m  Thu Sep  4 02:04:03 1997
Received: from altair.xemacs.org (steve@xemacs.miranova.com [206.190.83.19])
	by xemacs.org (8.8.5/8.8.5) with ESMTP id CAA01840
	for <xemacs-beta@xemacs.org>; Thu, 4 Sep 1997 02:04:03 -0500 (CDT)
Received: (from steve@localhost)
	by altair.xemacs.org (8.8.7/8.8.7) id AAA18981;
	Thu, 4 Sep 1997 00:08:05 -0700
Mail-Copies-To: never
To: xemacs-beta@xemacs.org
Subject: [PATCH] Fix for 20.3 beta19 package docstring lossage
X-Face: `'%\i;ySOu]g?NlziJSk_$&@]KP`}~PEQPjZ5;nxSaDW_o$4+4%Ab]%Ifw3ZR;7TIT3,O,'
 @2{L;]ox6kc;$_5kU'n**9vFg-]eV~GbxSVCx|(s%uR[],*:^WKmC`B}(;|k9/m]gwt?&`t;^rfCJg
 khHH>pP1W\)xM0U@!FNDD72{3fDP$PkBhx^7Z?-WxH6DbFN:QOnT`llzW}VGdYv;n9lzljQvKTIBhQ
 YuV
X-Attribution: sb
From: SL Baur <steve@xemacs.org>
Mime-Version: 1.0 (generated by tm-edit 7.108)
Content-Type: text/plain; charset=US-ASCII
Date: 04 Sep 1997 00:08:04 -0700
Message-ID: <m2g1rly2sr.fsf@altair.xemacs.org>
Lines: 60
X-Mailer: Gnus v5.4.65/XEmacs 20.3(beta20) - "Tirana"

The DOC string lossage reported by several people is caused by the
'//' XEmacs internals fuckage[1].

I guess the lesson to be learned from this is that directories in the
`load-path' must have a trailing slash or You Will Lose.

;; This patch is in addition to the other patches I've posted.

1997-09-03  SL Baur  <steve@altair.xemacs.org>

	* prim/make-docfile.el (Top Level): Ensure `load-path' always has
	directory names ending in '/'.

	* prim/packages.el (list-autoloads-path): Assume `load-path'
	always has directories ending with trailing `/'s.

Index: lisp/prim/make-docfile.el
===================================================================
RCS file: /usr/local/xemacs/xemacs-20.0/lisp/prim/make-docfile.el,v
retrieving revision 1.8
diff -u -r1.8 make-docfile.el
--- make-docfile.el	1997/09/03 02:55:41	1.8
+++ make-docfile.el	1997/09/04 06:34:40
@@ -77,8 +77,10 @@
 ;; Then process the list of Lisp files.
 (define-function 'defalias 'define-function)
 (let ((temp-path (expand-file-name ".." (car load-path))))
-  (setq load-path (nconc (directory-files temp-path t "^[^-.]"
-					  nil 'dirs-only)
+  (setq load-path (nconc (mapcar
+			  #'(lambda (i) (concat i "/"))
+			  (directory-files temp-path t "^[^-.]"
+					   nil 'dirs-only))
 			 (cons temp-path load-path))))
 
 ;; Then process the autoloads

Index: lisp/prim/packages.el
===================================================================
RCS file: /usr/local/xemacs/xemacs-20.0/lisp/prim/packages.el,v
retrieving revision 1.7
diff -u -r1.7 packages.el
--- packages.el	1997/09/03 02:55:42	1.7
+++ packages.el	1997/09/04 06:33:19
@@ -140,9 +140,9 @@
 	autoloads)
     (while path
       (if (file-exists-p (concat (car path)
-				 "/" autoload-file-name))
+				 autoload-file-name))
 	  (setq autoloads (cons (concat (car path)
-					"/" autoload-file-name)
+					autoload-file-name)
 				autoloads)))
       (setq path (cdr path)))
     autoloads))

Footnotes: 
[1]  My car has died, I'm not in a good mood.  Sorry.

