From xemacs-m  Sat Aug  2 00:39:39 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 AAA08354
	for <xemacs-beta@xemacs.org>; Sat, 2 Aug 1997 00:39:38 -0500 (CDT)
Received: (from karlheg@localhost)
	by bittersweet.inetarena.com (8.8.6/8.8.6/Debian/GNU) id WAA01109;
	Fri, 1 Aug 1997 22:40:06 -0700
To: XEmacs Beta <xemacs-beta@xemacs.org>
Subject: [PATCH] `dired.el' fixed.
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
From: karlheg+xemacs@inetarena.com (Karl M. Hegbloom)
Date: 01 Aug 1997 22:40:05 -0700
Message-ID: <87204di1my.fsf@bittersweet.inetarena.com>
Lines: 43
X-Mailer: Gnus v5.4.64/XEmacs 20.3(beta16) - "Budapest"

 The `nt' quick fix was inside an `and' block, and causing it to fail
on *nix.  Here's a patch.


1997-08-01  Karl M. Hegbloom  <karlheg@inetarena.com>

	* efs/dired.el (dired-get-filename) Move the skipping of the
 	ending carriage return on NT to inside the setq so `and' won't
 	fail on Unix.

=== cd /usr/local/src/xemacs-20/lisp/efs/
=== cvs -d /usr/local/cvsroot diff -u dired.el

Index: dired.el
===================================================================
RCS file: /usr/local/cvsroot/xemacs-20/lisp/efs/dired.el,v
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1.2.1 dired.el
--- dired.el	1997/08/02 05:33:34	1.1.1.1.2.1
+++ dired.el	1997/08/02 05:30:03
@@ -2953,11 +2953,9 @@
     (save-excursion
       (and
        (setq p1 (dired-move-to-filename (not no-error-if-not-filep) bol eol))
-       (setq p2 (dired-move-to-end-of-filename no-error-if-not-filep bol eol))
-       ;; We seem to be picking up the carriage-return at the end of the
-       ;; line, so here's a quick fix to get dired working.
-       (if (eq system-type 'windows-nt)
-         (setq p2 (1- p2)))
+       (setq p2 (if (eq system-type 'windows-nt) ; ignore carriage-return at eol
+		    (1- (dired-move-to-end-of-filename no-error-if-not-filep bol eol))
+		  (dired-move-to-end-of-filename no-error-if-not-filep bol eol)))
        (setq file (buffer-substring p1 p2))
        ;; Check if ls quoted the names, and unquote them.
        ;; Using read to unquote is much faster than substituting



-- 
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

