[Emacs-diffs] Changes to emacs/lisp/net/ange-ftp.el [lexbind]

[Miles Bader]

Index: emacs/lisp/net/ange-ftp.el
diff -c emacs/lisp/net/ange-ftp.el:1.35.2.5 emacs/lisp/net/ange-ftp.el:1.35.2.6
*** emacs/lisp/net/ange-ftp.el:1.35.2.5 Tue Jul  6 10:23:37 2004
--- emacs/lisp/net/ange-ftp.el  Sat Sep  4 09:26:23 2004
***************
*** 1014,1020 ****
  
  (defun ange-ftp-hash-entry-exists-p (key tbl)
    "Return whether there is an association for KEY in TABLE."
!   (not (eq (gethash key tbl 'unknown) 'unknown)))
  
  (defun ange-ftp-hash-table-keys (tbl)
    "Return a sorted list of all the active keys in TABLE, as strings."
--- 1014,1020 ----
  
  (defun ange-ftp-hash-entry-exists-p (key tbl)
    "Return whether there is an association for KEY in TABLE."
!   (and tbl (not (eq (gethash key tbl 'unknown) 'unknown))))
  
  (defun ange-ftp-hash-table-keys (tbl)
    "Return a sorted list of all the active keys in TABLE, as strings."
***************
*** 1771,1777 ****
                                ange-ftp-gateway-program
                                ange-ftp-gateway-host)))
         (ftp (mapconcat 'identity args " ")))
!     (process-kill-without-query proc)
      (set-process-sentinel proc 'ange-ftp-gwp-sentinel)
      (set-process-filter proc 'ange-ftp-gwp-filter)
      (save-excursion
--- 1771,1777 ----
                                ange-ftp-gateway-program
                                ange-ftp-gateway-host)))
         (ftp (mapconcat 'identity args " ")))
!     (set-process-query-on-exit-flag proc nil)
      (set-process-sentinel proc 'ange-ftp-gwp-sentinel)
      (set-process-filter proc 'ange-ftp-gwp-filter)
      (save-excursion
***************
*** 1880,1886 ****
                    (start-process " *nslookup*" " *nslookup*"
                                   ange-ftp-nslookup-program host)))
            (res host))
!       (process-kill-without-query proc)
        (save-excursion
          (set-buffer (process-buffer proc))
          (while (memq (process-status proc) '(run open))
--- 1880,1886 ----
                    (start-process " *nslookup*" " *nslookup*"
                                   ange-ftp-nslookup-program host)))
            (res host))
!       (set-process-query-on-exit-flag proc nil)
        (save-excursion
          (set-buffer (process-buffer proc))
          (while (memq (process-status proc) '(run open))
***************
*** 1938,1944 ****
        (set-buffer (process-buffer proc))
        (goto-char (point-max))
        (set-marker (process-mark proc) (point)))
!     (process-kill-without-query proc)
      (set-process-sentinel proc 'ange-ftp-process-sentinel)
      (set-process-filter proc 'ange-ftp-process-filter)
      ;; On Windows, the standard ftp client buffers its output (because
--- 1938,1944 ----
        (set-buffer (process-buffer proc))
        (goto-char (point-max))
        (set-marker (process-mark proc) (point)))
!     (set-process-query-on-exit-flag proc nil)
      (set-process-sentinel proc 'ange-ftp-process-sentinel)
      (set-process-filter proc 'ange-ftp-process-filter)
      ;; On Windows, the standard ftp client buffers its output (because
***************
*** 2919,2929 ****
               ;; error message.
               (gethash "." ent))
          ;; Child lookup failed, so try the parent.
!         (let ((table (ange-ftp-get-files dir 'no-error)))
!           ;; If the dir doesn't exist, don't use it as a hash table.
!           (and table
!                (ange-ftp-hash-entry-exists-p file
!                                              table)))))))
  
  (defun ange-ftp-get-file-entry (name)
    "Given NAME, return the given file entry.
--- 2919,2926 ----
               ;; error message.
               (gethash "." ent))
          ;; Child lookup failed, so try the parent.
!         (ange-ftp-hash-entry-exists-p
!          file (ange-ftp-get-files dir 'no-error))))))
  
  (defun ange-ftp-get-file-entry (name)
    "Given NAME, return the given file entry.
***************
*** 3374,3384 ****
    (setq file (ange-ftp-expand-file-name file))
    (if (ange-ftp-ftp-name file)
        (condition-case nil
!         (let ((file-ent
!                (gethash
!                 (ange-ftp-get-file-part file)
!                 (ange-ftp-get-files (file-name-directory file)))))
!           (and (stringp file-ent) file-ent))
        ;; If we can't read the parent directory, just assume
        ;; this file is not a symlink.
        ;; This makes it possible to access a directory that
--- 3371,3381 ----
    (setq file (ange-ftp-expand-file-name file))
    (if (ange-ftp-ftp-name file)
        (condition-case nil
!         (let ((ent (ange-ftp-get-files (file-name-directory file))))
!           (and ent
!                (stringp (setq ent
!                               (gethash (ange-ftp-get-file-part file) ent)))
!                ent))
        ;; If we can't read the parent directory, just assume
        ;; this file is not a symlink.
        ;; This makes it possible to access a directory that