diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-12-30 10:09:01 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-12-30 10:09:01 -0800 |
| commit | d5e5e7b41166815a843148f2081d19bc14b628b2 (patch) | |
| tree | 6afd575b3a741ce26e5ec1e2665d45dfab8cbb52 /lisp/net | |
| parent | 4f752957f174b5ab95ef6b9428669b1b1ecf0bab (diff) | |
| parent | 5c560880659048888420389c02e20d6867ec81df (diff) | |
| download | emacs-d5e5e7b41166815a843148f2081d19bc14b628b2.tar.gz emacs-d5e5e7b41166815a843148f2081d19bc14b628b2.tar.bz2 emacs-d5e5e7b41166815a843148f2081d19bc14b628b2.zip | |
Merge from emacs-24; up to 2012-12-05T00:13:56Z!yamaoka@jpl.org
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/mairix.el | 10 | ||||
| -rw-r--r-- | lisp/net/tramp-sh.el | 4 |
2 files changed, 8 insertions, 6 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 a76bac72dcf..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)) |