Remove more references to Windows 95

* doc/lispref/frames.texi (Window System Selections):
* doc/misc/ediff.texi (Patch and Diff Programs):
* doc/misc/efaq-w32.texi (Third-party multibyte, Swap Caps NT)
(Subprocesses and floppy drive):
* etc/PROBLEMS:
* lisp/printing.el (pr-path-alist, pr-command):
* lisp/ps-print.el: Remove more references to Windows 95, which is not
supported by Emacs.

(cherry picked from commit 41cbfead7e2bce2f563e37a9a737a00a7b86e7f1)

diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index 2686ae93a332e8961dca77a50e57585c3af2c9f1..342f88eb8c0179e0634f98e1a449517d3c29e817 100644 (file)
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -4096,7 +4096,7 @@ the very rare cases when the information provided by the clipboard
 data is unusable for some reason.
 
 The default value of this variable is the system code page under
-MS-Windows 95, 98 or Me, @code{utf-16le-dos} on Windows
+MS-Windows 98 or Me, @code{utf-16le-dos} on Windows
 NT/W2K/XP/Vista/7/8/10/11, @code{iso-latin-1-dos} on MS-DOS, and
 @code{nil} elsewhere.
 @end defopt

diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi
index e8ecb218674258eaa6370f23a1717a9d7b4786c8..749025c870bb4dce90cf834ed7affb989b108522 100644 (file)
--- a/doc/misc/ediff.texi
+++ b/doc/misc/ediff.texi
@@ -1877,7 +1877,7 @@ Customize interface instead of using @code{setq} directly.)
 This variable specifies the coding system to use when reading the output
 that the programs @code{diff3} and @code{diff} send to Emacs. The default
 is @code{raw-text}, and this should work fine in Unix and in most
-cases under Windows NT/95/98/2000. There are @code{diff} programs
+cases under Windows NT/98/2000. There are @code{diff} programs
 for which the default option doesn't work under Windows. In such cases,
 @code{raw-text-dos} might work. If not, you will have to experiment with
 other coding systems or use GNU diff.

diff --git a/doc/misc/efaq-w32.texi b/doc/misc/efaq-w32.texi
index 9756345042ef78d447f1b3df04f0d1b650f02e6d..c5ba6c8609f8d895fa8884f2570551257ad3ecd2 100644 (file)
--- a/doc/misc/efaq-w32.texi
+++ b/doc/misc/efaq-w32.texi
@@ -630,7 +630,7 @@ REGEDIT4
 @end itemize
 
 @node Swap Caps 98
-@subsubsection Windows 95/98/ME
+@subsubsection Windows 98/ME
 
 Microsoft has a tool called keyremap that is part of their Kernel Toys add-ons
 for Windows 95.  The tool has also been confirmed to work on Windows 98.
@@ -1078,7 +1078,7 @@ mirrors}.
 @vindex w32-enable-unicode-output
 
 You probably only need to do this on the non-Unicode versions of Windows
-(95, 98 and ME), and even then, various Windows and Internet Explorer
+(98 and ME), and even then, various Windows and Internet Explorer
 updates have made third party software unnecessary in most cases.
 If you are having trouble displaying text, try defining a fontset
 with the font for the languages that the third party software handles
@@ -1321,9 +1321,9 @@ floppy in the drive, check to see if your virus software is causing
 the problem.
 
 @node Killing subprocesses
-@section Killing subprocesses on Windows 95/98/Me
-@cindex subprocess, killing on Windows 95/98/ME
-@cindex killing subprocesses, Windows 95/98/ME
+@section Killing subprocesses on Windows 98/Me
+@cindex subprocess, killing on Windows 98/ME
+@cindex killing subprocesses, Windows 98/ME
 @cindex shutdown, complaints about cmdproxy.exe running
 
 Emacs cannot guarantee that a subprocess gets killed on Windows 95 and

diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 9cbcee51fe8ea060cc9097fc8948103762ac0c86..59bd2cd497c284da540b0cc52cf737c89cc277c9 100644 (file)
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -4343,14 +4343,14 @@ for menus.  Help text is only available in later versions of Windows.
 This character seems to be trapped by the kernel in Windows 95.
 You can enter M-f6 by typing ESC f6.
 
-*** MS-Windows 95/98/ME: subprocesses do not terminate properly.
+*** MS-Windows 98/ME: subprocesses do not terminate properly.
 
 This is a limitation of the Operating System, and can cause problems
 when shutting down Windows.  Ensure that all subprocesses are exited
 cleanly before exiting Emacs.  For more details, see the Emacs on MS
 Windows FAQ (info manual "efaq-w32").
 
-*** MS-Windows 95/98/ME: crashes when Emacs invokes non-existent programs.
+*** MS-Windows 98/ME: crashes when Emacs invokes non-existent programs.
 
 When a program you are trying to run is not found on the PATH,
 Windows might respond by crashing or locking up your system.  In

diff --git a/lisp/printing.el b/lisp/printing.el
index d9bc97d48afdcc018c30d256c498a4d7101b5927..404d1be619f28f0f0aab7d52b7b8c603d3b624cb 100644 (file)
--- a/lisp/printing.el
+++ b/lisp/printing.el
@@ -1320,10 +1320,10 @@ ENTRY           It's a symbol, used to identify this entry.
                        Unix system.
 
                `cygwin'        this entry is used when Emacs is running on Windows
-                       95/98/NT/2000 with Cygwin.
+                        98/NT/2000 with Cygwin.
 
                `windows'       this entry is used when Emacs is running on Windows
-                       95/98/NT/2000.
+                        98/NT/2000.
 
 DIRECTORY      It should be a string or a symbol.  If it's a symbol, it should
                exist an equal entry in `pr-path-alist'.  If it's a string,
@@ -5462,7 +5462,7 @@ otherwise, gives an error.
 When using `pr-path-alist' to find COMMAND, the entries `cygwin', `windows' and
 `unix' are used (see `pr-path-alist' for documentation).
 
-If Emacs is running on Windows 95/98/NT/2000, tries to find COMMAND,
+If Emacs is running on Windows 98/NT/2000, tries to find COMMAND,
 COMMAND.exe, COMMAND.bat and COMMAND.com in this order."
   (if (string= command "")
       command

diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index b73d28280efdf4ea2e3c44b1a308274cfa3168a0..97b19e362bbd49b0451cfbaf200811d531c9bf97 100644 (file)
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -191,7 +191,7 @@
 ;; inserted at end of PostScript generated.  Non-nil means do so.  The default
 ;; is nil (don't insert).
 ;;
-;; If you're using Emacs for Windows 95/98/NT or MS-DOS, don't forget to
+;; If you're using Emacs for Windows 98/NT or MS-DOS, don't forget to
 ;; customize the following variables: `ps-printer-name',
 ;; `ps-printer-name-option', `ps-lpr-command', `ps-lpr-switches' and
 ;; `ps-spool-config'.  See these variables documentation in the code or by