[Emacs-diffs] master 45b01f2 1/2: Remove leftover XEmacs compat code and doc fixes

[Stefan Kangas]

branch: master
commit 45b01f2d7fc9929fccf2e173291001ab04387947
Author: Stefan Kangas <address@hidden>
Commit: Stefan Kangas <address@hidden>

    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.
---
 lisp/emulation/viper.el |  6 +++---
 lisp/mail/feedmail.el   | 17 ++---------------
 lisp/net/rfc2104.el     |  2 --
 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 521edbe..0f5c92c 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -1,4 +1,4 @@
-;;; viper.el --- A full-featured Vi emulator for Emacs and XEmacs,  
-*-lexical-binding:t -*-
+;;; viper.el --- A full-featured Vi emulator for Emacs  -*- lexical-binding:t 
-*-
 ;;              a VI Plan for Emacs Rescue,
 ;;              and a venomous VI PERil.
 ;;              Viper Is also a Package for Emacs Rebels.
@@ -34,7 +34,7 @@
 
 ;;; Commentary:
 
-;; Viper is a full-featured Vi emulator for Emacs and XEmacs.  It emulates and
+;; Viper is a full-featured Vi emulator for Emacs.  It emulates and
 ;; improves upon the standard features of Vi and, at the same time, allows
 ;; full access to all Emacs facilities.  Viper supports multiple undo,
 ;; 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."
                      "Viper Is a Package for Emacs Rebels,
 a VI Plan for Emacs Rescue, and a venomous VI PERil.
 
-Incidentally, Viper emulates Vi under Emacs/XEmacs 20.
+Incidentally, Viper emulates Vi under Emacs.
 It supports all of what is good in Vi and Ex, while extending
 and improving upon much of it.
 
diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el
index babc3fc..b362614 100644
--- a/lisp/mail/feedmail.el
+++ b/lisp/mail/feedmail.el
@@ -17,15 +17,6 @@
 ;; ability to queue messages for later sending.  This replaces
 ;; the standalone fakemail program that used to be distributed with Emacs.
 
-;; feedmail works with recent versions of Emacs (20.x series) and
-;; XEmacs (tested with 20.4 and later betas).  It probably no longer
-;; works with Emacs v18, though I haven't tried that in a long
-;; time.  address@hidden reports: "I have a report
-;; that with a help of APEL library, feedmail works fine under emacs
-;; 19.28.  You can get APEL from ftp://ftp.m17n.org/pub/mule/apel/.
-;; you need apel-10.2 or later to make feedmail work under emacs
-;; 19.28."
-
 ;; Sorry, no manual yet in this release.  Look for one with the next
 ;; release.  Or the one after that.  Or maybe later.
 
@@ -437,9 +428,7 @@ shuttled robotically onward."
 (defcustom feedmail-confirm-outgoing-timeout nil
   "If non-nil, a timeout in seconds at the send confirmation prompt.
 If a positive number, it's a timeout before sending.  If a negative
-number, it's a timeout before not sending.  This will not work if your
-version of Emacs doesn't include the function `y-or-n-p-with-timeout'
-\(e.g., some versions of XEmacs)."
+number, it's a timeout before not sending."
   :version "24.1"
   :group 'feedmail-misc
   :type '(choice (const nil) integer)
@@ -2004,9 +1993,7 @@ backup file names and the like)."
             ((feedmail-fqm-p blobby)
              (setq blobby-buffer (generate-new-buffer (concat "FQM " blobby)))
              (setq already-buffer
-                   (if (fboundp 'find-buffer-visiting) ; missing from XEmacs
-                       (find-buffer-visiting maybe-file)
-                     (get-file-buffer maybe-file)))
+                   (find-buffer-visiting maybe-file))
              (if (and already-buffer (buffer-modified-p already-buffer))
                  (save-window-excursion
                    (display-buffer (set-buffer already-buffer))
diff --git a/lisp/net/rfc2104.el b/lisp/net/rfc2104.el
index 5de8401..fadc979 100644
--- a/lisp/net/rfc2104.el
+++ b/lisp/net/rfc2104.el
@@ -37,8 +37,6 @@
 ;; 64 is block length of hash function (64 for MD5 and SHA), 16 is
 ;; resulting hash length (16 for MD5, 20 for SHA).
 ;;
-;; Tested with Emacs 20.2 and XEmacs 20.3.
-;;
 ;; Test case reference: RFC 2202.
 
 ;;; History:
diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el
index 1f185e0..f684f4e 100644
--- a/lisp/textmodes/table.el
+++ b/lisp/textmodes/table.el
@@ -567,10 +567,6 @@
 ;; Consider the use of `:box' face attribute under Emacs 21
 ;; Consider the use of `modification-hooks' text property instead of
 ;; rebinding the keymap
-;; Maybe provide complete XEmacs support in the future however the
-;; "extent" is the single largest obstacle lying ahead, read the
-;; document in Emacs info.
-;; (progn (require 'info) (Info-find-node "elisp" "Not Intervals"))
 ;;
 ;;
 ;; ---------------