[Emacs-diffs] Changes to emacs/lisp/net/tramp-smb.el

[Michael Albinus]

Index: emacs/lisp/net/tramp-smb.el
diff -c emacs/lisp/net/tramp-smb.el:1.20 emacs/lisp/net/tramp-smb.el:1.21
*** emacs/lisp/net/tramp-smb.el:1.20    Mon Jul  4 17:10:37 2005
--- emacs/lisp/net/tramp-smb.el Sun Aug  7 15:42:42 2005
***************
*** 46,56 ****
        (defalias 'warnings 'identity) ; Pacify Emacs byte-compiler
        (byte-compiler-options (warnings (- unused-vars))))))
  
- ;; XEmacs byte-compiler raises warning abouts `last-coding-system-used'.
- (eval-when-compile
-   (unless (boundp 'last-coding-system-used)
-     (defvar last-coding-system-used nil)))
- 
  ;; Define SMB method ...
  (defcustom tramp-smb-method "smb"
    "*Method to connect SAMBA and M$ SMB servers."
--- 46,51 ----
***************
*** 598,610 ****
        (let ((share (tramp-smb-get-share localname))
            (file (tramp-smb-get-localname localname t))
            (curbuf (current-buffer))
-           ;; We use this to save the value of `last-coding-system-used'
-           ;; after writing the tmp file.  At the end of the function,
-           ;; we set `last-coding-system-used' to this saved value.
-           ;; This way, any intermediary coding systems used while
-           ;; talking to the remote shell or suchlike won't hose this
-           ;; variable.  This approach was snarfed from ange-ftp.el.
-           coding-system-used
            tmpfil)
        ;; Write region into a tmp file.
        (setq tmpfil (tramp-make-temp-file))
--- 593,598 ----
***************
*** 616,624 ****
         (if confirm ; don't pass this arg unless defined for backward compat.
             (list start end tmpfil append 'no-message lockname confirm)
           (list start end tmpfil append 'no-message lockname)))
-       ;; Now, `last-coding-system-used' has the right value.  Remember it.
-       (when (boundp 'last-coding-system-used)
-         (setq coding-system-used last-coding-system-used))
  
        (tramp-smb-maybe-open-connection user host share)
        (tramp-message-for-buffer
--- 604,609 ----
***************
*** 636,645 ****
          (error "Buffer has changed from `%s' to `%s'"
                 curbuf (current-buffer)))
        (when (eq visit t)
!         (set-visited-file-modtime))
!       ;; Make `last-coding-system-used' have the right value.
!       (when (boundp 'last-coding-system-used)
!         (setq last-coding-system-used coding-system-used))))))
  
  
  ;; Internal file name functions
--- 621,627 ----
          (error "Buffer has changed from `%s' to `%s'"
                 curbuf (current-buffer)))
        (when (eq visit t)
!         (set-visited-file-modtime))))))
  
  
  ;; Internal file name functions
***************
*** 1000,1006 ****
      (while (and (not found) (not err))
  
        ;; Accept pending output.
!       (accept-process-output proc)
  
        ;; Search for prompt.
        (goto-char (point-min))
--- 982,988 ----
      (while (and (not found) (not err))
  
        ;; Accept pending output.
!       (tramp-accept-process-output proc)
  
        ;; Search for prompt.
        (goto-char (point-min))