Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/gnus--devo--0--patch-408

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index bce363f..15d7b4a 100644 (file)
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,7 +1,20 @@
+2007-10-15  Sam Steingold  <sds@gnu.org>
+
+       * sendmail.el (sendmail-error-reporting-interactive)
+       (sendmail-error-reporting-non-interactive): New variables for
+       sendmail error reporting options to simplify support for imperfect
+       sendmail emulators.
+       (sendmail-send-it): Use them instead of list literals.
+
 2007-10-04  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * Relicense "GPLv2 or later" files to "GPLv3 or later".
 
+2007-09-23  Richard Stallman  <rms@gnu.org>
+
+       * sendmail.el (mail-bury): Delete the frame if this frame looks
+       like it was made for this message.
+
 2007-09-16  Andreas Seltenreich  <andreas@gate450.dyndns.org>
 
        * nnir.el (nnir-run-query): Add a find-grep engine.

diff --git a/contrib/sendmail.el b/contrib/sendmail.el
index 5803661..baf99cf 100644 (file)
--- a/contrib/sendmail.el
+++ b/contrib/sendmail.el
@@ -767,7 +767,13 @@ Prefix arg means don't delete this window."
   "Bury this mail buffer."
   (let ((newbuf (other-buffer (current-buffer))))
     (bury-buffer (current-buffer))
-    (if (and (or (window-dedicated-p (frame-selected-window))
+    (if (and (or nil
+                ;; In this case, we need to go to a different frame.
+                (window-dedicated-p (frame-selected-window))
+                ;; In this mode of operation, the frame was probably
+                ;; made for this buffer, so the user probably wants
+                ;; to delete it now.
+                (and pop-up-frames (one-window-p))
                 (cdr (assq 'mail-dedicated-frame (frame-parameters))))
             (not (null (delq (selected-frame) (visible-frame-list)))))
        (progn
@@ -985,6 +991,19 @@ See also the function `select-message-coding-system'.")
           nil)
          (t (error "Invalid value for `mail-from-style'")))))
 
+;; Normally you will not need to modify these options unless you are
+;; using some non-genuine substitute for sendmail which does not
+;; implement each and every option that the original supports.
+;; E.g., ssmtp does not support "-odb", so, if your site uses it,
+;; you will need to modify `sendmail-error-reporting-non-interactive'
+;; in your site-init.el.
+(defvar sendmail-error-reporting-interactive
+  ;; These mean "report errors to terminal" and "deliver interactively"
+  '("-oep" "-odi"))
+(defvar sendmail-error-reporting-non-interactive
+  ;; These mean "report errors by mail" and "deliver in background".
+  '("-oem" "-odb"))
+
 (defun sendmail-send-it ()
   "Send the current mail buffer using the Sendmail package.
 This is a suitable value for `send-mail-function'.  It sends using the
@@ -1129,12 +1148,8 @@ external program defined by `sendmail-program'."
                              (and mail-alias-file
                                   (list (concat "-oA" mail-alias-file)))
                              (if mail-interactive
-                                 ;; These mean "report errors to terminal"
-                                 ;; and "deliver interactively"
-                                 '("-oep" "-odi")
-                               ;; These mean "report errors by mail"
-                               ;; and "deliver in background".
-                               '("-oem" "-odb"))
+                                  sendmail-error-reporting-interactive
+                                  sendmail-error-reporting-non-interactive)
                              ;; Get the addresses from the message
                              ;; unless this is a resend.
                              ;; We must not do that for a resend

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9ca5938..c99afb8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -59,6 +59,11 @@
        (gnus-treat-emphasize, gnus-treat-body-boundary): Don't test
        window-system.
 
+2007-10-28  Miles Bader  <miles@gnu.org>
+
+       * nnheader.el (nnheader-uniquify-message-id): Make sure this is defined
+       at compile-time too.
+
 2007-10-27  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * gnus-msg.el (gnus-message-setup-hook): Add
@@ -209,6 +214,15 @@
        (gnus-article-add-buttons): Use it.
        (gnus-button-push): Use concatenated url that it makes.
 
+2007-10-04  Juanma Barranquero  <lekktu@gmail.com>
+
+       * sieve-manage.el (sieve-manage-interactive-login): Doc fix.
+
+2007-10-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * gnus-uu.el (gnus-uu-reginize-string, gnus-uu-expand-numbers):
+       Don't hardcode point-min==1.
+
 2007-10-08  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * mm-util.el (mm-charset-synonym-alist): Alias gbk to cp936.

diff --git a/lisp/gnus-uu.el b/lisp/gnus-uu.el
index 9595996..2093756 100644 (file)
--- a/lisp/gnus-uu.el
+++ b/lisp/gnus-uu.el
@@ -1106,7 +1106,7 @@ When called interactively, prompt for REGEXP."
                                nil t)
            (replace-match "\\1[0-9]+\\2[0-9]+" t nil nil nil))))
 
-    (goto-char 1)
+    (goto-char (point-min))
     (while (re-search-forward "[ \t]+" nil t)
       (replace-match "[ \t]+" t t))
 
@@ -1207,7 +1207,7 @@ When called interactively, prompt for REGEXP."
             (format "%06d"
                     (string-to-number (buffer-substring
                                     (match-beginning 0) (match-end 0)))))))
-       (setq string (buffer-substring 1 (point-max)))
+       (setq string (buffer-substring (point-min) (point-max)))
        (setcar (car string-list) string)
        (setq string-list (cdr string-list))))
     out-list))

diff --git a/lisp/nnheader.el b/lisp/nnheader.el
index 1e979c3..031d2c3 100644 (file)
--- a/lisp/nnheader.el
+++ b/lisp/nnheader.el
@@ -395,7 +395,8 @@ on your system, you could say something like:
               out)))
      out))
 
-(defvar nnheader-uniquify-message-id nil)
+(eval-and-compile
+  (defvar nnheader-uniquify-message-id nil))
 
 (defmacro nnheader-nov-read-message-id (&optional number)
   `(let ((id (nnheader-nov-field)))

diff --git a/lisp/sieve-manage.el b/lisp/sieve-manage.el
index b9b18c3..d8bd965 100644 (file)
--- a/lisp/sieve-manage.el
+++ b/lisp/sieve-manage.el
@@ -197,7 +197,7 @@ Valid states are `closed', `initial', `nonauth', and `auth'.")
 (defun sieve-manage-interactive-login (buffer loginfunc)
   "Login to server in BUFFER.
 LOGINFUNC is passed a username and a password, it should return t if
-it where sucessful authenticating itself to the server, nil otherwise.
+it was successful authenticating itself to the server, nil otherwise.
 Returns t if login was successful, nil otherwise."
   (with-current-buffer buffer
     (make-local-variable 'sieve-manage-username)

diff --git a/texi/gnus-faq.texi b/texi/gnus-faq.texi
index 53a1425..8f0280c 100644 (file)
--- a/texi/gnus-faq.texi
+++ b/texi/gnus-faq.texi
@@ -128,7 +128,7 @@ What is the latest version of Gnus?
 Jingle please: Gnus 5.10 is released, get it while it's
 hot! As well as the step in version number is rather
 small, Gnus 5.10 has tons of new features which you
-shouldn't miss. The current release (5.10.8) should be at
+shouldn't miss. The current release (5.13) should be at
 least as stable as the latest release of the 5.8 series.
 
 @node [1.2]