[Emacs-diffs] /srv/bzr/emacs/trunk r103923: * lisp/gnus/gnus-draft.el (gnus-draft-setup): New arg `dont-pop'.

[Stefan Monnier]

------------------------------------------------------------
revno: 103923
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Fri 2011-04-15 09:42:51 -0300
message:
  * lisp/gnus/gnus-draft.el (gnus-draft-setup): New arg `dont-pop'.
  (gnus-draft-send): Use it to avoid popping
  up frames from gnus-group-send-queue.
  * lisp/gnus/gnus.el (gnus-splash-svg-color-symbols): Don't use insert-file
  from Lisp.
  * lisp/gnus/message.el (message-bogus-system-names): Replace ^...$ => \`...\'.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-draft.el
  lisp/gnus/gnus.el
  lisp/gnus/message.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-04-14 10:41:00 +0000
+++ b/lisp/gnus/ChangeLog       2011-04-15 12:42:51 +0000
@@ -1,3 +1,13 @@
+2011-04-15  Stefan Monnier  <address@hidden>
+
+       * message.el (message-bogus-system-names): Replace ^...$ => \`...\'.
+
+       * gnus.el (gnus-splash-svg-color-symbols): Don't use insert-file from 
Lisp.
+
+       * gnus-draft.el (gnus-draft-setup): New arg `dont-pop'.
+       (gnus-draft-send): Use it to avoid popping
+       up frames from gnus-group-send-queue.
+
 2011-04-14  Teodor Zlatanov  <address@hidden>
 
        * gnus-registry.el: Updated gnus-registry docs.

=== modified file 'lisp/gnus/gnus-draft.el'
--- a/lisp/gnus/gnus-draft.el   2011-02-03 23:43:22 +0000
+++ b/lisp/gnus/gnus-draft.el   2011-04-15 12:42:51 +0000
@@ -149,7 +149,7 @@
                                      gnus-agent-queue-mail))
         (rfc2047-encode-encoded-words nil)
          type method move-to)
-    (gnus-draft-setup article (or group "nndraft:queue"))
+    (gnus-draft-setup article (or group "nndraft:queue") nil 'dont-pop)
     ;; We read the meta-information that says how and where
     ;; this message is to be sent.
     (save-restriction
@@ -245,11 +245,15 @@
   :type 'hook)
 
 
-(defun gnus-draft-setup (narticle group &optional restore)
+(defun gnus-draft-setup (narticle group &optional restore dont-pop)
+  "Setup a mail draft buffer.
+If DONT-POP is nil, display the buffer after setting it up."
   (let (ga)
     (gnus-setup-message 'forward
       (let ((article narticle))
-        (message-mail)
+        (message-mail nil nil nil nil
+                      (if dont-pop
+                          (lambda (buf) (set-buffer (get-buffer-create buf)))))
         (let ((inhibit-read-only t))
           (erase-buffer))
         (if (not (gnus-request-restore-buffer article group))

=== modified file 'lisp/gnus/gnus.el'
--- a/lisp/gnus/gnus.el 2011-03-30 14:59:42 +0000
+++ b/lisp/gnus/gnus.el 2011-04-15 12:42:51 +0000
@@ -1107,16 +1107,18 @@
     (set-buffer-modified-p t)))
 
 (defun gnus-splash-svg-color-symbols (list)
-  "Do color-symbol search-and-replace in svg file"
+  "Do color-symbol search-and-replace in svg file."
   (let ((type (plist-get (cdr list) :type))
         (file (plist-get (cdr list) :file))
         (color-symbols (plist-get (cdr list) :color-symbols)))
     (if (string= type "svg")
-        (let ((data (with-temp-buffer (insert-file file) (buffer-string))))
+        (let ((data (with-temp-buffer (insert-file-contents file)
+                                      (buffer-string))))
           (mapc (lambda (rule)
                   (setq data (replace-regexp-in-string
                               (concat "fill:" (car rule))
-                              (concat "fill:" (cdr rule)) data))) 
color-symbols)
+                              (concat "fill:" (cdr rule)) data)))
+                color-symbols)
           (cons (car list) (list :type type :data data)))
        list)))
 

=== modified file 'lisp/gnus/message.el'
--- a/lisp/gnus/message.el      2011-03-30 14:59:42 +0000
+++ b/lisp/gnus/message.el      2011-04-15 12:42:51 +0000
@@ -1882,7 +1882,7 @@
 (defvar message-send-mail-real-function nil
   "Internal send mail function.")
 
-(defvar message-bogus-system-names "^localhost\\.\\|\\.local$"
+(defvar message-bogus-system-names "\\`localhost\\.\\|\\.local\\'"
   "The regexp of bogus system names.")
 
 (defcustom message-valid-fqdn-regexp