* mml.el (mml-preview): Disable local map.

	* mml.el (mml-preview): Bind `q'.
	From: Karl Kleinpaste <karl@charcoal.com>

And fix copyright lines.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index f88703239bb402bb85ee8773ecc09fe99eddd470..98275317b648ecf1f4eeb53cab04766b2c35ebaf 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,10 @@
+2002-02-07  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * mml.el (mml-preview): Disable local map.
+       
+       * mml.el (mml-preview): Bind `q'.
+       From: Karl Kleinpaste <karl@charcoal.com>
+
 2002-02-03  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * message.el (message-forward-rmail-make-body): Directly use
@@ -26,11 +33,6 @@
        * nntp.el (nntp-send-buffer): Use mm-with-unibyte-current-buffer.
        * nnspool.el (nnspool-request-post): Ditto.
 
-2002-01-01  ShengHuo ZHU  <zsh@cs.rochester.edu>
-
-       * message.el, gnus-art.el, gnus.el, gnus-cite.el: 
-       Adapt face definitions to use :weight and :slant.
-
 2001-12-12  Pavel Jan\e,Am\e(Bk  <Pavel@Janik.cz>
 
        * gnus-mlspl.el (gnus-group-split-fancy): Doc fix (add reference
@@ -10778,6 +10780,6 @@
 ;; coding: iso-2022-7bit
 ;; End:
 
-    Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+    Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.

diff --git a/lisp/gnus/gnus-cite.el b/lisp/gnus/gnus-cite.el
index ef659175b14fed37ed1f74a65eaf3842a0636e2c..24f94c67edf5fa378d06dc960b4cb5a6ae2a2266 100644 (file)
--- a/lisp/gnus/gnus-cite.el
+++ b/lisp/gnus/gnus-cite.el
@@ -1,6 +1,6 @@
 ;;; gnus-cite.el --- parse citations in articles for Gnus  -*- coding: iso-latin-1 -*-
 
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Per Abhiddenware

diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index b1473692e4ad283dc0417300e58a531339441010..30baf2f8c118b301ef1a1445deb5c4ef3435fe25 100644 (file)
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -1,5 +1,5 @@
 ;;; gnus-group.el --- group mode commands for Gnus
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>

diff --git a/lisp/gnus/gnus-mlspl.el b/lisp/gnus/gnus-mlspl.el
index 40f53a83cfa7f20de646f9c7a20bcf1db88b81a4..b0f9f467b7c0c7b94bc11276429fdd148376af55 100644 (file)
--- a/lisp/gnus/gnus-mlspl.el
+++ b/lisp/gnus/gnus-mlspl.el
@@ -1,5 +1,5 @@
 ;;; gnus-mlspl.el --- a group params-based mail splitting mechanism
-;; Copyright (C) 1998, 1999, 2000
+;; Copyright (C) 1998, 1999, 2000, 2002
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Alexandre Oliva <oliva@lsd.ic.unicamp.br>

diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index 6ff8226591062afa9566306489a63f23aa8f1a44..9c834ab12b0231cb09f8630c7bacc00dd1296433 100644 (file)
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -1,5 +1,5 @@
 ;;; gnus-msg.el --- mail and post interface for Gnus
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>

diff --git a/lisp/gnus/gnus-score.el b/lisp/gnus/gnus-score.el
index 1de3b48e5f5fac915bb06415bc80d788228fcd26..33d09e7009f6106ae6052282f70a0197aebb9141 100644 (file)
--- a/lisp/gnus/gnus-score.el
+++ b/lisp/gnus/gnus-score.el
@@ -1,5 +1,5 @@
 ;;; gnus-score.el --- scoring code for Gnus
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Per Abrahamsen <amanda@iesd.auc.dk>

diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index bc172f4b50971ec98ad53e53d05b7bca5e7f1c23..d1144446c9e08df10392a42341ae8e51d298d43f 100644 (file)
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -1,5 +1,5 @@
 ;;; gnus-sum.el --- summary mode commands for Gnus
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>

diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index 329d81a2a331cea2c87fd4b76ec93e9c90922ef4..69bc453bf629739d8de5a708d4064fa5a7fd2660 100644 (file)
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -1,5 +1,5 @@
 ;;; gnus-util.el --- utility functions for Gnus
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>

diff --git a/lisp/gnus/imap.el b/lisp/gnus/imap.el
index d46a92a0b2842fe3459f6a08a1f0d05d31054bf7..643fd10d9f1c4a0184293b54916497853766e1bc 100644 (file)
--- a/lisp/gnus/imap.el
+++ b/lisp/gnus/imap.el
@@ -1,5 +1,5 @@
 ;;; imap.el --- imap library
-;; Copyright (C) 1998, 1999, 2000
+;; Copyright (C) 1998, 1999, 2000, 2002
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <jas@pdc.kth.se>

diff --git a/lisp/gnus/mailcap.el b/lisp/gnus/mailcap.el
index 89a643fa57b5ea3c8580c4fc1059a7912c7669c3..2fd62a27f3a2d13d45dbbf43828952d6ac3f725f 100644 (file)
--- a/lisp/gnus/mailcap.el
+++ b/lisp/gnus/mailcap.el
@@ -1,5 +1,5 @@
 ;;; mailcap.el --- MIME media types configuration
-;; Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation, Inc.
 
 ;; Author: William M. Perry <wmperry@aventail.com>
 ;;     Lars Magne Ingebrigtsen <larsi@gnus.org>

diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el
index 2fa24a72855a4b4579dfac348e2389eb5915361f..7244c04c57307dd2a6ef3476e1b9cb689bf72bc7 100644 (file)
--- a/lisp/gnus/mm-view.el
+++ b/lisp/gnus/mm-view.el
@@ -1,5 +1,5 @@
 ;;; mm-view.el --- functions for viewing MIME objects
-;; Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; This file is part of GNU Emacs.

diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el
index d2beef9fa5067e22d7c0e89a0aae6a02ddd9d0b7..e28fa1e9e1e6d75adff03fb68c749ab84be7f32d 100644 (file)
--- a/lisp/gnus/mml.el
+++ b/lisp/gnus/mml.el
@@ -1,5 +1,5 @@
 ;;; mml.el --- package for parsing and validating MML documents
-;; Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; This file is part of GNU Emacs.
@@ -854,8 +854,10 @@ If RAW, don't highlight the article."
        (run-hooks 'gnus-article-decode-hook)
        (let ((gnus-newsgroup-name "dummy"))
          (gnus-article-prepare-display))))
-    (fundamental-mode)
+    ;; Disable article-mode-map.
+    (use-local-map nil)
     (setq buffer-read-only t)
+    (local-set-key "q" (lambda () (interactive) (kill-buffer nil)))
     (goto-char (point-min))))
 
 (defun mml-validate ()

diff --git a/lisp/gnus/nnfolder.el b/lisp/gnus/nnfolder.el
index 8ba41d950725303f11cdb29560fb1d1a09995032..dca4485067fc0de46982a8eb41d70477b712eb26 100644 (file)
--- a/lisp/gnus/nnfolder.el
+++ b/lisp/gnus/nnfolder.el
@@ -1,5 +1,5 @@
 ;;; nnfolder.el --- mail folder access for Gnus
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Scott Byer <byer@mv.us.adobe.com>

diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 0d1c57c090fe9e4f25e63d9da357b5395a76ed37..b4f6bbd74fdda3aa761717e423b77efb72eca689 100644 (file)
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -1,5 +1,5 @@
 ;;; nnimap.el --- imap backend for Gnus
-;; Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <jas@pdc.kth.se>
 ;;         Jim Radford <radford@robby.caltech.edu>

diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el
index ad28361ebd8d157558709a1a4c59ad521ce1137e..5280047d771a3ab98170fd237e489118d0dcaf20 100644 (file)
--- a/lisp/gnus/nnmail.el
+++ b/lisp/gnus/nnmail.el
@@ -1,5 +1,5 @@
 ;;; nnmail.el --- mail support functions for the Gnus mail backends
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>

diff --git a/lisp/gnus/nnslashdot.el b/lisp/gnus/nnslashdot.el
index 8290b2c73b166a306953f90cf5de25b218d394e8..82456e26bfa7edb3143da35889ac193c4dc93507 100644 (file)
--- a/lisp/gnus/nnslashdot.el
+++ b/lisp/gnus/nnslashdot.el
@@ -1,5 +1,5 @@
 ;;; nnslashdot.el --- interfacing with Slashdot
-;; Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news

diff --git a/lisp/gnus/nnultimate.el b/lisp/gnus/nnultimate.el
index 5ce8446da11c4e92a4fc4d743f9435c64b6e6f22..f0c76bc7e6318ef088e60cb9e6fd8d6820835ab8 100644 (file)
--- a/lisp/gnus/nnultimate.el
+++ b/lisp/gnus/nnultimate.el
@@ -1,5 +1,5 @@
 ;;; nnultimate.el --- interfacing with the Ultimate Bulletin Board system -*- coding: iso-latin-1 -*-
-;; Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news

diff --git a/lisp/gnus/nnweb.el b/lisp/gnus/nnweb.el
index 740b182639f4e1f1174d77f20deb7101b3b3ecee..553ad2e8b51055817908f96dec696b2b1cfaab83 100644 (file)
--- a/lisp/gnus/nnweb.el
+++ b/lisp/gnus/nnweb.el
@@ -1,5 +1,5 @@
 ;;; nnweb.el --- retrieving articles via web search engines
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>