# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1256955581 0
# Node ID 18865054beee1e7c86eff03d970b65c838867562
# Parent  9381dbed5719d5bdfbede762ad58770c41ddba1f
(top-level): Don't require dired when compiling.
(comint-last-output-start, comint-last-input-start)
(comint-last-input-end): Don't defvar when compiling.
(ange-ftp-process-file): Use bound-and-true-p.

diff -r 9381dbed5719 -r 18865054beee lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Oct 31 02:17:41 2009 +0000
+++ b/lisp/ChangeLog	Sat Oct 31 02:19:41 2009 +0000
@@ -1,5 +1,10 @@
 2009-10-31  Glenn Morris  <rgm@gnu.org>
 
+	* net/ange-ftp.el (top-level): Don't require dired when compiling.
+	(comint-last-output-start, comint-last-input-start)
+	(comint-last-input-end): Don't defvar when compiling.
+	(ange-ftp-process-file): Use bound-and-true-p.
+
 	* pcmpl-rpm.el (top-level): Move provide statement to end.
 	(pcmpl-rpm): Remove unused custom group.
 
diff -r 9381dbed5719 -r 18865054beee lisp/net/ange-ftp.el
--- a/lisp/net/ange-ftp.el	Sat Oct 31 02:17:41 2009 +0000
+++ b/lisp/net/ange-ftp.el	Sat Oct 31 02:19:41 2009 +0000
@@ -667,12 +667,6 @@
 ;;; Code:
 
 (require 'comint)
-;; Silence compiler:
-(eval-when-compile
-  (require 'dired)
-  (defvar comint-last-output-start nil)
-  (defvar comint-last-input-start nil)
-  (defvar comint-last-input-end nil))
 
 ;;;; ------------------------------------------------------------
 ;;;; User customization variables.
@@ -4580,7 +4574,8 @@
       ;; Can't use ange-ftp-dired-host-type here because the current
       ;; buffer is *dired-check-process output*
       (condition-case oops
-	  (cond ((equal dired-chmod-program program)
+	  (cond ((equal (or (bound-and-true-p dired-chmod-program) "chmod")
+			program)
 		 (ange-ftp-call-chmod arguments))
 		;; ((equal "chgrp" program))
 		;; ((equal dired-chown-program program))