auto upstream

3 files changed, 14 insertions, 11 deletions

diff --git a/lisp/net/mairix.el b/lisp/net/mairix.el
index f85983e6e9f..50cc2ed3dc3 100644
--- a/lisp/net/mairix.el
+++ b/lisp/net/mairix.el
@@ -222,14 +222,12 @@ Currently there are 'threads and 'flags.")
 
 ;;; RMail
 
-;; Display function:
-(autoload 'rmail "rmail")
-(autoload 'rmail-summary-displayed "rmail")
-(autoload 'rmail-summary "rmailsum")
-(defvar rmail-buffer)
+(declare-function rmail-summary-displayed "rmail" ())
+(declare-function rmail-summary "rmailsum" ()) ; autoloaded in rmail
 
 (defun mairix-rmail-display (folder)
   "Display mbox file FOLDER with RMail."
+  (require 'rmail)
   (let (show-summary)
     ;; If it exists, select existing RMail window
     (when (and (boundp 'rmail-buffer)
@@ -249,6 +247,8 @@ Currently there are 'threads and 'flags.")
     (when show-summary
       (rmail-summary))))
 
+(defvar rmail-buffer)
+
 ;; Fetching mail header field:
 (defun mairix-rmail-fetch-field (field)
   "Get mail header FIELD for current message using RMail."
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index ebc377c08c8..e46b32c85a5 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -1458,7 +1458,9 @@ and gid of the corresponding user is taken.  Both parameters must be integers."
   ;; working with su(do)? when it is needed, so it shall succeed in
   ;; the majority of cases.
   ;; Don't modify `last-coding-system-used' by accident.
-  (let ((last-coding-system-used last-coding-system-used))
+  (let ((last-coding-system-used last-coding-system-used)
+        (uid (and (numberp uid) (round uid)))
+        (gid (and (numberp gid) (round gid))))
     (if (file-remote-p filename)
         (with-parsed-tramp-file-name filename nil
           (if (and (zerop (user-uid)) (tramp-local-host-p v))
@@ -1530,10 +1532,11 @@ and gid of the corresponding user is taken.  Both parameters must be integers."
                         (if (stringp (nth 3 context))
                             (format "--range=%s" (nth 3 context)) "")
                         (tramp-shell-quote-argument localname))))
-        (tramp-set-file-property v localname "file-selinux-context" context)
-      (tramp-set-file-property v localname "file-selinux-context" 'undef)))
-  ;; We always return nil.
-  nil)
+        (progn
+          (tramp-set-file-property v localname "file-selinux-context" context)
+          t)
+      (tramp-set-file-property v localname "file-selinux-context" 'undef)
+      nil)))
 
 (defun tramp-remote-acl-p (vec)
   "Check, whether ACL is enabled on the remote host."
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el
index f97d4620b97..af1e36350f5 100644
--- a/lisp/net/tramp-smb.el
+++ b/lisp/net/tramp-smb.el
@@ -230,7 +230,7 @@ See `tramp-actions-before-shell' for more info.")
     (rename-file . tramp-smb-handle-rename-file)
     (set-file-acl . ignore)
     (set-file-modes . tramp-smb-handle-set-file-modes)
-    ;; `set-file-selinux-context' performed by default handler.
+    (set-file-selinux-context . ignore)
     (set-file-times . ignore)
     (set-visited-file-modtime . ignore)
     (shell-command . tramp-handle-shell-command)