upstream

7 files changed, 68 insertions, 77 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3f603a6ad64..f3d37a77b24 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,19 @@
+2011-08-17  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (display-buffer-pop-up-frame): Run frame creation
+        function with BUFFER current (as special-display-popup-frame
+        does).  Reported by Drew Adams.
+
+2011-08-17  Daiki Ueno  <ueno@unixuser.org>
+
+        * epa-mail.el: Simplify GnuPG group expansion using
+        epg-expand-group.
+        (epa-mail-group-alist, epa-mail-group-modtime)
+        (epa-mail-gnupg-conf-file, epa-mail-parse-groups)
+        (epa-mail-sync-groups, epa-mail-expand-recipient-1)
+        (epa-mail-expand-recipients-2, epa-mail-expand-recipients):
+        Remove.
+
 2011-08-16  Feng Li <fengli@gmail.com> (tiny change)
 
         * calc/calc-ext.el (math-defintegral-2): Remove nested backquote.
diff --git a/lisp/epa-mail.el b/lisp/epa-mail.el
index e6f6c0ec2b1..9d7542b3980 100644
--- a/lisp/epa-mail.el
+++ b/lisp/epa-mail.el
@@ -50,11 +50,9 @@
   "A minor-mode for composing encrypted/clearsigned mails."
   nil " epa-mail" epa-mail-mode-map)
 
-;;; ??? Could someone please clarify this doc string?
-;;; In particular, what does USAGE look like
-;;; and what does it mean?  -- rms
 (defun epa-mail--find-usable-key (keys usage)
-  "Find a usable key from KEYS for USAGE."
+  "Find a usable key from KEYS for USAGE.
+USAGE would be `sign' or `encrypt'."
   (catch 'found
     (while keys
       (let ((pointer (epg-key-sub-key-list (car keys))))
@@ -66,71 +64,6 @@
           (setq pointer (cdr pointer))))
       (setq keys (cdr keys)))))
 
