Commit 4dcb0d7a authored by Lars Magne Ingebrigtsen's avatar Lars Magne Ingebrigtsen Committed by Katsumi Yamaoka
Browse files

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.
parent 3e79eb87
2011-08-17 Lars Magne Ingebrigtsen <larsi@gnus.org>
* 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 <yamaoka@jpl.org>
 
* nndraft.el (nndraft-update-unread-articles): Don't send delayed
......
......@@ -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)
......
......@@ -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"))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment