From 3ee24a3b32543fa4cf4a2102082491cf6bcb45c5 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sat, 29 Dec 2012 00:09:13 -0800 Subject: * net/tramp-sh.el (tramp-set-file-uid-gid): Convert UID and GID to integers, if they are real numbers. (Bug#13282) --- lisp/net/tramp-sh.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lisp/net') diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 340b7ad353d..e903708275e 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -1455,7 +1455,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)) -- cgit v1.2.3 From 8db39aebe862bf2384a13b69e309115d92524853 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 29 Dec 2012 19:28:52 -0800 Subject: mairix.el fix for bug#13294 * lisp/net/mairix.el (rmail, rmail-summary-displayed, rmail-summary): Remove unnecessary/buggy autoloads (missing interactive). (rmail-summary-displayed, rmail-summary): Declare. (mairix-rmail-display): Just require rmail. --- lisp/ChangeLog | 7 +++++++ lisp/net/mairix.el | 10 +++++----- 2 files changed, 12 insertions(+), 5 deletions(-) (limited to 'lisp/net') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5907f5ef7ec..84e0ec4a095 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2012-12-30 Glenn Morris + + * net/mairix.el (rmail, rmail-summary-displayed, rmail-summary): + Remove unnecessary/buggy autoloads (missing interactive). (Bug#13294) + (rmail-summary-displayed, rmail-summary): Declare. + (mairix-rmail-display): Just require rmail. + 2012-12-29 Chong Yidong * emacs-lisp/package.el (package-untar-buffer): Improve integrity 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." -- cgit v1.2.3