-(defvar epa-mail-group-alist nil
-  "Alist of GnuPG mail groups (`group' commands in `.gnupg/gpg.conf').
-Each element has the form (GROUPNAME ADDRESSES...).
-t means the list is not yet read in.")
-
-(defvar epa-mail-group-modtime nil
-  "The modification time of `~/.gnupg/gpg.conf' file when last examined.")
-
-(defvar epa-mail-gnupg-conf-file "~/.gnupg/gpg.conf"
-  "File name of GnuPG configuration file that specifies recipient groups.")
-
-(defun epa-mail-parse-groups ()
-  "Parse `~/.gnupg/gpg.conf' and set `epa-mail-group-alist' from it."
-  (let (aliases)
-    (with-temp-buffer
-      (insert-file-contents-literally epa-mail-gnupg-conf-file)
-
-      (while (re-search-forward "^[ \t]*group[ \t]*" nil t)
-        (if (looking-at "\\([^= \t]+\\)[ \t]*=[ \t]*\\([^ \t\n]+\\)")
-            (push (cons (match-string-no-properties 1)
-                        (split-string (match-string-no-properties 2)))
-                  aliases))))
-    (setq epa-mail-group-alist aliases)))
-
-(defun epa-mail-sync-groups ()
-  "Update GnuPG groups from file if necessary."
-  (if (file-exists-p epa-mail-gnupg-conf-file)
-      (let ((modtime (nth 5 (file-attributes epa-mail-gnupg-conf-file))))
-        (if (not (equal epa-mail-group-modtime modtime))
-            (progn
-              (setq epa-mail-group-modtime modtime)
-              (epa-mail-parse-groups))))
-    (setq epa-mail-group-alist nil)))
-
-(defun epa-mail-expand-recipient-1 (recipient)
-  "Expand RECIPIENT once thru `epa-mail-group-alist'.
-Returns the list of names it stands for, or nil if it isn't a group."
-  ;; Load the alias list if not loaded before.
-  (let (alist-elt)
-    (setq alist-elt (assoc recipient epa-mail-group-alist))
-    (cdr alist-elt)))
-
-(defun epa-mail-expand-recipients-2 (recipients)
-  "Expand list RECIPIENTS once thru `epa-mail-group-alist'.
-Returns the list of names they stand for."
-  ;; Load the alias list if not loaded before.
-  (let (output)
-    (dolist (r recipients)
-      (let ((expanded (epa-mail-expand-recipient-1 r)))
-        (if expanded
-            (dolist (xr expanded)
-              (unless (member xr output)
-                (push xr output)))
-          (unless (member r output)
-            (push r output)))))
-    (nreverse output)))
-
-(defun epa-mail-expand-recipients (recipients)
-  "Expand RECIPIENTS thru `epa-mail-group-alist' until it stops changing."
-  (epa-mail-sync-groups)
-  (while (not (equal recipients
-                     (setq recipients
-                           (epa-mail-expand-recipients-2 recipients)))))
-  recipients)
-
 ;;;###autoload
 (defun epa-mail-decrypt ()
   "Decrypt OpenPGP armors in the current buffer.
@@ -184,6 +117,7 @@ Don't use this command in Lisp programs!"
   (interactive
    (save-excursion
      (let ((verbose current-prefix-arg)
+           (config (epg-configuration))
            (context (epg-make-context epa-protocol))
            recipients-string recipients recipient-key sign)
        (goto-char (point-min))
@@ -211,9 +145,13 @@ Don't use this command in Lisp programs!"
 
        ;; Process all the recipients thru the list of GnuPG groups.
        ;; Expand GnuPG group names to what they stand for.
-       ;; The code below, and elsewhere, that checks that names have keys
-       ;; does not know about these group names.
-       (setq recipients (epa-mail-expand-recipients recipients))
+       (setq recipients
+             (apply #'nconc
+                    (mapcar
+                     (lambda (recipient)
+                       (or (epg-expand-group config recipient)
+                           (list recipient)))
+                     recipients)))
 
        (goto-char (point-min))
        (if (search-forward mail-header-separator nil t)
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 660bc8966e7..04ba929e392 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-17  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * nndraft.el (nndraft-update-unread-articles): Don't send delayed
+        articles.
+
 2011-08-13  Andreas Schwab  <schwab@linux-m68k.org>
 
         * gnus-score.el (gnus-all-score-files): Use copy-sequence instead of
diff --git a/lisp/gnus/nndraft.el b/lisp/gnus/nndraft.el
index f528222dd16..0b47062a919 100644
--- a/lisp/gnus/nndraft.el
+++ b/lisp/gnus/nndraft.el
@@ -177,6 +177,8 @@ are generated if and only if they are also in `message-draft-headers'.")
                                                        (list 'nndraft "")))
                            (nnmail-get-active)))
            (gnus-group-marked (copy-sequence groups))
+           ;; Don't send delayed articles.
+           (gnus-get-new-news-hook nil)
            (inhibit-read-only t))
       (gnus-group-get-new-news-this-group nil t)
       (dolist (group groups)
diff --git a/lisp/window.el b/lisp/window.el
index 7e666af6abf..eca3dcb435d 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -5087,9 +5087,10 @@ documentation of `display-buffer-alist' for a description."
             (when (symbolp function)
               (cdr (assq 'pop-up-frame-alist specifiers))))
            (frame
-            (if (symbolp function)
-                (funcall function parameters)
-              (funcall function))))
+            (with-current-buffer buffer
+              (if (symbolp function)
+                  (funcall function parameters)
+                (funcall function)))))
       (when frame
         (let ((window (frame-selected-window frame)))
           (set-window-parameter
diff --git a/src/ChangeLog b/src/ChangeLog
index ac9864f9f95..2aa0e157afe 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-17  Eli Zaretskii  <eliz@gnu.org>
+
+        * lread.c (Fload) [DOS_NT]: If `openp' returns -2, but the file
+        has no `load' handler, try opening the file locally.  (Bug#9311)
+
 2011-08-16  Ken Brown  <kbrown@cornell.edu>
 
         * gmalloc.c: Expand comment.
diff --git a/src/lread.c b/src/lread.c
index 78ff195e990..6d1a7b102d7 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1124,6 +1124,22 @@ Return t if the file exists and loads successfully.  */)
         handler = Ffind_file_name_handler (found, Qload);
       if (! NILP (handler))
         return call5 (handler, Qload, found, noerror, nomessage, Qt);
+#ifdef DOS_NT
+      /* Tramp has to deal with semi-broken packages that prepend
+         drive letters to remote files.  For that reason, Tramp
+         catches file operations that test for file existence, which
+         makes openp think X:/foo.elc files are remote.  However,
+         Tramp does not catch `load' operations for such files, so we
+         end up with a nil as the `load' handler above.  If we would
+         continue with fd = -2, we will behave wrongly, and in
+         particular try reading a .elc file in the "rt" mode instead
+         of "rb".  See bug #9311 for the results.  To work around
+         this, we try to open the file locally, and go with that if it
+         succeeds.  */
+      fd = emacs_open (SSDATA (ENCODE_FILE (found)), O_RDONLY, 0);
+      if (fd == -1)
+        fd = -2;
+#endif
     }
 
   /* Check if we're stuck in a recursive load cycle.
@@ -1247,9 +1263,17 @@ Return t if the file exists and loads successfully.  */)
   GCPRO3 (file, found, hist_file_name);
 
 #ifdef WINDOWSNT
-  emacs_close (fd);
   efound = ENCODE_FILE (found);
-  stream = fopen (SSDATA (efound), fmode);
+  /* If we somehow got here with fd == -2, meaning the file is deemed
+     to be remote, don't even try to reopen the file locally; just
+     force a failure instead.  */
+  if (fd >= 0)
+    {
+      emacs_close (fd);
+      stream = fopen (SSDATA (efound), fmode);
+    }
+  else
+    stream = NULL;
 #else  /* not WINDOWSNT */
   stream = fdopen (fd, fmode);
 #endif /* not WINDOWSNT */