[Emacs-diffs] /srv/bzr/emacs/trunk r105484: Merge changes made in Gnus trunk.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 105484
author: Lars Magne Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Wed 2011-08-17 22:09:19 +0000
message:
  Merge changes made in Gnus trunk.
  
  message.el (message-is-yours-p): Allow disabling canlock checking (bug#9295).
   (message-shoot-gnksa-feet): Add `canlock-verify'.
   (message-auto-save-directory): Use ~/ as the auto-save directory if the 
message directory isn't writable (bug#9304).
  auth-source.el (auth-source-netrc-saver): Make the .authinfo file 
non-world-readable.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/auth-source.el
  lisp/gnus/message.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-08-17 00:10:46 +0000
+++ b/lisp/gnus/ChangeLog       2011-08-17 22:09:19 +0000
@@ -1,3 +1,14 @@
+2011-08-17  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * message.el (message-is-yours-p): Allow disabling canlock checking
+       (bug#9295).
+       (message-shoot-gnksa-feet): Add `canlock-verify'.
+       (message-auto-save-directory): Use ~/ as the auto-save directory if the
+       message directory isn't writable (bug#9304).
+
+       * auth-source.el (auth-source-netrc-saver): Make the .authinfo file
+       non-world-readable.
+
 2011-08-17  Katsumi Yamaoka  <address@hidden>
 
        * nndraft.el (nndraft-update-unread-articles): Don't send delayed

=== modified file 'lisp/gnus/auth-source.el'
--- a/lisp/gnus/auth-source.el  2011-07-03 22:24:12 +0000
+++ b/lisp/gnus/auth-source.el  2011-08-17 22:09:19 +0000
@@ -1377,6 +1377,8 @@
                 (insert "\n"))
               (insert add "\n")
               (write-region (point-min) (point-max) file nil 'silent)
+             ;; Make the .authinfo file non-world-readable.
+             (set-file-modes file #o600)
               (auth-source-do-debug
                "auth-source-netrc-create: wrote 1 new line to %s"
                file)

=== modified file 'lisp/gnus/message.el'
--- a/lisp/gnus/message.el      2011-07-19 22:19:06 +0000
+++ b/lisp/gnus/message.el      2011-08-17 22:09:19 +0000
@@ -1310,7 +1310,7 @@
   :type '(repeat function))
 
 (defcustom message-auto-save-directory
-  (if (file-exists-p message-directory)
+  (if (file-writable-p message-directory)
       (file-name-as-directory (expand-file-name "drafts" message-directory))
     "~/")
   "*Directory where Message auto-saves buffers if Gnus isn't running.
@@ -1353,7 +1353,8 @@
 `quoted-text-only'  Allow you to post quoted text only;
 `multiple-copies'   Allow you to post multiple copies;
 `cancel-messages'   Allow you to cancel or supersede messages from
-                   your other email addresses.")
+                   your other email addresses;
+`canlock-verify'    Allow you to cancel messages without verifying canlock.")
 
 (defsubst message-gnksa-enable-p (feature)
   (or (not (listp message-shoot-gnksa-feet))
@@ -7037,7 +7038,8 @@
   (save-excursion
     (save-restriction
       (message-narrow-to-head-1)
-      (if (message-fetch-field "Cancel-Lock")
+      (if (and (message-fetch-field "Cancel-Lock")
+              (message-gnksa-enable-p 'canlock-verify))
          (if (null (canlock-verify))
              t
            (error "Failed to verify Cancel-lock: This article is not yours"))