Commits

Anonymous committed 66cfb45

Sync with old package tree.

Comments (0)

Files changed (3)

+2001-06-03  Michael Sperber [Mr. Preprocessor]  <sperber@informatik.uni-tuebingen.de>
+
+	* fixup.el (load-path): Use DIFFMODEDIR.
+
+	* Makefile.dired (DIFFMODEDIR): Introduce.
+
+	* dired.el (dired-recursive-delete-directory): Make the
+	directory-and-no-symlink test more efficient.	
+
+2001-05-30  Gregory Neil Shapiro <gshapiro@gshapiro.net>
+
+	* dired.el (dired-recursive-delete-directory): Don't recurse into
+	symlinks.
+
 2001-03-31  Michael Sperber [Mr. Preprocessor]  <sperber@informatik.uni-tuebingen.de>
 
 	* Makefile.dired: Added IGNORE_CUSTOM variable to control inclusion
 BDIR=
 # Directory containing VM's .elc files.
 VMDIR=
+# Directory containing diffmode .elc file.
+DIFFMODEDIR=
 # Directory containing custom's .elc files.
 CUSTOMDIR=
 # Bourne shell executable, please.
 .SUFFIXES: .elc .el .texi .info
 
 .el.elc:
-	BDIR=$(BDIR) CWD=$(CWD) VMDIR=$(VMDIR) CUSTOMDIR=$(CUSTOMDIR)\
+	BDIR=$(BDIR) CWD=$(CWD) VMDIR=$(VMDIR) DIFFMODEDIR=$(DIFFMODEDIR) CUSTOMDIR=$(CUSTOMDIR)\
    $(EMACS) -batch -no-site-file -l $(CWD)/fixup $(IGNORE_CUSTOM) -f batch-byte-compile $(CWD)/$<
 
 .texi.info:
 	    (let ((file (car files)))
 	      (if (not (member (file-name-nondirectory file)
 			       '("." "..")))
-		  (if (file-directory-p file)
+		  ;; This test is equivalent to
+		  ;; (and (file-directory-p fn)
+		  ;;      (not (file-symlink-p fn)))
+		  ;; but more efficient
+		  (if (eq t (car (file-attributes file)))
 		      (dired-recursive-delete-directory file)
 		    (delete-file file)))
 	      (setq files (cdr files))))