auto upstream

3 files changed, 8 insertions, 2 deletions

diff --git a/lisp/files.el b/lisp/files.el
index ce032534f04..238be36cae0 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -4183,7 +4183,7 @@ Checks for files in `temporary-file-directory',
 `small-temporary-file-directory', and /tmp."
   (let ((temporary-file-directory temporary-file-directory)
         caseless)
-    ;; On MS-Windows, file-truename will convert short 8+3 alises to
+    ;; On MS-Windows, file-truename will convert short 8+3 aliases to
     ;; their long file-name equivalents, so compare-strings does TRT.
     (if (memq system-type '(ms-dos windows-nt))
         (setq temporary-file-directory (file-truename temporary-file-directory)
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index f15ed7e707c..cc7897accb6 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-14  Andrew Cohen  <cohen@bu.edu>
+
+        * nnir.el (nnir-request-set-mark): Make sure we are in the right
+        group.
+
 2013-04-12  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus-msg.el (gnus-msg-mail): Make it avoid using posting styles
diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el
index 5d244a019cb..2fa6b600ac1 100644
--- a/lisp/gnus/nnir.el
+++ b/lisp/gnus/nnir.el
@@ -837,6 +837,7 @@ skips all prompting."
     (gnus-request-update-mark artgroup artnumber mark)))
 
 (deffoo nnir-request-set-mark (group actions &optional server)
+  (nnir-possibly-change-group group server)
   (let (mlist)
     (dolist (action actions)
       (destructuring-bind (range action marks) action
@@ -853,7 +854,7 @@ skips all prompting."
 
 
 (deffoo nnir-request-update-info (group info &optional server)
-  (nnir-possibly-change-group group)
+  (nnir-possibly-change-group group server)
   ;; clear out all existing marks.
   (gnus-info-set-marks info nil)
   (gnus-info-set-read info nil)