From 810b21457169ed30387d914cd9f54d48ad2320eb Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefankangas@gmail.com>
Date: Sat, 19 Oct 2019 01:05:54 +0200
Subject: [PATCH] Remove obsolete doc references to XEmacs

* doc/misc/edt.texi (Changes, Goals):
* doc/misc/emacs-mime.texi (Charset Translation):
* doc/misc/gnus-faq.texi (FAQ 4-15):
* doc/misc/pcl-cvs.texi (Bugs):
* doc/misc/srecode.texi (SRecode Minor Mode):
* lisp/cedet/srecode/insert.el (srecode-insert-ask-variable-method):
* lisp/follow.el:
* lisp/leim/quail/ipa.el (ipa-x-sampa, ipa-kirshenbaum):
* lisp/net/newsticker.el:
* lisp/obsolete/iswitchb.el:
* lisp/password-cache.el:
* lisp/progmodes/hideshow.el:
* lisp/ps-print.el:
* lisp/savehist.el (savehist-file):
* lisp/vc/ediff.el: Remove obsolete references to XEmacs in doc
strings and comments.
---
 doc/misc/edt.texi            |  7 -------
 doc/misc/emacs-mime.texi     |  3 +--
 doc/misc/gnus-faq.texi       |  2 +-
 doc/misc/pcl-cvs.texi        | 16 +++-------------
 doc/misc/srecode.texi        |  2 --
 lisp/cedet/srecode/insert.el |  4 +---
 lisp/follow.el               |  4 ++--
 lisp/leim/quail/ipa.el       | 15 +++------------
 lisp/net/newsticker.el       |  5 -----
 lisp/obsolete/iswitchb.el    |  3 ---
 lisp/password-cache.el       |  5 ++---
 lisp/progmodes/hideshow.el   | 13 +++----------
 lisp/ps-print.el             |  5 -----
 lisp/savehist.el             |  6 +-----
 lisp/vc/ediff.el             |  3 +--
 15 files changed, 18 insertions(+), 75 deletions(-)

diff --git a/doc/misc/edt.texi b/doc/misc/edt.texi
index c34efb6937..acc6a8a71e 100644
--- a/doc/misc/edt.texi
+++ b/doc/misc/edt.texi
@@ -169,10 +169,6 @@ Changes
 customization file, @file{edt-user.el}, to do this
 (@pxref{Customizing}).
 
-@item
-EDT Emulation now also works in XEmacs, including the highlighting of
-selected text.
-
 @item
 If you access a workstation using an X Server, observe that the
 initialization file generated by @file{edt-mapper.el} will now contain
@@ -237,9 +233,6 @@ Goals
 Provide an easy way to restore @strong{all} original Emacs key bindings,
 just as they existed before the EDT emulation was first invoked.
 
-@item
-Support Emacs and XEmacs 19 and higher.
-
 @item
 Supports highlighting of marked text within the EDT emulation on all
 platforms on which Emacs supports highlighting of marked text.
diff --git a/doc/misc/emacs-mime.texi b/doc/misc/emacs-mime.texi
index 53d0a62ac4..ef02ad5771 100644
--- a/doc/misc/emacs-mime.texi
+++ b/doc/misc/emacs-mime.texi
@@ -996,8 +996,7 @@ Charset Translation
 Things are slightly more complicated when running Emacs with @sc{mule}
 support.  In this case, a list of the @sc{mule} charsets used in the
 part is obtained, and the @sc{mule} charsets are translated to
-@acronym{MIME} charsets by consulting the table provided by Emacs itself
-or the variable @code{mm-mime-mule-charset-alist} for XEmacs.
+@acronym{MIME} charsets by consulting the table provided by Emacs itself.
 If this results in a single @acronym{MIME} charset, this is used to encode
 the part.  But if the resulting list of @acronym{MIME} charsets contains more
 than one element, two things can happen: If it is possible to encode the
