diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/ange-ftp.el | 9 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a3183fb08b8..8cf34e1bdc7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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 --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)) |