summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2014-10-20 18:12:13 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2014-10-20 18:12:13 -0400
commitef65424de8cae00209f6a0974245822602709df3 (patch)
tree49106ea2577ef7123bebbfe7698940a7e961102c
parentd9a72916e54b1bef8ad2322e6833f643473877b6 (diff)
downloademacs-ef65424de8cae00209f6a0974245822602709df3.tar.gz
Make most emulation packages obsolete. [Backport]
* emulation/crisp.el, emulation/tpu-edt.el, emulation/tpu-extras.el: * emulation/tpu-mapper.el, emulation/vi.el, emulation/vip.el: * emulation/ws-mode.el: Move to obsolete/. * doc/emacs/ack.texi (Acknowledgments): Remove some obsolete items. * doc/emacs/misc.texi (Emulation): Remove section. * doc/lispintro/emacs-lisp-intro.texi (Autoload): Update loaddefs.el details. * doc/misc/efaq.texi (Finding a package with particular functionality): Update example. * doc/misc/vip.texi: Mention this is obsolete.
-rw-r--r--doc/emacs/ChangeLog5
-rw-r--r--doc/emacs/ack.texi17
-rw-r--r--doc/emacs/emacs.texi1
-rw-r--r--doc/emacs/misc.texi14
-rw-r--r--doc/lispintro/ChangeLog4
-rw-r--r--doc/lispintro/emacs-lisp-intro.texi4
-rw-r--r--doc/misc/ChangeLog6
-rw-r--r--doc/misc/efaq.texi4
-rw-r--r--doc/misc/vip.texi8
-rw-r--r--etc/NEWS9
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/obsolete/crisp.el (renamed from lisp/emulation/crisp.el)1
-rw-r--r--lisp/obsolete/tpu-edt.el (renamed from lisp/emulation/tpu-edt.el)1
-rw-r--r--lisp/obsolete/tpu-extras.el (renamed from lisp/emulation/tpu-extras.el)1
-rw-r--r--lisp/obsolete/tpu-mapper.el (renamed from lisp/emulation/tpu-mapper.el)1
-rw-r--r--lisp/obsolete/vi.el (renamed from lisp/emulation/vi.el)3
-rw-r--r--lisp/obsolete/vip.el (renamed from lisp/emulation/vip.el)7
-rw-r--r--lisp/obsolete/ws-mode.el (renamed from lisp/emulation/ws-mode.el)1
18 files changed, 66 insertions, 27 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 1dfda079bf2..f383205b15e 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,5 +1,10 @@
2014-10-20 Glenn Morris <rgm@gnu.org>
+ * ack.texi (Acknowledgments): Remove some obsolete items.
+ * misc.texi (Emulation): Remove section.
+
+2014-10-20 Glenn Morris <rgm@gnu.org>
+
* Version 24.4 released.
2014-10-13 Glenn Morris <rgm@gnu.org>
diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi
index ccd58b7aece..c611dcd7047 100644
--- a/doc/emacs/ack.texi
+++ b/doc/emacs/ack.texi
@@ -349,8 +349,7 @@ mail messages; and @file{saveplace.el}, for preserving point's
location in files between editing sessions.
@item
-Gary Foster wrote @file{crisp.el}, the emulation for CRiSP and Brief
-editors; and @file{scroll-all.el}, a mode for scrolling several buffers
+Gary Foster wrote @file{scroll-all.el}, a mode for scrolling several buffers
together.
@item
@@ -601,7 +600,7 @@ buffers.
@item
Michael Kifer wrote @code{ediff}, an interactive interface to the
@command{diff}, @command{patch}, and @command{merge} programs; and
-Viper, another emulator of the VI editor.
+Viper, an emulator of the VI editor.
@item
Richard King wrote the first version of @file{userlock.el} and
@@ -884,9 +883,6 @@ Thien-Thi Nguyen and Dan Nicolaescu wrote @file{hideshow.el}, a minor
mode for selectively displaying blocks of text.
@item
-Jurgen Nickelsen wrote @file{ws-mode.el}, providing WordStar emulation.
-
-@item
Dan Nicolaescu added support for running Emacs as a daemon. He also
wrote @file{romanian.el}, support for editing Romanian text;
@file{iris-ansi.el}, support for running Emacs on SGI's @code{xwsh}
@@ -1037,10 +1033,8 @@ Alex Rezinsky wrote @file{which-func.el}, a mode that shows the name
of the current function in the mode line.
@item
-Rob Riepel wrote @file{tpu-edt.el} and its associated files, providing
-an emulation of the VMS TPU text editor emulating the VMS EDT editor,
-and @file{vt-control.el}, providing some control functions for the DEC
-VT line of terminals.
+Rob Riepel wrote @file{vt-control.el}, providing some control
+functions for the DEC VT line of terminals.
@item
Nick Roberts wrote @file{t-mouse.el}, for mouse support in text
@@ -1084,9 +1078,6 @@ James B. Salem and Brewster Kahle wrote @file{completion.el}, providing
dynamic word completion.
@item
-Masahiko Sato wrote @file{vip.el}, an emulation of the VI editor.
-
-@item
Holger Schauer wrote @file{fortune.el}, a package for using fortune in
message signatures.
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index 81a75807511..b473e0ce312 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -201,7 +201,6 @@ Advanced Features
* Editing Binary Files:: Editing binary files with Hexl mode.
* Saving Emacs Sessions:: Saving Emacs state from one session to the next.
* Recursive Edit:: Performing edits while "within another command".
-* Emulation:: Emulating some other editors with Emacs.
* Hyperlinking:: Following links in buffers.
* Amusements:: Various games and hacks.
* Packages:: Installing additional features.
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index 9d660f16e19..f77cb993d71 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -2268,17 +2268,17 @@ new major mode which provides a command to switch back. These
approaches give you more flexibility to go back to unfinished tasks in
the order you choose.
+@ignore
+@c Apart from edt and viper, this is all obsolete.
+@c (Can't believe we were saying ``most other editors'' into 2014!)
+@c There seems no point having a node just for those, which both have
+@c their own manuals.
@node Emulation
@section Emulation
@cindex emulating other editors
@cindex other editors
@cindex EDT
@cindex vi
-@cindex PC key bindings
-@cindex scrolling all windows
-@cindex PC selection
-@cindex Motif key bindings
-@cindex Macintosh key bindings
@cindex WordStar
GNU Emacs can be programmed to emulate (more or less) some other
@@ -2318,7 +2318,7 @@ buffers or major modes while in EDT emulation.
@item vi (Berkeley editor)
@findex viper-mode
-Viper is the newest emulator for vi. It implements several levels of
+Viper is an emulator for vi. It implements several levels of
emulation; level 1 is closest to vi itself, while level 5 departs
somewhat from strict emulation to take advantage of the capabilities of
Emacs. To invoke Viper, type @kbd{M-x viper-mode}; it will guide you
@@ -2359,6 +2359,8 @@ not use it.
@kbd{M-x wordstar-mode} provides a major mode with WordStar-like
key bindings.
@end table
+@end ignore
+
@node Hyperlinking
@section Hyperlinking and Navigation Features
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index d70345983f7..fb9c18626ab 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,5 +1,9 @@
2014-10-20 Glenn Morris <rgm@gnu.org>
+ * emacs-lisp-intro.texi (Autoload): Update loaddefs.el details.
+
+2014-10-20 Glenn Morris <rgm@gnu.org>
+
* Version 24.4 released.
2014-10-13 Glenn Morris <rgm@gnu.org>
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 8ff57619c04..0ea75ea531c 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -17548,8 +17548,8 @@ are not loaded right away; but you need to wait a moment when you
first use such a function, while its containing file is evaluated.
Rarely used functions are frequently autoloaded. The
-@file{loaddefs.el} library contains hundreds of autoloaded functions,
-from @code{bookmark-set} to @code{wordstar-mode}. Of course, you may
+@file{loaddefs.el} library contains thousands of autoloaded functions,
+from @code{5x5} to @code{zone}. Of course, you may
come to use a `rare' function frequently. When you do, you should
load that function's file with a @code{load} expression in your
@file{.emacs} file.
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 416d44d779c..dda1b35594b 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,5 +1,11 @@
2014-10-20 Glenn Morris <rgm@gnu.org>
+ * efaq.texi (Finding a package with particular functionality):
+ Update example.
+ * vip.texi: Mention this is obsolete.
+
+2014-10-20 Glenn Morris <rgm@gnu.org>
+
* Version 24.4 released.
2014-10-13 Glenn Morris <rgm@gnu.org>
diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi
index c320b8b6c08..0ba2838075c 100644
--- a/doc/misc/efaq.texi
+++ b/doc/misc/efaq.texi
@@ -3268,8 +3268,8 @@ archive sites that make GNU software available.
First of all, you should check to make sure that the package isn't
already available. For example, typing @kbd{M-x apropos @key{RET}
-wordstar @key{RET}} lists all functions and variables containing the
-string @samp{wordstar}.
+python @key{RET}} lists all functions and variables containing the
+string @samp{python}.
It is also possible that the package is on your system, but has not been
loaded. To see which packages are available for loading, look through
diff --git a/doc/misc/vip.texi b/doc/misc/vip.texi
index e7a53e768a7..9d6060f8de6 100644
--- a/doc/misc/vip.texi
+++ b/doc/misc/vip.texi
@@ -38,7 +38,7 @@ modify this GNU manual.''
@dircategory Emacs misc features
@direntry
-* VIP: (vip). An older VI-emulation for Emacs.
+* VIP: (vip). An obsolete VI-emulation for Emacs.
@end direntry
@ifnottex
@@ -53,6 +53,9 @@ are fairly accustomed to Vi but not so much with Emacs. Also we will
concentrate mainly on differences from Vi, especially features unique to
VIP.
+VIP is obsolete since Emacs 24.5---consider using Viper instead.
+@xref{Top, Viper,, viper, The Viper VI-emulation mode for Emacs}.
+
It is recommended that you read nodes on survey and on customization before
you start using VIP@. Other nodes may be visited as needed.
@@ -83,6 +86,9 @@ fairly accustomed to Vi but not so much with Emacs. Also we will
concentrate mainly on differences from Vi, especially features unique to
VIP.
+VIP is obsolete since Emacs 24.5---consider using Viper instead.
+@xref{Top, Viper,, viper, The Viper VI-emulation mode for Emacs}.
+
It is recommended that you read chapters on survey and on customization
before you start using VIP@. Other chapters may be used as future
references.
diff --git a/etc/NEWS b/etc/NEWS
index 12c67c84e7b..31baeb33516 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -16,11 +16,20 @@ with a prefix argument or by typing C-u C-h C-n.
* Changes in Emacs-24.5
+---
** The default value of `history-length' has increased to 100.
* Changes in Specialized Modes and Packages in Emacs 24.5
+---
+*** vi.el, vip.el (try M-x viper instead)
+
+---
+*** crisp.el, tpu-edt.el, ws-mode.el
+These emulations of old editors are believed to be no longer relevant
+ - contact emacs-devel@gnu.org if you disagree.
+
** cc-compat.el is marked as obsolete.
* Installation Changes in Emacs 24.4
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 376e4a3a87d..2758f48d4df 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
2014-10-20 Glenn Morris <rgm@gnu.org>
+ * emulation/crisp.el, emulation/tpu-edt.el, emulation/tpu-extras.el:
+ * emulation/tpu-mapper.el, emulation/vi.el, emulation/vip.el:
+ * emulation/ws-mode.el: Move to obsolete/. [Backport]
+
+2014-10-20 Glenn Morris <rgm@gnu.org>
+
* cus-start.el (history-length): Bump :version. [Backport]
2014-10-20 Stefan Monnier <monnier@iro.umontreal.ca>
diff --git a/lisp/emulation/crisp.el b/lisp/obsolete/crisp.el
index ad463412735..47cf898190b 100644
--- a/lisp/emulation/crisp.el
+++ b/lisp/obsolete/crisp.el
@@ -4,6 +4,7 @@
;; Author: Gary D. Foster <Gary.Foster@Corp.Sun.COM>
;; Keywords: emulations brief crisp
+;; Obsolete-since: 24.5
;; This file is part of GNU Emacs.
diff --git a/lisp/emulation/tpu-edt.el b/lisp/obsolete/tpu-edt.el
index d9ed1908c76..43189319a6a 100644
--- a/lisp/emulation/tpu-edt.el
+++ b/lisp/obsolete/tpu-edt.el
@@ -6,6 +6,7 @@
;; Maintainer: Rob Riepel <riepel@networking.stanford.edu>
;; Version: 4.5
;; Keywords: emulations
+;; Obsolete-since: 24.5
;; This file is part of GNU Emacs.
diff --git a/lisp/emulation/tpu-extras.el b/lisp/obsolete/tpu-extras.el
index 9ebaaf6ffce..32257e840ac 100644
--- a/lisp/emulation/tpu-extras.el
+++ b/lisp/obsolete/tpu-extras.el
@@ -6,6 +6,7 @@
;; Maintainer: Rob Riepel <riepel@networking.stanford.edu>
;; Keywords: emulations
;; Package: tpu-edt
+;; Obsolete-since: 24.5
;; This file is part of GNU Emacs.
diff --git a/lisp/emulation/tpu-mapper.el b/lisp/obsolete/tpu-mapper.el
index 2479389ac3c..d653685218b 100644
--- a/lisp/emulation/tpu-mapper.el
+++ b/lisp/obsolete/tpu-mapper.el
@@ -6,6 +6,7 @@
;; Maintainer: Rob Riepel <riepel@networking.stanford.edu>
;; Keywords: emulations
;; Package: tpu-edt
+;; Obsolete-since: 24.5
;; This file is part of GNU Emacs.
diff --git a/lisp/emulation/vi.el b/lisp/obsolete/vi.el
index 9aae40c0d00..bb57735b0a9 100644
--- a/lisp/emulation/vi.el
+++ b/lisp/obsolete/vi.el
@@ -8,9 +8,12 @@
;; Author: Neal Ziring <nz@rsch.wisc.edu>
;; Felix S. T. Wu <wu@crys.wisc.edu>
;; Keywords: emulations
+;; Obsolete-since: 24.5
;;; Commentary:
+;; This file is obsolete. Consider using viper instead.
+
;; Originally written by : seismo!wucs!nz@rsch.wisc.edu (Neal Ziring)
;; Extensively redesigned and rewritten by wu@crys.wisc.edu (Felix S.T. Wu)
;; Last revision: 01/07/87 Wed (for GNU Emacs 18.33)
diff --git a/lisp/emulation/vip.el b/lisp/obsolete/vip.el
index 09456e6320b..ea102cb0ac5 100644
--- a/lisp/emulation/vip.el
+++ b/lisp/obsolete/vip.el
@@ -1,10 +1,11 @@
;;; vip.el --- a VI Package for GNU Emacs
-;; Copyright (C) 1986-1988, 1992-1993, 1998, 2001-2014 Free Software
-;; Foundation, Inc.
+;; Copyright (C) 1986-1988, 1992-1993, 1998, 2001-2014
+;; Free Software Foundation, Inc.
;; Author: Masahiko Sato <ms@sail.stanford.edu>
;; Keywords: emulations
+;; Obsolete-since: 24.5
;; This file is part of GNU Emacs.
@@ -23,6 +24,8 @@
;;; Commentary:
+;; This file is obsolete. Consider using viper instead.
+
;; A full-featured vi(1) emulator.
;;
;; In Japan, the author's address is: masahiko@sato.riec.tohoku.junet
diff --git a/lisp/emulation/ws-mode.el b/lisp/obsolete/ws-mode.el
index fb140e6ebd7..d87cc73252b 100644
--- a/lisp/emulation/ws-mode.el
+++ b/lisp/obsolete/ws-mode.el
@@ -5,6 +5,7 @@
;; Author: Juergen Nickelsen <nickel@cs.tu-berlin.de>
;; Version: 0.7
;; Keywords: emulations
+;; Obsolete-since: 24.5
;; This file is part of GNU Emacs.