emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/tramp 8f851af: Tramp ELPA version 2.4.3.4 released


From: Michael Albinus
Subject: [elpa] externals/tramp 8f851af: Tramp ELPA version 2.4.3.4 released
Date: Wed, 29 Apr 2020 03:49:35 -0400 (EDT)

branch: externals/tramp
commit 8f851af7363c4066e417b754e4baf4f9537cad9d
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>

    Tramp ELPA version 2.4.3.4 released
---
 test/tramp-tests.el | 151 ++++++++++++++++++++++++++++++++++++++++++++++------
 texi/tramp.texi     |  20 ++++++-
 texi/trampver.texi  |   2 +-
 tramp-loaddefs.el   |  15 ++++--
 tramp-smb.el        |  43 ++++++++++++---
 tramp.el            |   6 ++-
 tramp.info          |  59 ++++++++++++--------
 trampver.el         |   6 ++-
 8 files changed, 247 insertions(+), 55 deletions(-)

diff --git a/test/tramp-tests.el b/test/tramp-tests.el
index c098bfb..3ee357f 100644
--- a/test/tramp-tests.el
+++ b/test/tramp-tests.el
@@ -3357,7 +3357,7 @@ They might differ only in time attributes or directory 
size."
               (tramp--test-file-attributes-equal-p
                (file-attributes (car elt)) (cdr elt))))
 
-           (setq attr (directory-files-and-attributes tmp-name2 nil "^b"))
+           (setq attr (directory-files-and-attributes tmp-name2 nil "\\`b"))
            (should (equal (mapcar #'car attr) '("bar" "boz"))))
 
        ;; Cleanup.
@@ -4612,9 +4612,10 @@ INPUT, if non-nil, is a string sent to the process."
                (should (= (point) (point-max)))
                (shell-command "echo baz" (current-buffer))
                (should (string-equal "barbaz\n" (buffer-string)))
-               (should (= point (point)))))
+               (should (= point (point)))
+               (should-not (= (point) (point-max)))))
 
-           ;; Erase if the buffer is not current one.
+           ;; Erase if the buffer is not current one.  Point is not moved.
            (let (shell-command-dont-erase-buffer)
              (with-current-buffer buffer
                (erase-buffer)
@@ -4625,22 +4626,28 @@ INPUT, if non-nil, is a string sent to the process."
                (with-temp-buffer
                  (shell-command "echo baz" buffer))
                (should (string-equal "baz\n" (buffer-string)))
-               (should (= point (point)))))
+               (should (= point (point)))
+               (should-not (= (point) (point-max)))))
 
            ;; Erase if buffer is the current one, but
            ;; `shell-command-dont-erase-buffer' is set to `erase'.