diff --git a/doc/misc/gnus-faq.texi b/doc/misc/gnus-faq.texi
index b0dc9c3ba3..105c8ea96c 100644
--- a/doc/misc/gnus-faq.texi
+++ b/doc/misc/gnus-faq.texi
@@ -1144,7 +1144,7 @@ FAQ 4-15
 @example
 (setq nnmail-split-methods
   '(("duplicates" "^Gnus-Warning:.*duplicate")
-    ("XEmacs-NT" "^\\(To:\\|Cc:\\).*localpart@@xemacs.invalid.*")
+    ("Emacs-devel" "^\\(To:\\|Cc:\\).*localpart@@gnu.invalid.*")
     ("Gnus-Tut" "^\\(To:\\|Cc:\\).*localpart@@socha.invalid.*")
     ("tcsh" "^\\(To:\\|Cc:\\).*localpart@@mx.gw.invalid.*")
     ("BAfH" "^\\(To:\\|Cc:\\).*localpart@@.*uni-muenchen.invalid.*")
diff --git a/doc/misc/pcl-cvs.texi b/doc/misc/pcl-cvs.texi
index 3379783f6c..9b53309510 100644
--- a/doc/misc/pcl-cvs.texi
+++ b/doc/misc/pcl-cvs.texi
@@ -185,12 +185,6 @@ Contributors
 Linus Tolke contributed useful comments
 on both the functionality and the documentation.
 
-@item
-@c jwz@@jwz.com
-Jamie Zawinski contributed
-@file{pcl-cvs-lucid.el}, which was later renamed to
-@file{pcl-cvs-xemacs.el}.
-
 @item
 Leif Lonnblad contributed RCVS support (since superseded by the new
 remote CVS support).
@@ -215,9 +209,8 @@ Contributors
 
 @item
 @c greg.klanderman@@alum.mit.edu
-Greg Klanderman implemented
-toggling of marked files, setting of CVS command flags via prefix
-arguments, updated the XEmacs support, updated the manual, and fixed
+Greg Klanderman implemented toggling of marked files, setting of CVS
+command flags via prefix arguments, updated the manual, and fixed
 numerous bugs.
 
 @item
@@ -1384,10 +1377,7 @@ Bugs
 Use @kbd{M-x report-emacs-bug} to send us a report.
 You can follow the same process for feature requests.
 We prefer discussing one thing at a time.  If you find several unrelated
-bugs, please report them separately.  If you are running PCL-CVS under
-XEmacs, you should also send a copy of bug reports to
-the @url{http://lists.xemacs.org/mailman/listinfo/xemacs-beta,
-XEmacs mailing list}.
+bugs, please report them separately.
 
 If you have problems using PCL-CVS or other questions, send them to
 the @url{https://lists.gnu.org/mailman/listinfo/help-gnu-emacs,
diff --git a/doc/misc/srecode.texi b/doc/misc/srecode.texi
index 9df11b4b9f..33a6e8d81f 100644
--- a/doc/misc/srecode.texi
+++ b/doc/misc/srecode.texi
@@ -330,8 +330,6 @@ SRecode Minor Mode
 Use the dictionary macro name as the inserted value,
 and place a field there.  Matched fields change together.
 @end table
-
-@b{NOTE}: The field feature does not yet work with XEmacs.
 @end defun
 
 Field editing mode is supported in newer versions of Emacs.  You
diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el
index 966cd485e8..4e25e1f5ca 100644
--- a/lisp/cedet/srecode/insert.el
+++ b/lisp/cedet/srecode/insert.el
@@ -44,9 +44,7 @@ srecode-insert-ask-variable-method
 Possible values are:
   `ask'   - Prompt in the minibuffer as the value is inserted.
   `field' - Use the dictionary macro name as the inserted value,
-            and place a field there.  Matched fields change together.
-
-NOTE: The field feature does not yet work with XEmacs."
+            and place a field there.  Matched fields change together."
   :group 'srecode
   :type '(choice (const :tag "Ask" ask)
 		 (const :tag "Field" field)))
diff --git a/lisp/follow.el b/lisp/follow.el
index faac87986b..f80532ce3c 100644
--- a/lisp/follow.el
+++ b/lisp/follow.el
@@ -25,8 +25,8 @@
 
 ;;; Commentary:
 
-;; `Follow mode' is a minor mode for Emacs and XEmacs that
-;; combines windows into one tall virtual window.
+;; `Follow mode' is a minor mode that combines windows into one tall
+;; virtual window.
 ;;
 ;; The feeling of a "virtual window" has been accomplished by the use
 ;; of two major techniques:
diff --git a/lisp/leim/quail/ipa.el b/lisp/leim/quail/ipa.el
index 3c4c914def..0949d097d6 100644
--- a/lisp/leim/quail/ipa.el
+++ b/lisp/leim/quail/ipa.el
@@ -122,11 +122,7 @@
 corresponding actual IPA characters in your editor.
 
 See http://www.kirshenbaum.net/IPA/ascii-ipa.pdf for full details of the
