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

[Kai Großjohann]

Index: emacs/lisp/net/tramp.el
diff -c emacs/lisp/net/tramp.el:1.16 emacs/lisp/net/tramp.el:1.17
*** emacs/lisp/net/tramp.el:1.16        Sat Aug  3 19:26:14 2002
--- emacs/lisp/net/tramp.el     Sun Aug  4 07:41:38 2002
***************
*** 72,78 ****
  ;; In the Tramp CVS repository, the version numer is auto-frobbed from
  ;; the Makefile, so you should edit the top-level Makefile to change
  ;; the version number.
! (defconst tramp-version "2.0.8"
    "This version of tramp.")
  
  (defconst tramp-bug-report-address "address@hidden"
--- 72,78 ----
  ;; In the Tramp CVS repository, the version numer is auto-frobbed from
  ;; the Makefile, so you should edit the top-level Makefile to change
  ;; the version number.
! (defconst tramp-version "2.0.9"
    "This version of tramp.")
  
  (defconst tramp-bug-report-address "address@hidden"
***************
*** 1244,1250 ****
    "perl -MMIME::Base64 -0777 -ne 'print encode_base64($_)'"
    "Perl program to use for encoding a file.
  Escape sequence %s is replaced with name of Perl binary.
! This string is passwd to `format', so percent characters need to be doubled.
  This implementation requires the MIME::Base64 Perl module to be installed
  on the remote host.")
  
--- 1244,1250 ----
    "perl -MMIME::Base64 -0777 -ne 'print encode_base64($_)'"
    "Perl program to use for encoding a file.
  Escape sequence %s is replaced with name of Perl binary.
! This string is passed to `format', so percent characters need to be doubled.
  This implementation requires the MIME::Base64 Perl module to be installed
  on the remote host.")
  
***************
*** 1252,1258 ****
    "perl -MMIME::Base64 -0777 -ne 'print decode_base64($_)'"
    "Perl program to use for decoding a file.
  Escape sequence %s is replaced with name of Perl binary.
! This string is passwd to `format', so percent characters need to be doubled.
  This implementation requires the MIME::Base64 Perl module to be installed
  on the remote host.")
  
--- 1252,1258 ----
    "perl -MMIME::Base64 -0777 -ne 'print decode_base64($_)'"
    "Perl program to use for decoding a file.
  Escape sequence %s is replaced with name of Perl binary.
! This string is passed to `format', so percent characters need to be doubled.
  This implementation requires the MIME::Base64 Perl module to be installed
  on the remote host.")
  
***************
*** 3501,3518 ****
         5 "Starting remote shell `%s' for tilde expansion..." shell)
        (tramp-send-command
         multi-method method user host
!        (concat "PS1='$ ' ; exec " shell)) ;
        (unless (tramp-wait-for-regexp
                 (get-buffer-process (current-buffer))
!                60 (format "\\(\\$ *\\|\\(%s\\)\\'\\)" shell-prompt-pattern))
          (pop-to-buffer (buffer-name))
          (error "Couldn't find remote `%s' prompt." shell))
        (process-send-string nil (format "PS1='%s%s%s'; PS2=''; PS3=''%s"
                                         tramp-rsh-end-of-line
                                         tramp-end-of-output
                                         tramp-rsh-end-of-line
                                         tramp-rsh-end-of-line))
        (tramp-wait-for-output)
        (tramp-send-command multi-method method user host "echo hello")
        (tramp-message 5 "Waiting for remote `%s' to start up..." shell)
        (unless (tramp-wait-for-output 5)
--- 3501,3522 ----
         5 "Starting remote shell `%s' for tilde expansion..." shell)
        (tramp-send-command
         multi-method method user host
!        (concat "PS1='$ ' exec " shell)) ;
        (unless (tramp-wait-for-regexp
                 (get-buffer-process (current-buffer))
!                60 (format "\\(\\$ *\\|\\(%s\\)\\)\\'" shell-prompt-pattern))
          (pop-to-buffer (buffer-name))
          (error "Couldn't find remote `%s' prompt." shell))
+       (tramp-message
+        10 "Setting remote shell prompt...")
        (process-send-string nil (format "PS1='%s%s%s'; PS2=''; PS3=''%s"
                                         tramp-rsh-end-of-line
                                         tramp-end-of-output
                                         tramp-rsh-end-of-line
                                         tramp-rsh-end-of-line))
        (tramp-wait-for-output)
+       (tramp-message
+        10 "Setting remote shell prompt...done")
        (tramp-send-command multi-method method user host "echo hello")
        (tramp-message 5 "Waiting for remote `%s' to start up..." shell)
        (unless (tramp-wait-for-output 5)
***************
*** 4645,4651 ****
           "Checking remote decoding command `%s' for sanity" dc)
          (unless (zerop (tramp-send-command-and-check
                          multi-method method user host
!                         (format "%s </dev/null >/dev/null" dc) t))
            (throw 'wont-work nil))
          ;; If no encoding/decoding function is given, the
          ;; corresponding encoding/decoding command also has to work
--- 4649,4655 ----
           "Checking remote decoding command `%s' for sanity" dc)
          (unless (zerop (tramp-send-command-and-check
                          multi-method method user host
!                         (format "echo xyzzy | %s | %s >/dev/null" ec dc) t))
            (throw 'wont-work nil))
          ;; If no encoding/decoding function is given, the
          ;; corresponding encoding/decoding command also has to work
***************
*** 5654,5659 ****
--- 5658,5669 ----
  If you can give a simple set of instructions to make this bug happen
  reliably, please include those.  Thank you for helping kill bugs in
  TRAMP.
+ 
+ Another useful thing to do is to put (setq tramp-debug-buffer t) in
+ the ~/.emacs file and to repeat the bug.  Then, include the contents
+ of the *tramp/foo* buffer and the *debug tramp/foo* buffer in your bug
+ report.
+ 
  --bug report follows this line--")))
  
  (defalias 'tramp-submit-bug 'tramp-bug)