auto upstream

10 files changed, 95 insertions, 25 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 81b4978dba5..c895bce1cad 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,36 @@
+2012-12-30  Glenn Morris  <rgm@gnu.org>
+
+        * 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-30  Chong Yidong  <cyd@gnu.org>
+
+        * emacs-lisp/package.el (package-untar-buffer): Improve integrity
+        check for the tarball contents.
+
+2012-12-30  Matt Fidler  <matt.fidler@alcon.com>  (tiny change)
+
+        * emacs-lisp/package.el (package-untar-buffer): Handle problematic
+        tarfile content listings (Bug#13136).
+
+2012-12-30  Mark Lillibridge  <mark.lillibridge@hp.com>
+
+        * mail/rmailmm.el (rmail-insert-mime-forwarded-message): Insert
+        the undecoded text of the message being forwarded.  (Bug#9521)
+
+2012-12-30  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-sh.el (tramp-set-file-uid-gid): Convert UID and GID to
+        integers, if they are real numbers.  (Bug#13282)
+
+        * net/tramp-sh.el (tramp-sh-handle-set-file-selinux-context):
+        Return `t' on success.
+
+        * net/tramp-smb.el (tramp-smb-file-name-handler-alist): Add
+        handler for `set-file-selinux-context'.
+
 2012-12-29  Michael Albinus  <michael.albinus@gmx.de>
 
         * net/tramp-sh.el (tramp-sh-handle-file-acl): Suppress basic attributes.
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 6629410a1f1..96435e52f11 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -596,6 +596,8 @@ EXTRA-PROPERTIES is currently unused."
 
 (defvar tar-parse-info)
 (declare-function tar-untar-buffer "tar-mode" ())
+(declare-function tar-header-name "tar-mode" (tar-header))
+(declare-function tar-header-link-type "tar-mode" (tar-header))
 
 (defun package-untar-buffer (dir)
   "Untar the current buffer.
@@ -604,10 +606,16 @@ untar into a directory named DIR; otherwise, signal an error."
   (require 'tar-mode)
   (tar-mode)
   ;; Make sure everything extracts into DIR.
-  (let ((regexp (concat "\\`" (regexp-quote dir) "/")))
+  (let ((regexp (concat "\\`" (regexp-quote (expand-file-name dir)) "/"))
+        (case-fold-search (memq system-type '(windows-nt ms-dos cygwin))))
     (dolist (tar-data tar-parse-info)
-      (unless (string-match regexp (aref tar-data 2))
-        (error "Package does not untar cleanly into directory %s/" dir))))
+      (let ((name (expand-file-name (tar-header-name tar-data))))
+        (or (string-match regexp name)
+            ;; Tarballs created by some utilities don't list
+            ;; directories with a trailing slash (Bug#13136).
+            (and (string-equal dir name)
+                 (eq (tar-header-link-type tar-data) 5))
+            (error "Package does not untar cleanly into directory %s/" dir)))))
   (tar-untar-buffer))
 
 (defun package-unpack (package version)
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index e17661095e4..6dca9e6cb7c 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+2012-12-29  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * nnfolder.el (nnfolder-recursive-directory-files): New function.
+        (nnfolder-generate-active-file): Make this function work with recursive
+        folder names.
+
 2012-12-27  Lars Ingebrigtsen  <larsi@gnus.org>
 
         * nntp.el (nntp-open-connection): Use HELP as the capability command
diff --git a/lisp/gnus/nnfolder.el b/lisp/gnus/nnfolder.el
index e93bd7f43e0..ae9e551c93a 100644
--- a/lisp/gnus/nnfolder.el
+++ b/lisp/gnus/nnfolder.el
@@ -1004,6 +1004,28 @@ deleted.  Point is left where the deleted region was."
             (nnfolder-save-nov))
           (current-buffer))))))
 
+(defun nnfolder-recursive-directory-files (dir prefix)
+  (let ((files nil))
+    (dolist (file (directory-files dir))
+      (cond
+       ((or (file-symlink-p (expand-file-name file dir))
+            (member file '("." "..")))
+        ;; Ignore
+        )
+       ((file-directory-p (expand-file-name file dir))
+        (setq files (nconc (nnfolder-recursive-directory-files
+                            (expand-file-name file dir)
+                            (if prefix
+                                (concat prefix "." (directory-file-name file))
+                              (file-name-nondirectory file)))
+                           files)))
+       ((file-regular-p (expand-file-name file dir))
+        (push (if prefix
+                  (concat prefix "." file)
+                file)
+              files))))
+    files))
+
 ;;;###autoload
 (defun nnfolder-generate-active-file ()
   "Look for mbox folders in the nnfolder directory and make them into groups.
@@ -1020,10 +1042,13 @@ This command does not work if you use short group names."
       (when (not (message-mail-file-mbox-p file))
         (ignore-errors
           (delete-file file)))))
-    (dolist (file (directory-files nnfolder-directory))
+    (dolist (file (if nnmail-use-long-file-names
+                      (directory-files nnfolder-directory)
+                    (nnfolder-recursive-directory-files
+                     nnfolder-directory nil)))
       (when (and (not (backup-file-name-p file))
                  (message-mail-file-mbox-p
-                  (nnheader-concat nnfolder-directory file)))
+                  (nnfolder-group-pathname file)))
         (let ((oldgroup (assoc file nnfolder-group-alist)))
           (if oldgroup
               (nnheader-message 5 "Refreshing group %s..." file)
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index ec35cc59b26..096b53c6cab 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -4622,7 +4622,7 @@ With prefix argument N moves forward N messages with these labels.
 
 ;;;***
 
-;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "f1937f85a1258de8880a089fa5ae5621")
+;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "c106528cab2def0306822563a9083967")
 ;;; Generated autoloads from rmailmm.el
 
 (autoload 'rmail-mime "rmailmm" "\
diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el
index 11bccd59765..a9bbe6c2da3 100644
--- a/lisp/mail/rmailmm.el
+++ b/lisp/mail/rmailmm.el
@@ -1368,8 +1368,8 @@ This is the usual value of `rmail-insert-mime-forwarded-message-function'."
   (let ((message-buffer
          (with-current-buffer forward-buffer
            (if rmail-buffer-swapped
-               forward-buffer
-             rmail-view-buffer))))
+               rmail-view-buffer
+             forward-buffer))))
     (save-restriction
       (narrow-to-region (point) (point))
       (message-forward-make-body-mime message-buffer))))
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)
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index ce3fd523b88..e2b5437228d 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -4583,12 +4583,7 @@
         (org-set-autofill-regexps): Add previous function to
         `fill-nobreak-predicate'.
 
-2012-04-01  Vitalie Spinu  <spinuvit@gmail.com>
-
-        * ob-R.el (org-babel-R-evaluate-session): Inhibit R evaluation
-        visibility regardless of local user customization.
-
-2012-04-01  Vitalie Spinu  <spinuvit@gmail.com>
+2012-04-01  Vitalie Spinu  <spinuvit@gmail.com>  (tiny change)
 
         * ob-R.el (org-babel-R-evaluate-session): Inhibit R evaluation
         visibility regardless of local user customization.