Refuse to do marks if nntp-marks-file-name is nil.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5e7adfb..b65c2ad 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * nntp.el (nntp-request-set-mark): Refuse to do marks if
+       nntp-marks-file-name is nil.
+
 2010-09-01  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * gnus-html.el (gnus-html-wash-tags)

diff --git a/lisp/nntp.el b/lisp/nntp.el
index 4025b1f..1d6c6a5 100644 (file)
--- a/lisp/nntp.el
+++ b/lisp/nntp.el
@@ -1109,7 +1109,8 @@ command whose response triggered the error."
   t)
 
 (deffoo nntp-request-set-mark (group actions &optional server)
-  (unless nntp-marks-is-evil
+  (when (and (not nntp-marks-is-evil)
+            nntp-marks-file-name)
     (nntp-possibly-create-directory group server)
     (nntp-open-marks group server)
     (dolist (action actions)
@@ -1129,7 +1130,8 @@ command whose response triggered the error."
   nil)
 
 (deffoo nntp-request-update-info (group info &optional server)
-  (unless nntp-marks-is-evil
+  (when (and (not nntp-marks-is-evil)
+            nntp-marks-file-name)
     (nntp-possibly-create-directory group server)
     (when (nntp-marks-changed-p group server)
       (nnheader-message 8 "Updating marks for %s..." group)