Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-13

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 43-57)

   - Update from CVS
   - Merge from erc--emacs--0
   - Make constrain-to-field notice overlays
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 18-21)

   - Update from CVS
   - Merge from emacs--devo--0

23 files changed, 34 insertions, 23 deletions

diff --git a/lisp/obsolete/awk-mode.el b/lisp/obsolete/awk-mode.el
index 166986fd34e..95c3a0582b7 100644
--- a/lisp/obsolete/awk-mode.el
+++ b/lisp/obsolete/awk-mode.el
@@ -1,7 +1,7 @@
 ;;; awk-mode.el --- AWK code editing commands for Emacs
 
 ;; Copyright (C) 1988, 1994, 1996, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: unix, languages
diff --git a/lisp/obsolete/bg-mouse.el b/lisp/obsolete/bg-mouse.el
index 687619a051b..abb0b9560ce 100644
--- a/lisp/obsolete/bg-mouse.el
+++ b/lisp/obsolete/bg-mouse.el
@@ -1,6 +1,7 @@
 ;;; bg-mouse.el --- GNU Emacs code for BBN Bitgraph mouse
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: John Robinson <jr@bbn-unix.arpa>
 ;;	Stephen Gildea <gildea@bbn.com>
diff --git a/lisp/obsolete/fast-lock.el b/lisp/obsolete/fast-lock.el
index 0d8fcfadc58..60c7988a66b 100644
--- a/lisp/obsolete/fast-lock.el
+++ b/lisp/obsolete/fast-lock.el
@@ -1,7 +1,7 @@
 ;;; fast-lock.el --- automagic text properties caching for fast Font Lock mode
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Simon Marshall <simon@gnu.org>
 ;; Maintainer: FSF
diff --git a/lisp/obsolete/float.el b/lisp/obsolete/float.el
index 400956ea232..32f0ef6a412 100644
--- a/lisp/obsolete/float.el
+++ b/lisp/obsolete/float.el
@@ -1,6 +1,7 @@
 ;;; float.el --- obsolete floating point arithmetic package
 
-;; Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1986, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Bill Rosenblatt
 ;; Maintainer: FSF
diff --git a/lisp/obsolete/hilit19.el b/lisp/obsolete/hilit19.el
index 666c580098f..adb4f7701dc 100644
--- a/lisp/obsolete/hilit19.el
+++ b/lisp/obsolete/hilit19.el
@@ -1,7 +1,7 @@
 ;;; hilit19.el --- customizable highlighting for Emacs 19
 
 ;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author:   Jonathan Stigelman <stig@hackvan.com>
 ;; Maintainer: FSF
diff --git a/lisp/obsolete/hscroll.el b/lisp/obsolete/hscroll.el
index 5e3d141f73b..0659c47c199 100644
--- a/lisp/obsolete/hscroll.el
+++ b/lisp/obsolete/hscroll.el
@@ -1,7 +1,7 @@
 ;;; hscroll.el --- automatically scroll truncated lines horizontally
 
 ;; Copyright (C) 1992, 1993, 1995, 1996, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Wayne Mesard <wmesard@esd.sgi.com>
 ;; Keywords: display
diff --git a/lisp/obsolete/iso-acc.el b/lisp/obsolete/iso-acc.el
index 6ff9e31d7fd..756833fec4b 100644
--- a/lisp/obsolete/iso-acc.el
+++ b/lisp/obsolete/iso-acc.el
@@ -1,7 +1,7 @@
 ;;; iso-acc.el --- minor mode providing electric accent keys
 
 ;; Copyright (C) 1993, 1994, 1996, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Johan Vromans
 ;; Maintainer: FSF
diff --git a/lisp/obsolete/iso-swed.el b/lisp/obsolete/iso-swed.el
index ab5287bc97a..510efd32016 100644
--- a/lisp/obsolete/iso-swed.el
+++ b/lisp/obsolete/iso-swed.el
@@ -1,6 +1,7 @@
 ;;; iso-swed.el --- set up char tables for ISO 8859/1 for Swedish/Finnish ttys
 
-;; Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1987, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Howard Gayle
 ;; Maintainer: FSF
diff --git a/lisp/obsolete/keyswap.el b/lisp/obsolete/keyswap.el
index 0ed70d61dee..61b5bbeb171 100644
--- a/lisp/obsolete/keyswap.el
+++ b/lisp/obsolete/keyswap.el
@@ -1,6 +1,7 @@
 ;;; keyswap.el --- swap BS and DEL keys -*- no-byte-compile: t -*-
 
-;; Copyright (C) 1992, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
 ;; Keywords: terminals
diff --git a/lisp/obsolete/lazy-lock.el b/lisp/obsolete/lazy-lock.el
index eaef84a6ab4..6dc9f31c066 100644
--- a/lisp/obsolete/lazy-lock.el
+++ b/lisp/obsolete/lazy-lock.el
@@ -1,7 +1,7 @@
 ;;; lazy-lock.el --- lazy demand-driven fontification for fast Font Lock mode
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Simon Marshall <simon@gnu.org>
 ;; Maintainer: FSF
diff --git a/lisp/obsolete/mlsupport.el b/lisp/obsolete/mlsupport.el
index 22356f1df64..68ee625cd8f 100644
--- a/lisp/obsolete/mlsupport.el
+++ b/lisp/obsolete/mlsupport.el
@@ -1,6 +1,7 @@
 ;;; mlsupport.el --- run-time support for mocklisp code
 