+           ;; There is no point to check point.
            (let ((shell-command-dont-erase-buffer 'erase))
              (with-temp-buffer
                (insert "bar")
-               (setq point (point))
                (should (string-equal "bar" (buffer-string)))
                (should (= (point) (point-max)))
                (shell-command "echo baz" (current-buffer))
                (should (string-equal "baz\n" (buffer-string)))
-               (should (= (point) (point-max)))))
-
-           ;; Don't erase if `shell-command-dont-erase-buffer' is set
-           ;; to `beg-last-out'.  Check point.
+               ;; In the local case, point is not moved after the
+               ;; inserted text.
+               (should (= (point)
+                          (if (file-remote-p default-directory)
+                              (point-max) (point-min))))))
+
+           ;; Don't erase if the buffer is the current one and
+           ;; `shell-command-dont-erase-buffer' is set to
+           ;; `beg-last-out'.  Check point.
            (let ((shell-command-dont-erase-buffer 'beg-last-out))
              (with-temp-buffer
                (insert "bar")
@@ -4649,10 +4656,32 @@ INPUT, if non-nil, is a string sent to the process."
                (should (= (point) (point-max)))
                (shell-command "echo baz" (current-buffer))
                (should (string-equal "barbaz\n" (buffer-string)))
-               (should (= point (point)))))
-
-           ;; Don't erase if `shell-command-dont-erase-buffer' is set
-           ;; to `end-last-out'.  Check point.
+               ;; There is still an error in Tramp.
+               (unless (file-remote-p default-directory)
+                 (should (= point (point)))
+                 (should-not (= (point) (point-max))))))
+
+           ;; Don't erase if the buffer is not the current one and
+           ;; `shell-command-dont-erase-buffer' is set to
+           ;; `beg-last-out'.  Check point.
+           (let ((shell-command-dont-erase-buffer 'beg-last-out))
+             (with-current-buffer buffer
+               (erase-buffer)
+               (insert "bar")
+               (setq point (point))
+               (should (string-equal "bar" (buffer-string)))
+               (should (= (point) (point-max)))
+               (with-temp-buffer
+                 (shell-command "echo baz" buffer))
+               (should (string-equal "barbaz\n" (buffer-string)))
+               ;; There is still an error in Tramp.
+               (unless (file-remote-p default-directory)
+                 (should (= point (point)))
+                 (should-not (= (point) (point-max))))))
+
+           ;; Don't erase if the buffer is the current one and
+           ;; `shell-command-dont-erase-buffer' is set to
+           ;; `end-last-out'.  Check point.
            (let ((shell-command-dont-erase-buffer 'end-last-out))
              (with-temp-buffer
                (insert "bar")
@@ -4661,10 +4690,36 @@ INPUT, if non-nil, is a string sent to the process."
                (should (= (point) (point-max)))
                (shell-command "echo baz" (current-buffer))
                (should (string-equal "barbaz\n" (buffer-string)))
-               (should (= (point) (point-max)))))
+               ;; This does not work as expected in the local case.
+               ;; Therefore, we negate the test for the time being.
+               (should-not
+                (funcall (if (file-remote-p default-directory) #'identity 
#'not)
+                         (= point (point))))
+               (should
+                (funcall (if (file-remote-p default-directory) #'identity 
#'not)
+                         (= (point) (point-max))))))
 
-           ;; Don't erase if `shell-command-dont-erase-buffer' is set
-           ;; to `save-point'.  Check point.
+           ;; Don't erase if the buffer is not the current one and
+           ;; `shell-command-dont-erase-buffer' is set to
+           ;; `end-last-out'.  Check point.
+           (let ((shell-command-dont-erase-buffer 'end-last-out))
+             (with-current-buffer buffer
+               (erase-buffer)
+               (insert "bar")
+               (setq point (point))
+               (should (string-equal "bar" (buffer-string)))
+               (should (= (point) (point-max)))
+               (with-temp-buffer
+                 (shell-command "echo baz" buffer))
+               (should (string-equal "barbaz\n" (buffer-string)))
+               ;; There is still an error in Tramp.
+               (unless (file-remote-p default-directory)
+                 (should-not (= point (point)))
+                 (should (= (point) (point-max))))))
+
+           ;; Don't erase if the buffer is the current one and
+           ;; `shell-command-dont-erase-buffer' is set to
+           ;; `save-point'.  Check point.
            (let ((shell-command-dont-erase-buffer 'save-point))
              (with-temp-buffer
                (insert "bar")
@@ -4673,8 +4728,70 @@ INPUT, if non-nil, is a string sent to the process."
                (should (string-equal "bar" (buffer-string)))
                (should (= (point) (1- (point-max))))
                (shell-command "echo baz" (current-buffer))
+               (should (string-equal "babaz\nr" (buffer-string)))
+               ;; There is still an error in Tramp.
+               (unless (file-remote-p default-directory)
+                 (should (= point (point)))
+                 (should-not (= (point) (point-max))))))
+
+           ;; Don't erase if the buffer is not the current one and
+           ;; `shell-command-dont-erase-buffer' is set to
+           ;; `save-point'.  Check point.
+           (let ((shell-command-dont-erase-buffer 'save-point))
+             (with-current-buffer buffer
+               (erase-buffer)
+               (insert "bar")
+               (goto-char (1- (point-max)))
+               (setq point (point))
+               (should (string-equal "bar" (buffer-string)))
+               (should (= (point) (1- (point-max))))
+               (with-temp-buffer
+                 (shell-command "echo baz" buffer))
+               ;; This does not work as expected.  Therefore, we
+               ;; use the "wrong" string.
+               (should (string-equal "barbaz\n" (buffer-string)))
+               ;; There is still an error in Tramp.
+               (unless (file-remote-p default-directory)
+                 (should (= point (point)))
+                 (should-not (= (point) (point-max))))))
+
+           ;; Don't erase if the buffer is the current one and
+           ;; `shell-command-dont-erase-buffer' is set to a random
+           ;; value.  Check point.
+           (let ((shell-command-dont-erase-buffer 'random))
+             (with-temp-buffer
+               (insert "bar")
+               (setq point (point))
+               (should (string-equal "bar" (buffer-string)))
+               (should (= (point) (point-max)))
+               (shell-command "echo baz" (current-buffer))
+               (should (string-equal "barbaz\n" (buffer-string)))
+               ;; This does not work as expected in the local case.
+               ;; Therefore, we negate the test for the time being.
+               (should-not
+                (funcall (if (file-remote-p default-directory) #'identity 
#'not)
+                         (= point (point))))
+               (should
+                (funcall (if (file-remote-p default-directory) #'identity 
#'not)
+                         (= (point) (point-max))))))
+
+           ;; Don't erase if the buffer is not the current one and
+           ;; `shell-command-dont-erase-buffer' is set to a random
+           ;; value.  Check point.
+           (let ((shell-command-dont-erase-buffer 'random))
+             (with-current-buffer buffer
+               (erase-buffer)
+               (insert "bar")
+               (setq point (point))
+               (should (string-equal "bar" (buffer-string)))
+               (should (= (point) (point-max)))
+               (with-temp-buffer
+                 (shell-command "echo baz" buffer))
                (should (string-equal "barbaz\n" (buffer-string)))
-               (should (= point (point))))))
+               ;; There is still an error in Tramp.
+               (unless (file-remote-p default-directory)
+                 (should-not (= point (point)))
+                 (should (= (point) (point-max)))))))
 
        ;; Cleanup.
        (ignore-errors (kill-buffer buffer))))))
diff --git a/texi/tramp.texi b/texi/tramp.texi
index 3ee361a..cbf2afe 100644
--- a/texi/tramp.texi
+++ b/texi/tramp.texi
@@ -3819,7 +3819,8 @@ the verbosity level to 6 (@pxref{Traces and Profiles, 
Traces}) in the
 contents of the @file{*tramp/foo*} and @file{*debug tramp/foo*}
 buffers with the bug report.  Both buffers could contain
 non-@acronym{ASCII} characters which are relevant for analysis, append
-the buffers as attachments to the bug report.
+the buffers as attachments to the bug report.  This is also needed in
+order to avoid line breaks during mail transfer.
 
 @strong{Note} that a verbosity level greater than 6 is not necessary
 at this stage.  Also note that a verbosity level of 6 or greater, the
@@ -4120,6 +4121,23 @@ your proxy host.
 
 
 @item
+@value{tramp} does not connect to Samba or MS Windows hosts running
+SMB1 connection protocol.
+
+@vindex tramp-smb-options
+Recent versions of @command{smbclient} do not support old connection
+protocols by default.  In order to connect to such a host, add a
+respective option:
+
+@lisp
+(add-to-list 'tramp-smb-options "client min protocol=NT1")
+@end lisp
+
+@strong{Note} that using a deprecated connection protocol raises
+security problems, you should do it only if absolutely necessary.
+
+
+@item
 File name completion does not work with @value{tramp}
 
 @acronym{ANSI} escape sequences from the remote shell may cause errors
diff --git a/texi/trampver.texi b/texi/trampver.texi
index a5f28cc..aef8175 100644
--- a/texi/trampver.texi
+++ b/texi/trampver.texi
@@ -8,7 +8,7 @@
 @c In the Tramp GIT, the version numbers are auto-frobbed from
 @c tramp.el, and the bug report address is auto-frobbed from
 @c configure.ac.
-@set trampver 2.4.3.3
+@set trampver 2.4.3.4
 @set tramp-bug-report-address tramp-devel@@gnu.org
 @set emacsver 24.4
 
diff --git a/tramp-loaddefs.el b/tramp-loaddefs.el
index ecdf774..f2f84d0 100644
--- a/tramp-loaddefs.el
+++ b/tramp-loaddefs.el
@@ -572,12 +572,21 @@ Name of SMB acls to run.")
 (custom-autoload 'tramp-smb-acl-program "tramp-smb" t)
 
 (defvar tramp-smb-conf "/dev/null" "\
-Path of the smb.conf file.
-If it is nil, no smb.conf will be added to the `tramp-smb-program'
+Path of the \"smb.conf\" file.
+If it is nil, no \"smb.conf\" will be added to the `tramp-smb-program'
 call, letting the SMB client use the default one.")
 
 (custom-autoload 'tramp-smb-conf "tramp-smb" t)
 
+(defvar tramp-smb-options nil "\
+List of additional options.
+They are added to the `tramp-smb-program' call via \"--option '...'\".
+
+For example, if the deprecated SMB1 protocol shall be used, add to
+this variable (\"client min protocol=NT1\") .")
+
+(custom-autoload 'tramp-smb-options "tramp-smb" t)
+
 (defconst tramp-smb-file-name-handler-alist '((access-file . 
tramp-handle-access-file) (add-name-to-file . 
tramp-smb-handle-add-name-to-file) (copy-directory . 
tramp-smb-handle-copy-directory) (copy-file . tramp-smb-handle-copy-file) 
(delete-directory . tramp-smb-handle-delete-directory) (delete-file . 
tramp-smb-handle-delete-file) (directory-file-name . 
tramp-handle-directory-file-name) (directory-files . 
tramp-smb-handle-directory-files) (directory-files-and-attributes . 
tramp-handle-d [...]
 Alist of handler functions for Tramp SMB method.
 Operations not mentioned here will be handled by the default Emacs 
primitives.")
@@ -654,7 +663,7 @@ UU-encode the region between BEG and END.
 ;;;### (autoloads nil "trampver" "trampver.el" (0 0 0 0))
 ;;; Generated autoloads from trampver.el
 
-(defconst tramp-version "2.4.3.3" "\
+(defconst tramp-version "2.4.3.4" "\
 This version of Tramp.")
 
 (defconst tramp-bug-report-address "address@hidden" "\
diff --git a/tramp-smb.el b/tramp-smb.el
index cded804..d4618a2 100644
--- a/tramp-smb.el
+++ b/tramp-smb.el
@@ -75,12 +75,23 @@
 
 ;;;###tramp-autoload
 (defcustom tramp-smb-conf "/dev/null"
-  "Path of the smb.conf file.
-If it is nil, no smb.conf will be added to the `tramp-smb-program'
+  "Path of the \"smb.conf\" file.
+If it is nil, no \"smb.conf\" will be added to the `tramp-smb-program'
 call, letting the SMB client use the default one."
   :group 'tramp
   :type '(choice (const nil) (file :must-match t)))
 
+;;;###tramp-autoload
+(defcustom tramp-smb-options nil
+  "List of additional options.
+They are added to the `tramp-smb-program' call via \"--option '...'\".
+
+For example, if the deprecated SMB1 protocol shall be used, add to
+this variable (\"client min protocol=NT1\") ."
+  :group 'tramp
+  :type '(repeat string)
+  :version "28.1")
+
 (defvar tramp-smb-version nil
   "Version string of the SMB client.")
 
@@ -461,7 +472,8 @@ pass to the OPERATION."
                               (expand-file-name
                                tramp-temp-name-prefix
                                (tramp-compat-temporary-file-directory))))
-                  (args      (list (concat "//" host "/" share) "-E")))
+                  (args      (list (concat "//" host "/" share) "-E"))
+                  (options   tramp-smb-options))
 
              (if (not (zerop (length user)))
                  (setq args (append args (list "-U" user)))
@@ -471,6 +483,10 @@ pass to the OPERATION."
              (when port   (setq args (append args (list "-p" port))))
              (when tramp-smb-conf
                (setq args (append args (list "-s" tramp-smb-conf))))
+             (while options
+               (setq args
+                     (append args `("--option" ,(format "%s" (car options))))
+                     options (cdr options)))
              (setq args
                    (if t1
                        ;; Source is remote.
@@ -760,7 +776,8 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are 
completely ignored."
          (let* ((share     (tramp-smb-get-share v))
                 (localname (replace-regexp-in-string
                             "\\\\" "/" (tramp-smb-get-localname v)))
-                (args      (list (concat "//" host "/" share) "-E")))
+                (args      (list (concat "//" host "/" share) "-E"))
+                (options   tramp-smb-options))
 
            (if (not (zerop (length user)))
                (setq args (append args (list "-U" user)))
@@ -770,6 +787,10 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are 
completely ignored."
            (when port   (setq args (append args (list "-p" port))))
            (when tramp-smb-conf
              (setq args (append args (list "-s" tramp-smb-conf))))
+           (while options
+             (setq args
+                   (append args `("--option" ,(format "%s" (car options))))
+                   options (cdr options)))
            (setq
             args
             (append args (list (tramp-unquote-shell-quote-argument localname)
@@ -1412,7 +1433,8 @@ component is used as the target of the symlink."
                           "\\\\" "/" (tramp-smb-get-localname v)))
               (args      (list (concat "//" host "/" share) "-E" "-S"
                                (replace-regexp-in-string
-                                "\n" "," acl-string))))
+                                "\n" "," acl-string)))
+              (options   tramp-smb-options))
 
          (if (not (zerop (length user)))
              (setq args (append args (list "-U" user)))
@@ -1422,6 +1444,10 @@ component is used as the target of the symlink."
          (when port   (setq args (append args (list "-p" port))))
          (when tramp-smb-conf
            (setq args (append args (list "-s" tramp-smb-conf))))
+         (while options
+           (setq args
+                 (append args `("--option" ,(format "%s" (car options))))
+                 options (cdr options)))
          (setq
           args
           (append args (list (tramp-unquote-shell-quote-argument localname)
@@ -1948,6 +1974,7 @@ If ARGUMENT is non-nil, use it as argument for
               (host   (tramp-file-name-host vec))
               (domain (tramp-file-name-domain vec))
               (port   (tramp-file-name-port vec))
+              (options tramp-smb-options)
               args)
 
          (cond
@@ -1966,6 +1993,10 @@ If ARGUMENT is non-nil, use it as argument for
          (when port   (setq args (append args (list "-p" port))))
          (when tramp-smb-conf
            (setq args (append args (list "-s" tramp-smb-conf))))
+         (while options
+           (setq args
+                 (append args `("--option" ,(format "%s" (car options))))
+                 options (cdr options)))
          (when argument
            (setq args (append args (list argument))))
 
@@ -2131,7 +2162,5 @@ Removes smb prompt.  Returns nil if an error message has 
appeared."
 ;;
 ;; * Try to remove the inclusion of dummy "" directory.  Seems to be at
 ;;   several places, especially in `tramp-smb-handle-insert-directory'.
-;;
-;; * Ignore case in file names.
 
 ;;; tramp-smb.el ends here
diff --git a/tramp.el b/tramp.el
index a016ed1..b5d3879 100644
--- a/tramp.el
+++ b/tramp.el
@@ -7,7 +7,7 @@
 ;; Maintainer: Michael Albinus <address@hidden>
 ;; Keywords: comm, processes
 ;; Package: tramp
-;; Version: 2.4.3.3
+;; Version: 2.4.3.4
 ;; Package-Requires: ((emacs "24.4"))
 ;; Package-Type: multi
 ;; URL: https://savannah.gnu.org/projects/tramp
@@ -2464,7 +2464,7 @@ remote file names."
           (regexp-opt
            (mapcar
             #'file-name-sans-extension
-            (directory-files dir nil "^tramp.+\\.elc?$"))
+            (directory-files dir nil "\\`tramp.+\\.elc?\\'"))
            'paren))))
     (mapatoms
      (lambda (atom)
@@ -4090,6 +4090,8 @@ The terminal type can be configured with 
`tramp-terminal-type'."
 (defun tramp-action-process-alive (proc _vec)
   "Check, whether a process has finished."
   (unless (process-live-p proc)
+    ;; There might be pending output.
+    (while (tramp-accept-process-output proc 0))
     (throw 'tramp-action 'process-died)))
 
 (defun tramp-action-out-of-band (proc vec)
diff --git a/tramp.info b/tramp.info
index 680c89a..d2d9072 100644
--- a/tramp.info
+++ b/tramp.info
@@ -1,4 +1,4 @@
-This is tramp.info, produced by makeinfo version 6.6 from tramp.texi.
+This is tramp.info, produced by makeinfo version 6.7 from tramp.texi.
 
 Copyright © 1999–2020 Free Software Foundation, Inc.
 
@@ -21,10 +21,10 @@ END-INFO-DIR-ENTRY
 
 File: tramp.info,  Node: Top,  Next: Overview,  Prev: (dir),  Up: (dir)
 
-TRAMP 2.4.3.3 User Manual
+TRAMP 2.4.3.4 User Manual
 *************************
 
-This file documents TRAMP 2.4.3.3, a remote file editing package for
+This file documents TRAMP 2.4.3.4, a remote file editing package for
 Emacs.
 
    TRAMP stands for “Transparent Remote (file) Access, Multiple
@@ -2832,7 +2832,8 @@ verbosity level to 6 (*note Traces: Traces and Profiles.) 
in the
 of the ‘*tramp/foo*’ and ‘*debug tramp/foo*’ buffers with the bug
 report.  Both buffers could contain non-ASCII characters which are
 relevant for analysis, append the buffers as attachments to the bug
-report.
+report.  This is also needed in order to avoid line breaks during mail
+transfer.
 
    *Note* that a verbosity level greater than 6 is not necessary at this
 stage.  Also note that a verbosity level of 6 or greater, the contents
@@ -3064,6 +3065,18 @@ File: tramp.info,  Node: Frequently Asked Questions,  
Next: Files directories an
      Check ‘man ssh_config’ whether these options are supported on your
      proxy host.
 
+   • TRAMP does not connect to Samba or MS Windows hosts running SMB1
+     connection protocol.
+
+     Recent versions of ‘smbclient’ do not support old connection
+     protocols by default.  In order to connect to such a host, add a
+     respective option:
+
+          (add-to-list 'tramp-smb-options "client min protocol=NT1")
+
+     *Note* that using a deprecated connection protocol raises security
+     problems, you should do it only if absolutely necessary.
+
    • File name completion does not work with TRAMP
 
      ANSI escape sequences from the remote shell may cause errors in
@@ -4156,17 +4169,17 @@ Variable Index
 * customize-package-emacs-version-alist: Obtaining TRAMP.     (line  20)
 * DISPLAY, environment variable:         Remote processes.    (line  93)
 * EDITOR, environment variable:          Frequently Asked Questions.
-                                                              (line 558)
+                                                              (line 570)
 * ENV, environment variable:             Remote processes.    (line  64)
 * ESHELL, environment variable:          Remote shell setup.  (line 187)
 * HGPLAIN, environment variable:         Remote processes.    (line  82)
 * HISTFILE, environment variable:        Frequently Asked Questions.
-                                                              (line 299)
+                                                              (line 311)
 * HISTFILESIZE, environment variable:    Frequently Asked Questions.
-                                                              (line 299)
+                                                              (line 311)
 * HISTORY, environment variable:         Remote processes.    (line  52)
 * HISTSIZE, environment variable:        Frequently Asked Questions.
-                                                              (line 299)
+                                                              (line 311)
 * INSIDE_EMACS, environment variable:    Remote shell setup.  (line 104)
 * INSIDE_EMACS, environment variable <1>: Remote shell setup. (line 187)
 * non-essential:                         External packages.   (line   9)
@@ -4217,16 +4230,16 @@ Variable Index
                                                               (line  28)
 * tramp-gvfs-methods:                    GVFS-based methods.  (line  60)
 * tramp-histfile-override:               Frequently Asked Questions.
-                                                              (line 299)
+                                                              (line 311)
 * tramp-ignored-file-name-regexp:        Frequently Asked Questions.
-                                                              (line 620)
+                                                              (line 632)
 * tramp-inline-compress-commands:        Inline methods.      (line  25)
 * tramp-inline-compress-start-size:      Inline methods.      (line  25)
 * tramp-local-host-regexp:               Frequently Asked Questions.
                                                               (line 165)
 * tramp-methods:                         Customizing Methods. (line   6)
 * tramp-mode:                            Frequently Asked Questions.
-                                                              (line 614)
+                                                              (line 626)
 * tramp-own-remote-path:                 Remote programs.     (line  32)
 * tramp-password-prompt-regexp:          Remote shell setup.  (line  65)
 * tramp-persistency-file-name:           Connection caching.  (line   6)
@@ -4238,11 +4251,13 @@ Variable Index
 * tramp-save-ad-hoc-proxies:             Ad-hoc multi-hops.   (line  29)
 * tramp-sh-extra-args:                   Remote shell setup.  (line  22)
 * tramp-shell-prompt-pattern:            Remote shell setup.  (line  57)
+* tramp-smb-options:                     Frequently Asked Questions.
+                                                              (line 228)
 * tramp-ssh-controlmaster-options:       Frequently Asked Questions.
                                                               (line 188)
 * tramp-terminal-type:                   Remote shell setup.  (line  90)
 * tramp-theme-face-remapping-alist:      Frequently Asked Questions.
-                                                              (line 279)
+                                                              (line 291)
 * tramp-use-ssh-controlmaster-options:   Frequently Asked Questions.
                                                               (line 201)
 * tramp-verbose:                         Traces and Profiles. (line   6)
@@ -4559,7 +4574,7 @@ Concept Index
 * tgz file archive suffix:               Archive file names.  (line  71)
 * tlz file archive suffix:               Archive file names.  (line  71)
 * TRAMP theme:                           Frequently Asked Questions.
-                                                              (line 279)
+                                                              (line 291)
 * tset unix command:                     Remote shell setup.  (line 124)
 * txz file archive suffix:               Archive file names.  (line  71)
 * type-ahead:                            Usage.               (line  12)
@@ -4629,15 +4644,15 @@ Node: Cleanup remote connections106523
 Node: Renaming remote files108224
 Node: Archive file names112443
 Node: Bug Reports116957
-Node: Frequently Asked Questions119625
-Node: Files directories and localnames143521
-Node: Localname deconstruction143957
-Node: External packages144610
-Node: Traces and Profiles146655
-Node: GNU Free Documentation License148624
-Node: Function Index173997
-Node: Variable Index176875
-Node: Concept Index184557
+Node: Frequently Asked Questions119698
+Node: Files directories and localnames144063
+Node: Localname deconstruction144499
+Node: External packages145152
+Node: Traces and Profiles147197
+Node: GNU Free Documentation License149166
+Node: Function Index174539
+Node: Variable Index177417
+Node: Concept Index185241
 
 End Tag Table
 
diff --git a/trampver.el b/trampver.el
index c3eb847..319aadb 100644
--- a/trampver.el
+++ b/trampver.el
@@ -39,7 +39,7 @@
 (defvar inhibit-message)
 
 ;;;###tramp-autoload
-(defconst tramp-version "2.4.3.3"
+(defconst tramp-version "2.4.3.4"
   "This version of Tramp.")
 
 ;;;###tramp-autoload
@@ -51,6 +51,7 @@
     ;; Suppress message from `emacs-repository-get-branch'.  We must
     ;; also handle out-of-tree builds.
     (let ((inhibit-message t)
+         (debug-on-error nil)
          (dir (or (locate-dominating-file (locate-library "tramp") ".git")
                   source-directory)))
       ;; `emacs-repository-get-branch' has been introduced with Emacs 27.1.
@@ -64,6 +65,7 @@
     ;; Suppress message from `emacs-repository-get-version'.  We must
     ;; also handle out-of-tree builds.
     (let ((inhibit-message t)
+         (debug-on-error nil)
          (dir (or (locate-dominating-file (locate-library "tramp") ".git")
                   source-directory)))
       (and (stringp dir) (file-directory-p dir)
@@ -73,7 +75,7 @@
 ;; Check for Emacs version.
 (let ((x   (if (not (string-lessp emacs-version "24.4"))
       "ok"
-    (format "Tramp 2.4.3.3 is not fit for %s"
+    (format "Tramp 2.4.3.4 is not fit for %s"
             (replace-regexp-in-string "\n" "" (emacs-version))))))
   (unless (string-equal "ok" x) (error "%s" x)))
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]