(mml2015-epg-encrypt): Save the recipient keys in message-options.

[gnus] / lisp / nnmaildir.el

diff --git a/lisp/nnmaildir.el b/lisp/nnmaildir.el
index 76b0bb0..37224da 100644 (file)
--- a/lisp/nnmaildir.el
+++ b/lisp/nnmaildir.el
@@ -17,8 +17,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -481,7 +481,8 @@ by nnmaildir-request-article.")
        (prin1 (vector storage-version num msgid nov) (current-buffer))
        (setq file (concat novfile ":"))
        (nnmaildir--unlink file)
-       (write-region (point-min) (point-max) file nil 'no-message nil 'excl))
+       (gmm-write-region (point-min) (point-max) file nil 'no-message nil
+                         'excl))
       (rename-file file novfile 'replace)
       (setf (nnmaildir--art-msgid article) msgid)
       nov)))
@@ -1030,7 +1031,7 @@ by nnmaildir-request-article.")
        (throw 'return nil))
       (when (save-match-data (string-match "[\0/\t]" gname))
        (setf (nnmaildir--srv-error nnmaildir--cur-server)
-             (concat "Illegal characters (null, tab, or /) in group name: "
+             (concat "Invalid characters (null, tab, or /) in group name: "
                      gname))
        (throw 'return nil))
       (setq groups (nnmaildir--srv-groups nnmaildir--cur-server))
@@ -1075,7 +1076,7 @@ by nnmaildir-request-article.")
        (throw 'return nil))
       (when (save-match-data (string-match "[\0/\t]" new-name))
        (setf (nnmaildir--srv-error nnmaildir--cur-server)
-             (concat "Illegal characters (null, tab, or /) in group name: "
+             (concat "Invalid characters (null, tab, or /) in group name: "
                      new-name))
        (throw 'return nil))
       (if (string-equal gname new-name) (throw 'return t))
@@ -1298,8 +1299,8 @@ by nnmaildir-request-article.")
        (throw 'return nil))
       (save-excursion
        (set-buffer buffer)
-       (write-region (point-min) (point-max) tmpfile nil 'no-message nil
-                     'excl))
+       (gmm-write-region (point-min) (point-max) tmpfile nil 'no-message nil
+                         'excl))
       (unix-sync) ;; no fsync :(
       (rename-file tmpfile (concat (nnmaildir--cur dir) file suffix) 'replace)
       t)))
@@ -1392,8 +1393,8 @@ by nnmaildir-request-article.")
                                  (throw 'return nil))))
       (condition-case nil (add-name-to-file nnmaildir--file tmpfile)
        (error
-        (write-region (point-min) (point-max) tmpfile nil 'no-message nil
-                      'excl)
+        (gmm-write-region (point-min) (point-max) tmpfile nil 'no-message nil
+                          'excl)
         (unix-sync))) ;; no fsync :(
       (nnheader-cancel-timer 24h)
       (condition-case err