From 4dcb0d7a58bff52c1155fd93c03dcab4567038f2 Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Wed, 17 Aug 2011 22:09:19 +0000 Subject: [PATCH] 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. --- lisp/gnus/ChangeLog | 11 +++++++++++ lisp/gnus/auth-source.el | 2 ++ lisp/gnus/message.el | 8 +++++--- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 04ba929e392..744f94da21d 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,14 @@ +2011-08-17 Lars Magne Ingebrigtsen + + * 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 * nndraft.el (nndraft-update-unread-articles): Don't send delayed diff --git a/lisp/gnus/auth-source.el b/lisp/gnus/auth-source.el index e249e97e826..4bd13cdc05e 100644 --- a/lisp/gnus/auth-source.el +++ b/lisp/gnus/auth-source.el @@ -1377,6 +1377,8 @@ Respects `auth-source-save-behavior'. Uses (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) diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index 47c4de0aedc..a157afe2ce6 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -1310,7 +1310,7 @@ text and it replaces `self-insert-command' with the other command, e.g. :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 @@ candidates: `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 @@ regexp to match all of yours addresses." (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")) -- 2.39.2