diff options
| author | Glenn Morris | 2010-10-02 19:01:07 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-10-02 19:01:07 -0700 |
| commit | 4ec3f7cf3586bcfbf7a983894099f778532dd8de (patch) | |
| tree | 1f6da5096db6efc01de6758bc4ed541cc3cddf33 | |
| parent | 59e31cfa13b938594e0c41e28b05826cae97ae77 (diff) | |
| download | emacs-4ec3f7cf3586bcfbf7a983894099f778532dd8de.tar.gz emacs-4ec3f7cf3586bcfbf7a983894099f778532dd8de.zip | |
* lisp/gnus/gmm-utils.el (gmm-write-region): Drop Emacs 20 compat cruft.
| -rw-r--r-- | lisp/gnus/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/gnus/gmm-utils.el | 10 |
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 @@ | |||
| 1 | 2010-10-03 Glenn Morris <rgm@gnu.org> | 1 | 2010-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 | ||
| 5 | 2010-10-02 Julien Danjou <julien@danjou.info> | 7 | 2010-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 | ||
| 412 | In XEmacs, the seventh argument of `write-region' specifies the | 413 | In XEmacs, the seventh argument of `write-region' specifies the |
| 413 | coding-system." | 414 | coding-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 | ||