diff options
| author | Glenn Morris <rgm@gnu.org> | 2009-10-31 02:19:41 +0000 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2009-10-31 02:19:41 +0000 |
| commit | 5cf3709cc648fe3cab3d37358c8709e2e89b7b51 (patch) | |
| tree | 3a5cb0b29fde63782eaf728771c51567fd7f6cb9 /lisp/net | |
| parent | 4c814fd27ca4e6bda5f956913d405d552130d086 (diff) | |
| download | emacs-5cf3709cc648fe3cab3d37358c8709e2e89b7b51.tar.gz emacs-5cf3709cc648fe3cab3d37358c8709e2e89b7b51.tar.bz2 emacs-5cf3709cc648fe3cab3d37358c8709e2e89b7b51.zip | |
(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.
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/ange-ftp.el | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index 38b1646f452..7eb01d7c410 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -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 @@ NEWNAME should be the name to give the new compressed or uncompressed file.") ;; 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)) |