diff options
| author | Stefan Kangas | 2019-09-13 18:06:31 +0200 |
|---|---|---|
| committer | Stefan Kangas | 2019-09-13 18:37:15 +0200 |
| commit | 45b01f2d7fc9929fccf2e173291001ab04387947 (patch) | |
| tree | b431b89800a06b84ae44b0474edfb96cfcbed0c9 | |
| parent | 897540069fb09d091802046046daca821079aac5 (diff) | |
| download | emacs-45b01f2d7fc9929fccf2e173291001ab04387947.tar.gz emacs-45b01f2d7fc9929fccf2e173291001ab04387947.zip | |
Remove leftover XEmacs compat code and doc fixes
* lisp/mail/feedmail.el (top-level): Remove outdated comment.
(feedmail-run-the-queue): Remove leftover XEmacs compat code.
(feedmail-nuke-bcc): Doc fix.
* lisp/emulation/viper.el (top-level, viper-mode)
* lisp/net/rfc2104.el (top-level): Doc fix.
* lisp/textmodes/table.el (top-level): Remove obsolete todo.
| -rw-r--r-- | lisp/emulation/viper.el | 6 | ||||
| -rw-r--r-- | lisp/mail/feedmail.el | 17 | ||||
| -rw-r--r-- | lisp/net/rfc2104.el | 2 | ||||
| -rw-r--r-- | lisp/textmodes/table.el | 4 |
4 files changed, 5 insertions, 24 deletions
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el index 521edbe6048..0f5c92c2c9e 100644 --- a/lisp/emulation/viper.el +++ b/lisp/emulation/viper.el | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | ;;; viper.el --- A full-featured Vi emulator for Emacs and XEmacs, -*-lexical-binding:t -*- | 1 | ;;; viper.el --- A full-featured Vi emulator for Emacs -*- lexical-binding:t -*- |
| 2 | ;; a VI Plan for Emacs Rescue, | 2 | ;; a VI Plan for Emacs Rescue, |
| 3 | ;; and a venomous VI PERil. | 3 | ;; and a venomous VI PERil. |
| 4 | ;; Viper Is also a Package for Emacs Rebels. | 4 | ;; Viper Is also a Package for Emacs Rebels. |
| @@ -34,7 +34,7 @@ | |||
| 34 | 34 | ||
| 35 | ;;; Commentary: | 35 | ;;; Commentary: |
| 36 | 36 | ||
| 37 | ;; Viper is a full-featured Vi emulator for Emacs and XEmacs. It emulates and | 37 | ;; Viper is a full-featured Vi emulator for Emacs. It emulates and |
| 38 | ;; improves upon the standard features of Vi and, at the same time, allows | 38 | ;; improves upon the standard features of Vi and, at the same time, allows |
| 39 | ;; full access to all Emacs facilities. Viper supports multiple undo, | 39 | ;; full access to all Emacs facilities. Viper supports multiple undo, |
| 40 | ;; file name completion, command, file, and search history and it extends | 40 | ;; file name completion, command, file, and search history and it extends |
| @@ -541,7 +541,7 @@ If Viper is enabled, turn it off. Otherwise, turn it on." | |||
| 541 | "Viper Is a Package for Emacs Rebels, | 541 | "Viper Is a Package for Emacs Rebels, |
| 542 | a VI Plan for Emacs Rescue, and a venomous VI PERil. | 542 | a VI Plan for Emacs Rescue, and a venomous VI PERil. |
| 543 | 543 | ||
| 544 | Incidentally, Viper emulates Vi under Emacs/XEmacs 20. | 544 | Incidentally, Viper emulates Vi under Emacs. |
| 545 | It supports all of what is good in Vi and Ex, while extending | 545 | It supports all of what is good in Vi and Ex, while extending |
| 546 | and improving upon much of it. | 546 | and improving upon much of it. |
| 547 | 547 | ||
diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el index babc3fc212a..b362614d3a0 100644 --- a/lisp/mail/feedmail.el +++ b/lisp/mail/feedmail.el | |||
| @@ -17,15 +17,6 @@ | |||
| 17 | ;; ability to queue messages for later sending. This replaces | 17 | ;; ability to queue messages for later sending. This replaces |
| 18 | ;; the standalone fakemail program that used to be distributed with Emacs. | 18 | ;; the standalone fakemail program that used to be distributed with Emacs. |
| 19 | 19 | ||
| 20 | ;; feedmail works with recent versions of Emacs (20.x series) and | ||
| 21 | ;; XEmacs (tested with 20.4 and later betas). It probably no longer | ||
| 22 | ;; works with Emacs v18, though I haven't tried that in a long | ||
| 23 | ;; time. Makoto.Nakagawa@jp.compaq.com reports: "I have a report | ||
| 24 | ;; that with a help of APEL library, feedmail works fine under emacs | ||
| 25 | ;; 19.28. You can get APEL from ftp://ftp.m17n.org/pub/mule/apel/. | ||
| 26 | ;; you need apel-10.2 or later to make feedmail work under emacs | ||
| 27 | ;; 19.28." | ||
| 28 | |||
| 29 | ;; Sorry, no manual yet in this release. Look for one with the next | 20 | ;; Sorry, no manual yet in this release. Look for one with the next |
| 30 | ;; release. Or the one after that. Or maybe later. | 21 | ;; release. Or the one after that. Or maybe later. |
| 31 | 22 | ||
| @@ -437,9 +428,7 @@ shuttled robotically onward." | |||
| 437 | (defcustom feedmail-confirm-outgoing-timeout nil | 428 | (defcustom feedmail-confirm-outgoing-timeout nil |
| 438 | "If non-nil, a timeout in seconds at the send confirmation prompt. | 429 | "If non-nil, a timeout in seconds at the send confirmation prompt. |
| 439 | If a positive number, it's a timeout before sending. If a negative | 430 | If a positive number, it's a timeout before sending. If a negative |
| 440 | number, it's a timeout before not sending. This will not work if your | 431 | number, it's a timeout before not sending." |
| 441 | version of Emacs doesn't include the function `y-or-n-p-with-timeout' | ||
| 442 | \(e.g., some versions of XEmacs)." | ||
| 443 | :version "24.1" | 432 | :version "24.1" |
| 444 | :group 'feedmail-misc | 433 | :group 'feedmail-misc |
| 445 | :type '(choice (const nil) integer) | 434 | :type '(choice (const nil) integer) |
| @@ -2004,9 +1993,7 @@ backup file names and the like)." | |||
| 2004 | ((feedmail-fqm-p blobby) | 1993 | ((feedmail-fqm-p blobby) |
| 2005 | (setq blobby-buffer (generate-new-buffer (concat "FQM " blobby))) | 1994 | (setq blobby-buffer (generate-new-buffer (concat "FQM " blobby))) |
| 2006 | (setq already-buffer | 1995 | (setq already-buffer |
| 2007 | (if (fboundp 'find-buffer-visiting) ; missing from XEmacs | 1996 | (find-buffer-visiting maybe-file)) |
| 2008 | (find-buffer-visiting maybe-file) | ||
| 2009 | (get-file-buffer maybe-file))) | ||
| 2010 | (if (and already-buffer (buffer-modified-p already-buffer)) | 1997 | (if (and already-buffer (buffer-modified-p already-buffer)) |
| 2011 | (save-window-excursion | 1998 | (save-window-excursion |
| 2012 | (display-buffer (set-buffer already-buffer)) | 1999 | (display-buffer (set-buffer already-buffer)) |
diff --git a/lisp/net/rfc2104.el b/lisp/net/rfc2104.el index 5de8401d5b6..fadc979bc15 100644 --- a/lisp/net/rfc2104.el +++ b/lisp/net/rfc2104.el | |||
| @@ -37,8 +37,6 @@ | |||
| 37 | ;; 64 is block length of hash function (64 for MD5 and SHA), 16 is | 37 | ;; 64 is block length of hash function (64 for MD5 and SHA), 16 is |
| 38 | ;; resulting hash length (16 for MD5, 20 for SHA). | 38 | ;; resulting hash length (16 for MD5, 20 for SHA). |
| 39 | ;; | 39 | ;; |
| 40 | ;; Tested with Emacs 20.2 and XEmacs 20.3. | ||
| 41 | ;; | ||
| 42 | ;; Test case reference: RFC 2202. | 40 | ;; Test case reference: RFC 2202. |
| 43 | 41 | ||
| 44 | ;;; History: | 42 | ;;; History: |
diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el index 1f185e0f216..f684f4e4ca9 100644 --- a/lisp/textmodes/table.el +++ b/lisp/textmodes/table.el | |||
| @@ -567,10 +567,6 @@ | |||
| 567 | ;; Consider the use of `:box' face attribute under Emacs 21 | 567 | ;; Consider the use of `:box' face attribute under Emacs 21 |
| 568 | ;; Consider the use of `modification-hooks' text property instead of | 568 | ;; Consider the use of `modification-hooks' text property instead of |
| 569 | ;; rebinding the keymap | 569 | ;; rebinding the keymap |
| 570 | ;; Maybe provide complete XEmacs support in the future however the | ||
| 571 | ;; "extent" is the single largest obstacle lying ahead, read the | ||
| 572 | ;; document in Emacs info. | ||
| 573 | ;; (progn (require 'info) (Info-find-node "elisp" "Not Intervals")) | ||
| 574 | ;; | 570 | ;; |
| 575 | ;; | 571 | ;; |
| 576 | ;; --------------- | 572 | ;; --------------- |