aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/gnus/ChangeLog2
-rw-r--r--lisp/gnus/gmm-utils.el10
2 files changed, 6 insertions, 6 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 3a8f3dac83c..b9beeb3aede 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,7 @@
12010-10-03 Glenn Morris <rgm@gnu.org> 12010-10-03 Glenn Morris <rgm@gnu.org>
2 2
3 * gmm-utils.el (gmm-write-region): Drop Emacs 20 compat cruft.
4
3 * gnus-util.el (gnus-make-local-hook): Simplify. 5 * gnus-util.el (gnus-make-local-hook): Simplify.
4 6
52010-10-02 Julien Danjou <julien@danjou.info> 72010-10-02 Julien Danjou <julien@danjou.info>
diff --git a/lisp/gnus/gmm-utils.el b/lisp/gnus/gmm-utils.el
index b76db479dfb..e16fc5efa63 100644
--- a/lisp/gnus/gmm-utils.el
+++ b/lisp/gnus/gmm-utils.el
@@ -1,6 +1,7 @@
1;;; gmm-utils.el --- Utility functions for Gnus, Message and MML 1;;; gmm-utils.el --- Utility functions for Gnus, Message and MML
2 2
3;; Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. 3;; Copyright (C) 2006, 2007, 2008, 2009, 2010
4;; Free Software Foundation, Inc.
4 5
5;; Author: Reiner Steib <reiner.steib@gmx.de> 6;; Author: Reiner Steib <reiner.steib@gmx.de>
6;; Keywords: news 7;; Keywords: news
@@ -411,12 +412,9 @@ If mode is nil, use `major-mode' of the current buffer."
411 412
412In XEmacs, the seventh argument of `write-region' specifies the 413In XEmacs, the seventh argument of `write-region' specifies the
413coding-system." 414coding-system."
414 (if (and mustbenew 415 (if (and mustbenew (featurep 'xemacs))
415 (or (featurep 'xemacs)
416 (= emacs-major-version 20)))
417 (if (file-exists-p filename) 416 (if (file-exists-p filename)
418 (signal 'file-already-exists 417 (signal 'file-already-exists (list "File exists" filename))
419 (list "File exists" filename))
420 (write-region start end filename append visit lockname)) 418 (write-region start end filename append visit lockname))
421 (write-region start end filename append visit lockname mustbenew))) 419 (write-region start end filename append visit lockname mustbenew)))
422 420