[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp ChangeLog net/ange-ftp.el
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] emacs/lisp ChangeLog net/ange-ftp.el |
Date: |
Sat, 31 Oct 2009 02:19:45 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 09/10/31 02:19:45
Modified files:
lisp : ChangeLog
lisp/net : ange-ftp.el
Log message:
(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.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16531&r2=1.16532
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/net/ange-ftp.el?cvsroot=emacs&r1=1.114&r2=1.115
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16531
retrieving revision 1.16532
diff -u -b -r1.16531 -r1.16532
--- ChangeLog 31 Oct 2009 02:17:41 -0000 1.16531
+++ ChangeLog 31 Oct 2009 02:19:41 -0000 1.16532
@@ -1,5 +1,10 @@
2009-10-31 Glenn Morris <address@hidden>
+ * 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.
Index: net/ange-ftp.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/ange-ftp.el,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -b -r1.114 -r1.115
--- net/ange-ftp.el 18 Oct 2009 00:46:52 -0000 1.114
+++ net/ange-ftp.el 31 Oct 2009 02:19:45 -0000 1.115
@@ -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))