-;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: extensions
diff --git a/lisp/obsolete/ooutline.el b/lisp/obsolete/ooutline.el
index 17374ba1781..83f6fa69f30 100644
--- a/lisp/obsolete/ooutline.el
+++ b/lisp/obsolete/ooutline.el
@@ -1,7 +1,7 @@
 ;;; ooutline.el --- outline mode commands for Emacs
 
 ;; Copyright (C) 1986, 1993, 1994, 1997, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: outlines
diff --git a/lisp/obsolete/options.el b/lisp/obsolete/options.el
index 733e3740dc0..1383666a9b1 100644
--- a/lisp/obsolete/options.el
+++ b/lisp/obsolete/options.el
@@ -1,6 +1,7 @@
 ;;; options.el --- edit Options command for Emacs
 
-;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 
diff --git a/lisp/obsolete/profile.el b/lisp/obsolete/profile.el
index 3d5ea982b86..80b27063dbc 100644
--- a/lisp/obsolete/profile.el
+++ b/lisp/obsolete/profile.el
@@ -1,7 +1,7 @@
 ;;; profile.el --- Emacs profiler (OBSOLETE; use elp.el instead)
 
 ;; Copyright (C) 1992, 1994, 1998, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Boaz Ben-Zvi <boaz@lcs.mit.edu>
 ;; Created: 07 Feb 1992
diff --git a/lisp/obsolete/rnews.el b/lisp/obsolete/rnews.el
index e6ab3e8c872..89c74dd7993 100644
--- a/lisp/obsolete/rnews.el
+++ b/lisp/obsolete/rnews.el
@@ -1,7 +1,7 @@
 ;;; rnews.el --- USENET news reader for GNU Emacs
 
 ;; Copyright (C) 1985, 1986, 1987, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: news
diff --git a/lisp/obsolete/rnewspost.el b/lisp/obsolete/rnewspost.el
index 221f1a0e675..f07ce703db8 100644
--- a/lisp/obsolete/rnewspost.el
+++ b/lisp/obsolete/rnewspost.el
@@ -1,7 +1,7 @@
 ;;; rnewspost.el --- USENET news poster/mailer for GNU Emacs
 
 ;; Copyright (C) 1985, 1986, 1987, 1995, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: mail, news
diff --git a/lisp/obsolete/rsz-mini.el b/lisp/obsolete/rsz-mini.el
index 94b7e212279..a9e4b007dd8 100644
--- a/lisp/obsolete/rsz-mini.el
+++ b/lisp/obsolete/rsz-mini.el
@@ -1,7 +1,7 @@
 ;;; rsz-mini.el --- dynamically resize minibuffer to display entire contents
 
 ;; Copyright (C) 1990, 1993, 1994, 1995, 1997, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Noah Friedman <friedman@splode.com>
 ;;         Roland McGrath <roland@gnu.org>
diff --git a/lisp/obsolete/scribe.el b/lisp/obsolete/scribe.el
index 1be01ebc5bb..905e63ea1c5 100644
--- a/lisp/obsolete/scribe.el
+++ b/lisp/obsolete/scribe.el
@@ -1,6 +1,7 @@
 ;;; scribe.el --- scribe mode, and its idiosyncratic commands
 
-;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: wp
diff --git a/lisp/obsolete/sun-curs.el b/lisp/obsolete/sun-curs.el
index 769d4de868f..faa55fb8dd5 100644
--- a/lisp/obsolete/sun-curs.el
+++ b/lisp/obsolete/sun-curs.el
@@ -1,6 +1,7 @@
 ;;; sun-curs.el --- cursor definitions for Sun windows
 
-;; Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1987, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Jeff Peck <peck@sun.com>
 ;; Keywords: hardware
diff --git a/lisp/obsolete/sun-fns.el b/lisp/obsolete/sun-fns.el
index 614b352ad3a..532d28462c9 100644
--- a/lisp/obsolete/sun-fns.el
+++ b/lisp/obsolete/sun-fns.el
@@ -1,6 +1,7 @@
 ;;; sun-fns.el --- subroutines of Mouse handling for Sun windows
 
-;; Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1987, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Jeff Peck <peck@sun.com>
 ;; Maintainer: none
diff --git a/lisp/obsolete/uncompress.el b/lisp/obsolete/uncompress.el
index 7ee25992218..7c1ab59fd87 100644
--- a/lisp/obsolete/uncompress.el
+++ b/lisp/obsolete/uncompress.el
@@ -1,7 +1,7 @@
 ;;; uncompress.el --- auto-decompression hook for visiting .Z files
 
 ;; Copyright (C) 1992, 1994, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: files
diff --git a/lisp/obsolete/x-apollo.el b/lisp/obsolete/x-apollo.el
index edf3436aa96..869f63481ee 100644
--- a/lisp/obsolete/x-apollo.el
+++ b/lisp/obsolete/x-apollo.el
@@ -1,6 +1,7 @@
 ;;; x-apollo.el --- Apollo support functions
 
-;; Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/obsolete/x-menu.el b/lisp/obsolete/x-menu.el
index 12427f803cc..c13c9c1865b 100644
--- a/lisp/obsolete/x-menu.el
+++ b/lisp/obsolete/x-menu.el
@@ -1,6 +1,7 @@
 ;;; x-menu.el --- menu support for X
 
-;; Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1986, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.