diff options
| author | Stefan Kangas | 2019-10-28 15:55:10 +0100 |
|---|---|---|
| committer | Stefan Kangas | 2019-10-28 15:55:10 +0100 |
| commit | c515d4eeb2fe966923f0fef0c231945b6ad1df8f (patch) | |
| tree | 3cefd88f8329df54bbd98c165600011008777c8e | |
| parent | 97cfb4f1e751a947105802d5c4b4f56c696ff75d (diff) | |
| download | emacs-c515d4eeb2fe966923f0fef0c231945b6ad1df8f.tar.gz emacs-c515d4eeb2fe966923f0fef0c231945b6ad1df8f.zip | |
Remove obsolete doc references to XEmacs (Bug#37899)
* 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/progmodes/hideshow.el:
* lisp/savehist.el (savehist-file):
* lisp/vc/ediff.el: Remove obsolete references to XEmacs in doc
strings and comments.
| -rw-r--r-- | doc/misc/edt.texi | 7 | ||||
| -rw-r--r-- | doc/misc/emacs-mime.texi | 3 | ||||
| -rw-r--r-- | doc/misc/gnus-faq.texi | 2 | ||||
| -rw-r--r-- | doc/misc/pcl-cvs.texi | 5 | ||||
| -rw-r--r-- | doc/misc/srecode.texi | 2 | ||||
| -rw-r--r-- | lisp/cedet/srecode/insert.el | 4 | ||||
| -rw-r--r-- | lisp/follow.el | 4 | ||||
| -rw-r--r-- | lisp/leim/quail/ipa.el | 15 | ||||
| -rw-r--r-- | lisp/net/newsticker.el | 5 | ||||
| -rw-r--r-- | lisp/obsolete/iswitchb.el | 3 | ||||
| -rw-r--r-- | lisp/progmodes/hideshow.el | 13 | ||||
| -rw-r--r-- | lisp/savehist.el | 6 | ||||
| -rw-r--r-- | lisp/vc/ediff.el | 3 |
13 files changed, 14 insertions, 58 deletions
diff --git a/doc/misc/edt.texi b/doc/misc/edt.texi index c34efb6937a..acc6a8a71eb 100644 --- a/doc/misc/edt.texi +++ b/doc/misc/edt.texi | |||
| @@ -170,10 +170,6 @@ customization file, @file{edt-user.el}, to do this | |||
| 170 | (@pxref{Customizing}). | 170 | (@pxref{Customizing}). |
| 171 | 171 | ||
| 172 | @item | 172 | @item |
| 173 | EDT Emulation now also works in XEmacs, including the highlighting of | ||
| 174 | selected text. | ||
| 175 | |||
| 176 | @item | ||
| 177 | If you access a workstation using an X Server, observe that the | 173 | If you access a workstation using an X Server, observe that the |
| 178 | initialization file generated by @file{edt-mapper.el} will now contain | 174 | initialization file generated by @file{edt-mapper.el} will now contain |
| 179 | the name of the X Server vendor. This is a convenience for those who | 175 | the name of the X Server vendor. This is a convenience for those who |
| @@ -238,9 +234,6 @@ Provide an easy way to restore @strong{all} original Emacs key bindings, | |||
| 238 | just as they existed before the EDT emulation was first invoked. | 234 | just as they existed before the EDT emulation was first invoked. |
| 239 | 235 | ||
| 240 | @item | 236 | @item |
| 241 | Support Emacs and XEmacs 19 and higher. | ||
| 242 | |||
| 243 | @item | ||
| 244 | Supports highlighting of marked text within the EDT emulation on all | 237 | Supports highlighting of marked text within the EDT emulation on all |
| 245 | platforms on which Emacs supports highlighting of marked text. | 238 | platforms on which Emacs supports highlighting of marked text. |
| 246 | 239 | ||
diff --git a/doc/misc/emacs-mime.texi b/doc/misc/emacs-mime.texi index 53d0a62ac4e..ef02ad57710 100644 --- a/doc/misc/emacs-mime.texi +++ b/doc/misc/emacs-mime.texi | |||
| @@ -996,8 +996,7 @@ used, of course. | |||
| 996 | Things are slightly more complicated when running Emacs with @sc{mule} | 996 | Things are slightly more complicated when running Emacs with @sc{mule} |
| 997 | support. In this case, a list of the @sc{mule} charsets used in the | 997 | support. In this case, a list of the @sc{mule} charsets used in the |
| 998 | part is obtained, and the @sc{mule} charsets are translated to | 998 | part is obtained, and the @sc{mule} charsets are translated to |
| 999 | @acronym{MIME} charsets by consulting the table provided by Emacs itself | 999 | @acronym{MIME} charsets by consulting the table provided by Emacs itself. |
| 1000 | or the variable @code{mm-mime-mule-charset-alist} for XEmacs. | ||
| 1001 | If this results in a single @acronym{MIME} charset, this is used to encode | 1000 | If this results in a single @acronym{MIME} charset, this is used to encode |
| 1002 | the part. But if the resulting list of @acronym{MIME} charsets contains more | 1001 | the part. But if the resulting list of @acronym{MIME} charsets contains more |
| 1003 | than one element, two things can happen: If it is possible to encode the | 1002 | 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 b0dc9c3ba3b..105c8ea96cf 100644 --- a/doc/misc/gnus-faq.texi +++ b/doc/misc/gnus-faq.texi | |||
| @@ -1144,7 +1144,7 @@ from using them): | |||
| 1144 | @example | 1144 | @example |
| 1145 | (setq nnmail-split-methods | 1145 | (setq nnmail-split-methods |
| 1146 | '(("duplicates" "^Gnus-Warning:.*duplicate") | 1146 | '(("duplicates" "^Gnus-Warning:.*duplicate") |
| 1147 | ("XEmacs-NT" "^\\(To:\\|Cc:\\).*localpart@@xemacs.invalid.*") | 1147 | ("Emacs-devel" "^\\(To:\\|Cc:\\).*localpart@@gnu.invalid.*") |
| 1148 | ("Gnus-Tut" "^\\(To:\\|Cc:\\).*localpart@@socha.invalid.*") | 1148 | ("Gnus-Tut" "^\\(To:\\|Cc:\\).*localpart@@socha.invalid.*") |
| 1149 | ("tcsh" "^\\(To:\\|Cc:\\).*localpart@@mx.gw.invalid.*") | 1149 | ("tcsh" "^\\(To:\\|Cc:\\).*localpart@@mx.gw.invalid.*") |
| 1150 | ("BAfH" "^\\(To:\\|Cc:\\).*localpart@@.*uni-muenchen.invalid.*") | 1150 | ("BAfH" "^\\(To:\\|Cc:\\).*localpart@@.*uni-muenchen.invalid.*") |
diff --git a/doc/misc/pcl-cvs.texi b/doc/misc/pcl-cvs.texi index 3379783f6c6..ad6d383ad50 100644 --- a/doc/misc/pcl-cvs.texi +++ b/doc/misc/pcl-cvs.texi | |||
| @@ -1384,10 +1384,7 @@ If you find a bug or misfeature, don't hesitate to tell us! | |||
| 1384 | Use @kbd{M-x report-emacs-bug} to send us a report. | 1384 | Use @kbd{M-x report-emacs-bug} to send us a report. |
| 1385 | You can follow the same process for feature requests. | 1385 | You can follow the same process for feature requests. |
| 1386 | We prefer discussing one thing at a time. If you find several unrelated | 1386 | We prefer discussing one thing at a time. If you find several unrelated |
| 1387 | bugs, please report them separately. If you are running PCL-CVS under | 1387 | bugs, please report them separately. |
| 1388 | XEmacs, you should also send a copy of bug reports to | ||
| 1389 | the @url{http://lists.xemacs.org/mailman/listinfo/xemacs-beta, | ||
| 1390 | XEmacs mailing list}. | ||
| 1391 | 1388 | ||
| 1392 | If you have problems using PCL-CVS or other questions, send them to | 1389 | If you have problems using PCL-CVS or other questions, send them to |
| 1393 | the @url{https://lists.gnu.org/mailman/listinfo/help-gnu-emacs, | 1390 | the @url{https://lists.gnu.org/mailman/listinfo/help-gnu-emacs, |
diff --git a/doc/misc/srecode.texi b/doc/misc/srecode.texi index 9df11b4b9f9..33a6e8d81fb 100644 --- a/doc/misc/srecode.texi +++ b/doc/misc/srecode.texi | |||
| @@ -330,8 +330,6 @@ Prompt in the minibuffer as the value is inserted. | |||
| 330 | Use the dictionary macro name as the inserted value, | 330 | Use the dictionary macro name as the inserted value, |
| 331 | and place a field there. Matched fields change together. | 331 | and place a field there. Matched fields change together. |
| 332 | @end table | 332 | @end table |
| 333 | |||
| 334 | @b{NOTE}: The field feature does not yet work with XEmacs. | ||
| 335 | @end defun | 333 | @end defun |
| 336 | 334 | ||
| 337 | Field editing mode is supported in newer versions of Emacs. You | 335 | 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 966cd485e82..4e25e1f5ca0 100644 --- a/lisp/cedet/srecode/insert.el +++ b/lisp/cedet/srecode/insert.el | |||
| @@ -44,9 +44,7 @@ Dictionary value references that ask begin with the ? character. | |||
| 44 | Possible values are: | 44 | Possible values are: |
| 45 | `ask' - Prompt in the minibuffer as the value is inserted. | 45 | `ask' - Prompt in the minibuffer as the value is inserted. |
| 46 | `field' - Use the dictionary macro name as the inserted value, | 46 | `field' - Use the dictionary macro name as the inserted value, |
| 47 | and place a field there. Matched fields change together. | 47 | and place a field there. Matched fields change together." |
| 48 | |||
| 49 | NOTE: The field feature does not yet work with XEmacs." | ||
| 50 | :group 'srecode | 48 | :group 'srecode |
| 51 | :type '(choice (const :tag "Ask" ask) | 49 | :type '(choice (const :tag "Ask" ask) |
| 52 | (const :tag "Field" field))) | 50 | (const :tag "Field" field))) |
diff --git a/lisp/follow.el b/lisp/follow.el index faac87986bb..f80532ce3c4 100644 --- a/lisp/follow.el +++ b/lisp/follow.el | |||
| @@ -25,8 +25,8 @@ | |||
| 25 | 25 | ||
| 26 | ;;; Commentary: | 26 | ;;; Commentary: |
| 27 | 27 | ||
| 28 | ;; `Follow mode' is a minor mode for Emacs and XEmacs that | 28 | ;; `Follow mode' is a minor mode that combines windows into one tall |
| 29 | ;; combines windows into one tall virtual window. | 29 | ;; virtual window. |
| 30 | ;; | 30 | ;; |
| 31 | ;; The feeling of a "virtual window" has been accomplished by the use | 31 | ;; The feeling of a "virtual window" has been accomplished by the use |
| 32 | ;; of two major techniques: | 32 | ;; of two major techniques: |
diff --git a/lisp/leim/quail/ipa.el b/lisp/leim/quail/ipa.el index 3c4c914defa..0949d097d62 100644 --- a/lisp/leim/quail/ipa.el +++ b/lisp/leim/quail/ipa.el | |||
| @@ -122,11 +122,7 @@ allows you to type Kirshenbaum on your ASCII-capable keyboard, producing the | |||
| 122 | corresponding actual IPA characters in your editor. | 122 | corresponding actual IPA characters in your editor. |
| 123 | 123 | ||
| 124 | See http://www.kirshenbaum.net/IPA/ascii-ipa.pdf for full details of the | 124 | See http://www.kirshenbaum.net/IPA/ascii-ipa.pdf for full details of the |
| 125 | transliteration. | 125 | transliteration.") |
| 126 | |||
| 127 | A caveat with regard to that document; while XEmacs currently preserves | ||
| 128 | Unicode diacritics on reading and emitting them, it displays them, | ||
| 129 | incorrectly, as separate from the modified glyphs.") | ||
| 130 | 126 | ||
| 131 | (quail-define-rules | 127 | (quail-define-rules |
| 132 | ("g" "ɡ") ;; Voiced velar plosive U+0261 | 128 | ("g" "ɡ") ;; Voiced velar plosive U+0261 |
| @@ -341,9 +337,7 @@ uses this transliteration to allow you to produce the IPA in your editor | |||
| 341 | with a keyboard that's limited to ASCII. | 337 | with a keyboard that's limited to ASCII. |
| 342 | 338 | ||
| 343 | See http://www.phon.ucl.ac.uk/home/sampa/ipasam-x.pdf for a full definition | 339 | See http://www.phon.ucl.ac.uk/home/sampa/ipasam-x.pdf for a full definition |
| 344 | of the mapping. A caveat with regard to that document; while XEmacs | 340 | of the mapping.") |
| 345 | currently preserves Unicode diacritics on reading and emitting them, it | ||
| 346 | displays them, incorrectly, as separate from the modified glyphs.") | ||
| 347 | 341 | ||
| 348 | (quail-define-rules | 342 | (quail-define-rules |
| 349 | ;; Table taken from http://en.wikipedia.org/wiki/X-SAMPA, checked with | 343 | ;; Table taken from http://en.wikipedia.org/wiki/X-SAMPA, checked with |
| @@ -446,10 +440,7 @@ displays them, incorrectly, as separate from the modified glyphs.") | |||
| 446 | ("=\\" "ǂ") ;; Palatal click U+01C2 | 440 | ("=\\" "ǂ") ;; Palatal click U+01C2 |
| 447 | ("-\\" "̮") ;; Linking mark U+032E | 441 | ("-\\" "̮") ;; Linking mark U+032E |
| 448 | 442 | ||
| 449 | ;; Diacritics. Note that XEmacs doesn't yet have composed characters, so we | 443 | ;; Diacritics. |
| 450 | ;; can input them, but they won't display properly. If you send email using | ||
| 451 | ;; them, and the recipient's client is capable, they will get through, | ||
| 452 | ;; though. | ||
| 453 | 444 | ||
| 454 | ("_\"" "̈") ;; Centralized U+0308 | 445 | ("_\"" "̈") ;; Centralized U+0308 |
| 455 | ("_+" "̟") ;; Advanced U+031F | 446 | ("_+" "̟") ;; Advanced U+031F |
diff --git a/lisp/net/newsticker.el b/lisp/net/newsticker.el index e1f4c8f89f0..b47dd1f8640 100644 --- a/lisp/net/newsticker.el +++ b/lisp/net/newsticker.el | |||
| @@ -71,11 +71,6 @@ | |||
| 71 | 71 | ||
| 72 | ;; Requirements | 72 | ;; Requirements |
| 73 | ;; ------------ | 73 | ;; ------------ |
| 74 | ;; Newsticker can be used with GNU Emacs version 21.1 or later as well as | ||
| 75 | ;; XEmacs. It requires an XML-parser (`xml.el') which is part of GNU | ||
| 76 | ;; Emacs. If you are using XEmacs you want to get the `net-utils' package | ||
| 77 | ;; which contains `xml.el' for XEmacs. | ||
| 78 | |||
| 79 | ;; Newsticker requires a program which can retrieve files via http and | 74 | ;; Newsticker requires a program which can retrieve files via http and |
| 80 | ;; prints them to stdout. By default Newsticker will use wget for this | 75 | ;; prints them to stdout. By default Newsticker will use wget for this |
| 81 | ;; task. | 76 | ;; task. |
diff --git a/lisp/obsolete/iswitchb.el b/lisp/obsolete/iswitchb.el index ad2067fdef7..f899c139ea6 100644 --- a/lisp/obsolete/iswitchb.el +++ b/lisp/obsolete/iswitchb.el | |||
| @@ -176,9 +176,6 @@ | |||
| 176 | ;; iswitch for all buffer selections in Emacs, add: | 176 | ;; iswitch for all buffer selections in Emacs, add: |
| 177 | ;; (setq read-buffer-function #'iswitchb-read-buffer) | 177 | ;; (setq read-buffer-function #'iswitchb-read-buffer) |
| 178 | ;; (This variable was introduced in Emacs 20.3.) | 178 | ;; (This variable was introduced in Emacs 20.3.) |
| 179 | ;; XEmacs users can get the same behavior by doing: | ||
| 180 | ;; (defalias 'read-buffer #'iswitchb-read-buffer) | ||
| 181 | ;; since `read-buffer' is defined in lisp. | ||
| 182 | 179 | ||
| 183 | ;; Using iswitchb for other completion tasks. | 180 | ;; Using iswitchb for other completion tasks. |
| 184 | 181 | ||
diff --git a/lisp/progmodes/hideshow.el b/lisp/progmodes/hideshow.el index c4c75a6c040..53235ea573b 100644 --- a/lisp/progmodes/hideshow.el +++ b/lisp/progmodes/hideshow.el | |||
| @@ -152,18 +152,11 @@ | |||
| 152 | 152 | ||
| 153 | ;; * Bugs | 153 | ;; * Bugs |
| 154 | ;; | 154 | ;; |
| 155 | ;; (1) Hideshow does not work w/ emacs 18 because emacs 18 lacks the | 155 | ;; (1) Sometimes `hs-headline' can become out of sync. To reset, type |
| 156 | ;; function `forward-comment' (among other things). If someone | ||
| 157 | ;; writes this, please send me a copy. | ||
| 158 | ;; | ||
| 159 | ;; (2) Sometimes `hs-headline' can become out of sync. To reset, type | ||
| 160 | ;; `M-x hs-minor-mode' twice (that is, deactivate then re-activate | 156 | ;; `M-x hs-minor-mode' twice (that is, deactivate then re-activate |
| 161 | ;; hideshow). | 157 | ;; hideshow). |
| 162 | ;; | 158 | ;; |
| 163 | ;; (3) Hideshow 5.x is developed and tested on GNU Emacs 20.7. | 159 | ;; (2) Some buffers can't be `byte-compile-file'd properly. This is because |
| 164 | ;; XEmacs compatibility may have bitrotted since 4.29. | ||
| 165 | ;; | ||
| 166 | ;; (4) Some buffers can't be `byte-compile-file'd properly. This is because | ||
| 167 | ;; `byte-compile-file' inserts the file to be compiled in a temporary | 160 | ;; `byte-compile-file' inserts the file to be compiled in a temporary |
| 168 | ;; buffer and switches `normal-mode' on. In the case where you have | 161 | ;; buffer and switches `normal-mode' on. In the case where you have |
| 169 | ;; `hs-hide-initial-comment-block' in `hs-minor-mode-hook', the hiding of | 162 | ;; `hs-hide-initial-comment-block' in `hs-minor-mode-hook', the hiding of |
| @@ -178,7 +171,7 @@ | |||
| 178 | ;; (let ((hs-minor-mode-hook nil)) | 171 | ;; (let ((hs-minor-mode-hook nil)) |
| 179 | ;; ad-do-it)) | 172 | ;; ad-do-it)) |
| 180 | ;; | 173 | ;; |
| 181 | ;; (5) Hideshow interacts badly with Ediff and `vc-diff'. At the moment, the | 174 | ;; (3) Hideshow interacts badly with Ediff and `vc-diff'. At the moment, the |
| 182 | ;; suggested workaround is to turn off hideshow entirely, for example: | 175 | ;; suggested workaround is to turn off hideshow entirely, for example: |
| 183 | ;; | 176 | ;; |
| 184 | ;; (add-hook 'ediff-prepare-buffer-hook #'turn-off-hideshow) | 177 | ;; (add-hook 'ediff-prepare-buffer-hook #'turn-off-hideshow) |
diff --git a/lisp/savehist.el b/lisp/savehist.el index 83591310829..f00c5b19df8 100644 --- a/lisp/savehist.el +++ b/lisp/savehist.el | |||
| @@ -85,11 +85,7 @@ minibuffer histories, such as `compile-command' or `kill-ring'." | |||
| 85 | "File name where minibuffer history is saved to and loaded from. | 85 | "File name where minibuffer history is saved to and loaded from. |
| 86 | The minibuffer history is a series of Lisp expressions loaded | 86 | The minibuffer history is a series of Lisp expressions loaded |
| 87 | automatically when Savehist mode is turned on. See `savehist-mode' | 87 | automatically when Savehist mode is turned on. See `savehist-mode' |
| 88 | for more details. | 88 | for more details." |
| 89 | |||
| 90 | If you want your minibuffer history shared between Emacs and XEmacs, | ||
| 91 | customize this value and make sure that `savehist-coding-system' is | ||
| 92 | set to a coding system that exists in both emacsen." | ||
| 93 | :type 'file) | 89 | :type 'file) |
| 94 | 90 | ||
| 95 | (defcustom savehist-file-modes #o600 | 91 | (defcustom savehist-file-modes #o600 |
diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el index fae694d5221..d207d75a601 100644 --- a/lisp/vc/ediff.el +++ b/lisp/vc/ediff.el | |||
| @@ -79,8 +79,7 @@ | |||
| 79 | ;; 1. The undo command doesn't restore deleted regions well. That is, if | 79 | ;; 1. The undo command doesn't restore deleted regions well. That is, if |
| 80 | ;; you delete all characters in a difference region and then invoke | 80 | ;; you delete all characters in a difference region and then invoke |
| 81 | ;; `undo', the reinstated text will most likely be inserted outside of | 81 | ;; `undo', the reinstated text will most likely be inserted outside of |
| 82 | ;; what Ediff thinks is the current difference region. (This problem | 82 | ;; what Ediff thinks is the current difference region. |
| 83 | ;; doesn't seem to exist with XEmacs.) | ||
| 84 | ;; | 83 | ;; |
| 85 | ;; If at any point you feel that difference regions are no longer correct, | 84 | ;; If at any point you feel that difference regions are no longer correct, |
| 86 | ;; you can hit '!' to recompute the differences. | 85 | ;; you can hit '!' to recompute the differences. |