diff options
author | Karoly Lorentey <lorentey@elte.hu> | 2006-02-12 00:15:44 +0000 |
---|---|---|
committer | Karoly Lorentey <lorentey@elte.hu> | 2006-02-12 00:15:44 +0000 |
commit | 1913a2b35da45eeeb71ef851975be7d57c11de78 (patch) | |
tree | 6cd59883fb931999da5b62c03b321ade6f77e66e /lisp/emulation | |
parent | a5805c9d0240fab504f2a3e32db6449392005fb6 (diff) | |
parent | a528b71e55b2b244a5dd35318713ccb20398cbbf (diff) | |
download | emacs-1913a2b35da45eeeb71ef851975be7d57c11de78.tar.gz |
Merged from emacs@sv.gnu.org
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-49
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-50
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-51
Make constrain-to-field notice overlays
* emacs@sv.gnu.org/emacs--devo--0--patch-52
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-53
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-54
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-55
Merge from erc--emacs--0
* emacs@sv.gnu.org/emacs--devo--0--patch-56
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-57
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-58
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-59
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-60
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-61
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-62
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-63
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-64
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-65
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-66
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-67
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-68
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-69
rcirc: Add flexible response formatting; Add nick abbrevs
* emacs@sv.gnu.org/emacs--devo--0--patch-70
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-71
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-72
Update from CVS: man/dired.texi (Tumme): More tumme documentation.
* emacs@sv.gnu.org/gnus--rel--5.10--patch-18
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-19
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-20
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-21
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-22
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-23
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-24
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-25
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-26
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-27
Update from CVS: lisp/gnus.el: Remove bogus comment.
* emacs@sv.gnu.org/gnus--rel--5.10--patch-28
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-29
Add sendmail.el and smptmail.el from Emacs tree to contrib/
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-508
Diffstat (limited to 'lisp/emulation')
-rw-r--r-- | lisp/emulation/crisp.el | 2 | ||||
-rw-r--r-- | lisp/emulation/cua-base.el | 2 | ||||
-rw-r--r-- | lisp/emulation/cua-gmrk.el | 2 | ||||
-rw-r--r-- | lisp/emulation/cua-rect.el | 2 | ||||
-rw-r--r-- | lisp/emulation/edt-lk201.el | 2 | ||||
-rw-r--r-- | lisp/emulation/edt-mapper.el | 2 | ||||
-rw-r--r-- | lisp/emulation/edt-pc.el | 2 | ||||
-rw-r--r-- | lisp/emulation/edt-vt100.el | 2 | ||||
-rw-r--r-- | lisp/emulation/edt.el | 2 | ||||
-rw-r--r-- | lisp/emulation/keypad.el | 3 | ||||
-rw-r--r-- | lisp/emulation/pc-mode.el | 3 | ||||
-rw-r--r-- | lisp/emulation/pc-select.el | 2 | ||||
-rw-r--r-- | lisp/emulation/tpu-edt.el | 2 | ||||
-rw-r--r-- | lisp/emulation/tpu-extras.el | 2 | ||||
-rw-r--r-- | lisp/emulation/tpu-mapper.el | 2 | ||||
-rw-r--r-- | lisp/emulation/vip.el | 2 | ||||
-rw-r--r-- | lisp/emulation/viper-cmd.el | 2 | ||||
-rw-r--r-- | lisp/emulation/viper-ex.el | 2 | ||||
-rw-r--r-- | lisp/emulation/viper-init.el | 2 | ||||
-rw-r--r-- | lisp/emulation/viper-keym.el | 2 | ||||
-rw-r--r-- | lisp/emulation/viper-macs.el | 2 | ||||
-rw-r--r-- | lisp/emulation/viper-mous.el | 2 | ||||
-rw-r--r-- | lisp/emulation/viper-util.el | 2 | ||||
-rw-r--r-- | lisp/emulation/viper.el | 2 | ||||
-rw-r--r-- | lisp/emulation/ws-mode.el | 3 |
25 files changed, 28 insertions, 25 deletions
diff --git a/lisp/emulation/crisp.el b/lisp/emulation/crisp.el index 66ff29ecab1..361d1b98d3b 100644 --- a/lisp/emulation/crisp.el +++ b/lisp/emulation/crisp.el @@ -1,7 +1,7 @@ ;;; crisp.el --- CRiSP/Brief Emacs emulator ;; Copyright (C) 1997, 1998, 1999, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Gary D. Foster <Gary.Foster@Corp.Sun.COM> ;; Keywords: emulations brief crisp diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el index a65fe0b636c..594e9617501 100644 --- a/lisp/emulation/cua-base.el +++ b/lisp/emulation/cua-base.el @@ -1,7 +1,7 @@ ;;; cua-base.el --- emulate CUA key bindings ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Kim F. Storm <storm@cua.dk> ;; Keywords: keyboard emulation convenience cua diff --git a/lisp/emulation/cua-gmrk.el b/lisp/emulation/cua-gmrk.el index c7c5dd3db6d..c3e6727ab65 100644 --- a/lisp/emulation/cua-gmrk.el +++ b/lisp/emulation/cua-gmrk.el @@ -1,7 +1,7 @@ ;;; cua-gmrk.el --- CUA unified global mark support ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Kim F. Storm <storm@cua.dk> ;; Keywords: keyboard emulations convenience cua mark diff --git a/lisp/emulation/cua-rect.el b/lisp/emulation/cua-rect.el index aa82e148aff..120866e7925 100644 --- a/lisp/emulation/cua-rect.el +++ b/lisp/emulation/cua-rect.el @@ -1,7 +1,7 @@ ;;; cua-rect.el --- CUA unified rectangle support ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Kim F. Storm <storm@cua.dk> ;; Keywords: keyboard emulations convenience CUA diff --git a/lisp/emulation/edt-lk201.el b/lisp/emulation/edt-lk201.el index 4db235c60fa..17308c132e0 100644 --- a/lisp/emulation/edt-lk201.el +++ b/lisp/emulation/edt-lk201.el @@ -1,7 +1,7 @@ ;;; edt-lk201.el --- enhanced EDT keypad mode emulation for LK-201 keyboards ;; Copyright (C) 1986, 1992, 1993, 1995, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Kevin Gallagher <kevingal@onramp.net> ;; Maintainer: Kevin Gallagher <kevingal@onramp.net> diff --git a/lisp/emulation/edt-mapper.el b/lisp/emulation/edt-mapper.el index 9334c74392b..14838987d1d 100644 --- a/lisp/emulation/edt-mapper.el +++ b/lisp/emulation/edt-mapper.el @@ -1,7 +1,7 @@ ;;; edt-mapper.el --- create an EDT LK-201 map file for X-Windows Emacs ;; Copyright (C) 1994, 1995, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Kevin Gallagher <kevingal@onramp.net> ;; Maintainer: Kevin Gallagher <kevingal@onramp.net> diff --git a/lisp/emulation/edt-pc.el b/lisp/emulation/edt-pc.el index 419f6549ba6..6f393197281 100644 --- a/lisp/emulation/edt-pc.el +++ b/lisp/emulation/edt-pc.el @@ -1,7 +1,7 @@ ;;; edt-pc.el --- enhanced EDT keypad mode emulation for PC 101 keyboards ;; Copyright (C) 1986, 1994, 1995, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Kevin Gallagher <kevingal@onramp.net> ;; Maintainer: Kevin Gallagher <kevingal@onramp.net> diff --git a/lisp/emulation/edt-vt100.el b/lisp/emulation/edt-vt100.el index cd9a065acf8..b4599cdb2cd 100644 --- a/lisp/emulation/edt-vt100.el +++ b/lisp/emulation/edt-vt100.el @@ -1,7 +1,7 @@ ;;; edt-vt100.el --- enhanced EDT keypad mode emulation for VT series terminals ;; Copyright (C) 1986, 1992, 1993, 1995, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Kevin Gallagher <kevingal@onramp.net> ;; Maintainer: Kevin Gallagher <kevingal@onramp.net> diff --git a/lisp/emulation/edt.el b/lisp/emulation/edt.el index 8d5071be314..ae131dc50e9 100644 --- a/lisp/emulation/edt.el +++ b/lisp/emulation/edt.el @@ -1,7 +1,7 @@ ;;; edt.el --- enhanced EDT keypad mode emulation for GNU Emacs 19 ;; Copyright (C) 1986, 1992, 1993, 1994, 1995, 2000, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Kevin Gallagher <kevingal@onramp.net> ;; Maintainer: Kevin Gallagher <kevingal@onramp.net> diff --git a/lisp/emulation/keypad.el b/lisp/emulation/keypad.el index a42edaa78a1..5009ae86d65 100644 --- a/lisp/emulation/keypad.el +++ b/lisp/emulation/keypad.el @@ -1,6 +1,7 @@ ;;; keypad.el --- simplified keypad bindings -;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Kim F. Storm <storm@cua.dk> ;; Keywords: keyboard convenience diff --git a/lisp/emulation/pc-mode.el b/lisp/emulation/pc-mode.el index 1ec66664b6a..e2b0d36f0f4 100644 --- a/lisp/emulation/pc-mode.el +++ b/lisp/emulation/pc-mode.el @@ -1,6 +1,7 @@ ;;; pc-mode.el --- emulate certain key bindings used on PCs -;; Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1995, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: emulations diff --git a/lisp/emulation/pc-select.el b/lisp/emulation/pc-select.el index 9b9f4d51b41..bc048fd46d1 100644 --- a/lisp/emulation/pc-select.el +++ b/lisp/emulation/pc-select.el @@ -3,7 +3,7 @@ ;;; including key bindings. ;; Copyright (C) 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Michael Staats <michael@thp.Uni-Duisburg.DE> ;; Keywords: convenience emulation diff --git a/lisp/emulation/tpu-edt.el b/lisp/emulation/tpu-edt.el index eca6e5c74ce..878ac56ac8d 100644 --- a/lisp/emulation/tpu-edt.el +++ b/lisp/emulation/tpu-edt.el @@ -1,7 +1,7 @@ ;;; tpu-edt.el --- Emacs emulating TPU emulating EDT ;; Copyright (C) 1993, 1994, 1995, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Rob Riepel <riepel@networking.stanford.edu> ;; Maintainer: Rob Riepel <riepel@networking.stanford.edu> diff --git a/lisp/emulation/tpu-extras.el b/lisp/emulation/tpu-extras.el index c48aa974762..2aed6f464d5 100644 --- a/lisp/emulation/tpu-extras.el +++ b/lisp/emulation/tpu-extras.el @@ -1,7 +1,7 @@ ;;; tpu-extras.el --- scroll margins and free cursor mode for TPU-edt ;; Copyright (C) 1993, 1994, 1995, 2000, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Rob Riepel <riepel@networking.stanford.edu> ;; Maintainer: Rob Riepel <riepel@networking.stanford.edu> diff --git a/lisp/emulation/tpu-mapper.el b/lisp/emulation/tpu-mapper.el index e21a85db2af..eb71542e811 100644 --- a/lisp/emulation/tpu-mapper.el +++ b/lisp/emulation/tpu-mapper.el @@ -1,7 +1,7 @@ ;;; tpu-mapper.el --- create a TPU-edt X-windows keymap file ;; Copyright (C) 1993, 1994, 1995, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Rob Riepel <riepel@networking.stanford.edu> ;; Maintainer: Rob Riepel <riepel@networking.stanford.edu> diff --git a/lisp/emulation/vip.el b/lisp/emulation/vip.el index b07c634d9b4..227fe88b1a1 100644 --- a/lisp/emulation/vip.el +++ b/lisp/emulation/vip.el @@ -1,7 +1,7 @@ ;;; vip.el --- a VI Package for GNU Emacs ;; Copyright (C) 1986, 1987, 1988, 1992, 1993, 1998, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Masahiko Sato <ms@sail.stanford.edu> ;; Keywords: emulations diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el index 08ebbbcc9d0..db82952a6ef 100644 --- a/lisp/emulation/viper-cmd.el +++ b/lisp/emulation/viper-cmd.el @@ -1,7 +1,7 @@ ;;; viper-cmd.el --- Vi command support for Viper ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> diff --git a/lisp/emulation/viper-ex.el b/lisp/emulation/viper-ex.el index 5321228fe29..e2824246fad 100644 --- a/lisp/emulation/viper-ex.el +++ b/lisp/emulation/viper-ex.el @@ -1,7 +1,7 @@ ;;; viper-ex.el --- functions implementing the Ex commands for Viper ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el index 33713e8a869..59a78e46dee 100644 --- a/lisp/emulation/viper-init.el +++ b/lisp/emulation/viper-init.el @@ -1,7 +1,7 @@ ;;; viper-init.el --- some common definitions for Viper ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> diff --git a/lisp/emulation/viper-keym.el b/lisp/emulation/viper-keym.el index c8a5d53b504..6f9ade2f9e4 100644 --- a/lisp/emulation/viper-keym.el +++ b/lisp/emulation/viper-keym.el @@ -1,7 +1,7 @@ ;;; viper-keym.el --- Viper keymaps ;; Copyright (C) 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> diff --git a/lisp/emulation/viper-macs.el b/lisp/emulation/viper-macs.el index d401c148ad6..1cd1ce1f627 100644 --- a/lisp/emulation/viper-macs.el +++ b/lisp/emulation/viper-macs.el @@ -1,7 +1,7 @@ ;;; viper-macs.el --- functions implementing keyboard macros for Viper ;; Copyright (C) 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> diff --git a/lisp/emulation/viper-mous.el b/lisp/emulation/viper-mous.el index 084d70050a2..7670e3226db 100644 --- a/lisp/emulation/viper-mous.el +++ b/lisp/emulation/viper-mous.el @@ -1,7 +1,7 @@ ;;; viper-mous.el --- mouse support for Viper ;; Copyright (C) 1994, 1995, 1996, 1997, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el index def90669885..8f79c0dab4a 100644 --- a/lisp/emulation/viper-util.el +++ b/lisp/emulation/viper-util.el @@ -1,7 +1,7 @@ ;;; viper-util.el --- Utilities used by viper.el ;; Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003, -;; 2004, 2005 Free Software Foundation, Inc. +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el index ad366135ff1..223cff3dd99 100644 --- a/lisp/emulation/viper.el +++ b/lisp/emulation/viper.el @@ -4,7 +4,7 @@ ;; Viper Is also a Package for Emacs Rebels. ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -;; 2003, 2004, 2005 Free Software Foundation, Inc. +;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> ;; Keywords: emulations diff --git a/lisp/emulation/ws-mode.el b/lisp/emulation/ws-mode.el index e677e5a20ff..0230d6e118a 100644 --- a/lisp/emulation/ws-mode.el +++ b/lisp/emulation/ws-mode.el @@ -1,6 +1,7 @@ ;;; ws-mode.el --- WordStar emulation mode for GNU Emacs -;; Copyright (C) 1991, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 1991, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Juergen Nickelsen <nickel@cs.tu-berlin.de> ;; Version: 0.7 |