--- a/lisp/utils/flow-ctrl.el	Mon Aug 13 09:00:04 2007 +0200
+++ b/lisp/utils/flow-ctrl.el	Mon Aug 13 09:02:59 2007 +0200
@@ -20,29 +20,29 @@
 ;; General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING.  If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; along with XEmacs; see the file COPYING.  If not, write to the 
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
 
-;;; Synched up with: FSF 19.34.
+;;; Synched up with: FSF 19.28.
 
 ;;; Commentary:
 
-;; Terminals that use XON/XOFF flow control can cause problems with
-;; GNU Emacs users.  This file contains Emacs Lisp code that makes it
-;; easy for a user to deal with this problem, when using such a
-;; terminal. 
-;;      
-;; To invoke these adjustments, a user need only invoke the function
-;; enable-flow-control-on with a list of terminal types in his/her own
-;; .emacs file.  As arguments, give it the names of one or more terminal
-;; types in use by that user which require flow control adjustments.
-;; Here's an example: 
-;; 
-;;	(enable-flow-control-on "vt200" "vt300" "vt101" "vt131")
+;;;; Terminals that use XON/XOFF flow control can cause problems with
+;;;; GNU Emacs users.  This file contains Emacs Lisp code that makes it
+;;;; easy for a user to deal with this problem, when using such a
+;;;; terminal. 
+;;;;      
+;;;; To invoke these adjustments, a user need only invoke the function
+;;;; enable-flow-control-on with a list of terminal types in his/her own
+;;;; .emacs file.  As arguments, give it the names of one or more terminal
+;;;; types in use by that user which require flow control adjustments.
+;;;; Here's an example: 
+;;;; 
+;;;;	(enable-flow-control-on "vt200" "vt300" "vt101" "vt131")
 
-;; Portability note: This uses (getenv "TERM"), and therefore probably
-;; won't work outside of UNIX-like environments.
+;;; Portability note: This uses (getenv "TERM"), and therefore probably
+;;; won't work outside of UNIX-like environments.
 
 ;;; Code:
 
@@ -51,8 +51,6 @@
 (defvar flow-control-c-q-replacement ?\036
   "Character that replaces C-q, when flow control handling is enabled.")
 
-;(put 'keyboard-translate-table 'char-table-extra-slots 0)
-
 ;;;###autoload
 (defun enable-flow-control (&optional argument)
   "Toggle flow control handling.
@@ -67,7 +65,6 @@
       (progn
 	;; Turn flow control off, and stop exchanging chars.
 	(set-input-mode t nil (nth 2 (current-input-mode)))
-	;; XEmacs
 	(keyboard-translate flow-control-c-s-replacement nil)
 	(keyboard-translate ?\^s nil)
 	(keyboard-translate flow-control-c-q-replacement nil)
@@ -77,7 +74,6 @@
     (set-input-mode nil t (nth 2 (current-input-mode)))
     ;; Initialize translate table, saving previous mappings, if any.
     ;; Swap C-s and C-\
-    ;; XEmacs
     (keyboard-translate flow-control-c-s-replacement ?\^s)
     (keyboard-translate ?\^s flow-control-c-s-replacement)
     ;; Swap C-q and C-^
@@ -102,18 +98,12 @@
 The tty terminal type is determined from the TERM environment variable.
 Trailing hyphens and everything following is stripped, so a TERM
 value of \"vt100-nam\" is treated the same as \"vt100\"."
-  (let ((term (getenv "TERM"))
-	hyphend)
-    ;; Look for TERM in LOSING-TERMINAL-TYPES.
-    ;; If we don't find it literally, try stripping off words
-    ;; from the end, one by one.
-    (while (and term (not (member term losing-terminal-types)))
-      ;; Strip off last hyphen and what follows, then try again.
-      (if (setq hyphend (string-match "[-_][^-_]+$" term))
-	  (setq term (substring term 0 hyphend))
-	(setq term nil)))
-    (if term
-	(enable-flow-control))))
+  (and
+   (eq (device-type) 'tty)
+   (getenv "TERM")
+   (member (replace-in-string (getenv "TERM") "[-_].*$" "")
+           losing-terminal-types)
+   (enable-flow-control)))
 
 (provide 'flow-ctrl)