-transliteration.
-
-A caveat with regard to that document; while XEmacs currently preserves
-Unicode diacritics on reading and emitting them, it displays them,
-incorrectly, as separate from the modified glyphs.")
+transliteration.")
 
 (quail-define-rules
  ("g" "ɡ")	;; Voiced velar plosive			U+0261
@@ -341,9 +337,7 @@ ipa-x-sampa-underscore-implosive
 with a keyboard that's limited to ASCII.
 
 See http://www.phon.ucl.ac.uk/home/sampa/ipasam-x.pdf for a full definition
-of the mapping.  A caveat with regard to that document; while XEmacs
-currently preserves Unicode diacritics on reading and emitting them, it
-displays them, incorrectly, as separate from the modified glyphs.")
+of the mapping.")
 
 (quail-define-rules
  ;; Table taken from http://en.wikipedia.org/wiki/X-SAMPA, checked with
@@ -446,10 +440,7 @@ ipa-x-sampa-underscore-implosive
  ("=\\" "ǂ")	;; Palatal click			U+01C2
  ("-\\" "̮")	;; Linking mark				U+032E
 
- ;; Diacritics. Note that XEmacs doesn't yet have composed characters, so we
- ;; can input them, but they won't display properly. If you send email using
- ;; them, and the recipient's client is capable, they will get through,
- ;; though.
+ ;; Diacritics.
 
  ("_\"" "̈")	;; Centralized		 		U+0308
  ("_+" "̟")	;; Advanced				U+031F
diff --git a/lisp/net/newsticker.el b/lisp/net/newsticker.el
index e1f4c8f89f..b47dd1f864 100644
--- a/lisp/net/newsticker.el
+++ b/lisp/net/newsticker.el
@@ -71,11 +71,6 @@ newsticker-version
 
 ;; Requirements
 ;; ------------
-;; Newsticker can be used with GNU Emacs version 21.1 or later as well as
-;; XEmacs.  It requires an XML-parser (`xml.el') which is part of GNU
-;; Emacs.  If you are using XEmacs you want to get the `net-utils' package
-;; which contains `xml.el' for XEmacs.
-
 ;; Newsticker requires a program which can retrieve files via http and
 ;; prints them to stdout.  By default Newsticker will use wget for this
 ;; task.
diff --git a/lisp/obsolete/iswitchb.el b/lisp/obsolete/iswitchb.el
index ad2067fdef..f899c139ea 100644
--- a/lisp/obsolete/iswitchb.el
+++ b/lisp/obsolete/iswitchb.el
@@ -176,9 +176,6 @@
 ;; iswitch for all buffer selections in Emacs, add:
 ;; (setq read-buffer-function #'iswitchb-read-buffer)
 ;; (This variable was introduced in Emacs 20.3.)
-;; XEmacs users can get the same behavior by doing:
-;; (defalias 'read-buffer #'iswitchb-read-buffer)
-;; since `read-buffer' is defined in lisp.
 
 ;; Using iswitchb for other completion tasks.
 
diff --git a/lisp/password-cache.el b/lisp/password-cache.el
index 6009fb491e..a85de6f35b 100644
--- a/lisp/password-cache.el
+++ b/lisp/password-cache.el
@@ -23,9 +23,8 @@
 
 ;;; Commentary:
 
-;; Greatly influenced by pgg.el written by Daiki Ueno, with timer
-;; fixes for XEmacs by Katsumi Yamaoka.  In fact, this is mostly just
-;; a rip-off.
+;; Greatly influenced by pgg.el written by Daiki Ueno.  In fact, this
+;; is mostly just a rip-off.
 ;;
 ;; (password-read "Password? " "test")
 ;; ;; Minibuffer prompt for password.
diff --git a/lisp/progmodes/hideshow.el b/lisp/progmodes/hideshow.el
index c4c75a6c04..53235ea573 100644
--- a/lisp/progmodes/hideshow.el
+++ b/lisp/progmodes/hideshow.el
@@ -152,18 +152,11 @@
 
 ;; * Bugs
 ;;
-;; (1) Hideshow does not work w/ emacs 18 because emacs 18 lacks the
-;;     function `forward-comment' (among other things).  If someone
-;;     writes this, please send me a copy.
-;;
-;; (2) Sometimes `hs-headline' can become out of sync.  To reset, type
+;; (1) Sometimes `hs-headline' can become out of sync.  To reset, type
 ;;     `M-x hs-minor-mode' twice (that is, deactivate then re-activate
 ;;     hideshow).
 ;;
-;; (3) Hideshow 5.x is developed and tested on GNU Emacs 20.7.
-;;     XEmacs compatibility may have bitrotted since 4.29.
-;;
-;; (4) Some buffers can't be `byte-compile-file'd properly.  This is because
+;; (2) Some buffers can't be `byte-compile-file'd properly.  This is because
 ;;     `byte-compile-file' inserts the file to be compiled in a temporary
 ;;     buffer and switches `normal-mode' on.  In the case where you have
 ;;     `hs-hide-initial-comment-block' in `hs-minor-mode-hook', the hiding of
@@ -178,7 +171,7 @@
 ;;       (let ((hs-minor-mode-hook nil))
 ;;         ad-do-it))
 ;;
-;; (5) Hideshow interacts badly with Ediff and `vc-diff'.  At the moment, the
+;; (3) Hideshow interacts badly with Ediff and `vc-diff'.  At the moment, the
 ;;     suggested workaround is to turn off hideshow entirely, for example:
 ;;
 ;;     (add-hook 'ediff-prepare-buffer-hook #'turn-off-hideshow)
diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index 5956c9f081..5ebfb375e7 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -1377,9 +1377,6 @@ ps-print-version
 ;; Thanks to Gord Wait <Gord_Wait@spectrumsignal.com> for
 ;; `ps-user-defined-prologue' example setting for HP PostScript printer.
 ;;
-;; Thanks to Paul Furnanz <pfurnanz@synopsys.com> for XEmacs compatibility
-;; suggestion for `ps-postscript-code-directory' variable.
-;;
 ;; Thanks to David X Callaway <dxc@xprt.net> for helping debugging PostScript
 ;; level 1 compatibility.
 ;;
@@ -1387,7 +1384,6 @@ ps-print-version
 ;;    - upside-down, line number step, line number start and zebra stripe
 ;;	follow suggestions.
 ;;    - `ps-time-stamp-yyyy-mm-dd' and `ps-time-stamp-iso8601' suggestion.
-;;    - and for XEmacs beta-tests.
 ;;
 ;; Thanks to Klaus Berndl <klaus.berndl@sdm.de> for user defined PostScript
 ;; prologue code suggestion, for odd/even printing suggestion and for
@@ -1419,7 +1415,6 @@ ps-print-version
 ;;
 ;; Thanks to some suggestions on:
 ;;  * Face color map: Marco Melgazzi <marco@techie.com>
-;;  * XEmacs compatibility: William J. Henney <will@astrosmo.unam.mx>
 ;;  * Check `ps-paper-type': Sudhakar Frederick <sfrederi@asc.corp.mot.com>
 ;;
 ;; Thanks to Jacques Duthen <duthen@cegelec-red.fr> (Jack) for version 3.4 I
diff --git a/lisp/savehist.el b/lisp/savehist.el
index 8359131082..f00c5b19df 100644
--- a/lisp/savehist.el
+++ b/lisp/savehist.el
@@ -85,11 +85,7 @@ savehist-file
   "File name where minibuffer history is saved to and loaded from.
 The minibuffer history is a series of Lisp expressions loaded
 automatically when Savehist mode is turned on.  See `savehist-mode'
-for more details.
-
-If you want your minibuffer history shared between Emacs and XEmacs,
-customize this value and make sure that `savehist-coding-system' is
-set to a coding system that exists in both emacsen."
+for more details."
   :type 'file)
 
 (defcustom savehist-file-modes #o600
diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el
index fae694d522..d207d75a60 100644
--- a/lisp/vc/ediff.el
+++ b/lisp/vc/ediff.el
@@ -79,8 +79,7 @@ ediff-version
 ;;  1. The undo command doesn't restore deleted regions well.  That is, if
 ;;  you delete all characters in a difference region and then invoke
 ;;  `undo', the reinstated text will most likely be inserted outside of
-;;  what Ediff thinks is the current difference region. (This problem
-;;  doesn't seem to exist with XEmacs.)
+;;  what Ediff thinks is the current difference region.
 ;;
 ;;  If at any point you feel that difference regions are no longer correct,
 ;;  you can hit '!' to recompute the differences.
-- 
2.23.0

