Mercurial > emacs
comparison lisp/net/ange-ftp.el @ 105811:18865054beee
(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.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Sat, 31 Oct 2009 02:19:41 +0000 |
| parents | 1165f7844d0a |
| children | 9470a3d1abee |
comparison
equal
deleted
inserted
replaced
| 105810:9381dbed5719 | 105811:18865054beee |
|---|---|
| 665 ;; ange-ftp.el. | 665 ;; ange-ftp.el. |
| 666 | 666 |
| 667 ;;; Code: | 667 ;;; Code: |
| 668 | 668 |
| 669 (require 'comint) | 669 (require 'comint) |
| 670 ;; Silence compiler: | |
| 671 (eval-when-compile | |
| 672 (require 'dired) | |
| 673 (defvar comint-last-output-start nil) | |
| 674 (defvar comint-last-input-start nil) | |
| 675 (defvar comint-last-input-end nil)) | |
| 676 | 670 |
| 677 ;;;; ------------------------------------------------------------ | 671 ;;;; ------------------------------------------------------------ |
| 678 ;;;; User customization variables. | 672 ;;;; User customization variables. |
| 679 ;;;; ------------------------------------------------------------ | 673 ;;;; ------------------------------------------------------------ |
| 680 | 674 |
| 4578 ;; The ARGUMENTS are (nearly) always files. | 4572 ;; The ARGUMENTS are (nearly) always files. |
| 4579 (if (ange-ftp-ftp-name default-directory) | 4573 (if (ange-ftp-ftp-name default-directory) |
| 4580 ;; Can't use ange-ftp-dired-host-type here because the current | 4574 ;; Can't use ange-ftp-dired-host-type here because the current |
| 4581 ;; buffer is *dired-check-process output* | 4575 ;; buffer is *dired-check-process output* |
| 4582 (condition-case oops | 4576 (condition-case oops |
| 4583 (cond ((equal dired-chmod-program program) | 4577 (cond ((equal (or (bound-and-true-p dired-chmod-program) "chmod") |
| 4578 program) | |
| 4584 (ange-ftp-call-chmod arguments)) | 4579 (ange-ftp-call-chmod arguments)) |
| 4585 ;; ((equal "chgrp" program)) | 4580 ;; ((equal "chgrp" program)) |
| 4586 ;; ((equal dired-chown-program program)) | 4581 ;; ((equal dired-chown-program program)) |
| 4587 (t (error "Unknown remote command: %s" program))) | 4582 (t (error "Unknown remote command: %s" program))) |
| 4588 (ftp-error (insert (format "%s: %s, %s\n" | 4583 (ftp-error (insert (format "%s: %s, %s\n" |