[Emacs-diffs] master 1f778f8 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

[Eli Zaretskii]

branch: master
commit 1f778f8b1a657a723bffa0472c68557af9273e38
Merge: c0154ac 6666297
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
---
 doc/man/etags.1       | 2 +-
 lisp/net/tramp-smb.el | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/man/etags.1 b/doc/man/etags.1
index 45d2541..558b249 100644
--- a/doc/man/etags.1
+++ b/doc/man/etags.1
@@ -145,7 +145,7 @@ May be used (only once) in place of a file name on the 
command line.
 \fBetags\fP will read from standard input and mark the produced tags
 as belonging to the file \fBFILE\fP.
 .TP
-\fB \-Q, \-\-class\-qualify\fP
+\fB\-Q, \-\-class\-qualify\fP
 Qualify tag names with their class name in C++, ObjC, Java, and Perl.
 This produces tag names of the form \fIclass\fP\fB::\fP\fImember\fP
 for C++ and Perl,
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el
index e0a416a..eab0da5 100644
--- a/lisp/net/tramp-smb.el
+++ b/lisp/net/tramp-smb.el
@@ -151,6 +151,7 @@ call, letting the SMB client use the default one."
         "NT_STATUS_OBJECT_NAME_NOT_FOUND"
         "NT_STATUS_OBJECT_PATH_SYNTAX_BAD"
         "NT_STATUS_PASSWORD_MUST_CHANGE"
+        "NT_STATUS_RESOURCE_NAME_NOT_FOUND"
         "NT_STATUS_SHARING_VIOLATION"
         "NT_STATUS_TRUSTED_RELATIONSHIP_FAILURE"
         "NT_STATUS_UNSUCCESSFUL"