diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2018-01-20 11:18:31 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2018-01-20 11:18:31 +0200 |
| commit | 1f778f8b1a657a723bffa0472c68557af9273e38 (patch) | |
| tree | db7935cc8b62f0a3fedd9311c2b274011ce4339a | |
| parent | c0154ac7c3423f68d8f3a2e85a756c9759219039 (diff) | |
| parent | 666629796dd16422edffefc958656efa65d20fc6 (diff) | |
| download | emacs-1f778f8b1a657a723bffa0472c68557af9273e38.tar.gz emacs-1f778f8b1a657a723bffa0472c68557af9273e38.tar.bz2 emacs-1f778f8b1a657a723bffa0472c68557af9273e38.zip | |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
| -rw-r--r-- | doc/man/etags.1 | 2 | ||||
| -rw-r--r-- | lisp/net/tramp-smb.el | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/man/etags.1 b/doc/man/etags.1 index 45d2541ec13..558b249f31b 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 e0a416ac371..eab0da54b6d 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" |