Merge from gnus--devo--0

[bpt/emacs.git] / lisp / flow-ctrl.el

diff --git a/lisp/flow-ctrl.el b/lisp/flow-ctrl.el
index de2109b..f011343 100644 (file)
--- a/lisp/flow-ctrl.el
+++ b/lisp/flow-ctrl.el
@@ -1,6 +1,7 @@
 ;;; flow-ctrl.el --- help for lusers on cu(1) or ttys with wired-in ^S/^Q flow control
 
-;; Copyright (C) 1990, 1991, 1994 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1994, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author Kevin Gallagher
 ;; Maintainer: FSF
@@ -9,10 +10,10 @@
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,23 +21,21 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; 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 GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; 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. 
-;;      
+;; 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: 
-;; 
+;; Here's an example:
+;;
 ;;     (enable-flow-control-on "vt200" "vt300" "vt101" "vt131")
 
 ;; Portability note: This uses (getenv "TERM"), and therefore probably
@@ -95,14 +94,10 @@ With arg, enable flow control mode if arg is positive, otherwise disable."
     ;; Swap C-q and C-^
     (aset keyboard-translate-table flow-control-c-q-replacement ?\^q)
     (aset keyboard-translate-table ?\^q flow-control-c-q-replacement)
-    (message (concat 
-             "XON/XOFF adjustment for " 
-             (getenv "TERM") 
-             ": use "
-             (single-key-description flow-control-c-s-replacement)
-             " for C-s, and use "
-             (single-key-description flow-control-c-q-replacement)
-             " for C-q"))
+    (message "XON/XOFF adjustment for %s: use %s for C-s, and use %s for C-q"
+            (getenv "TERM")
+            (single-key-description flow-control-c-s-replacement)
+            (single-key-description flow-control-c-q-replacement))
     (sleep-for 2)))                    ; Give user a chance to see message.
 
 ;;;###autoload
@@ -127,4 +122,5 @@ to get the effect of a C-q."
 
 (provide 'flow-ctrl)
 
+;; arch-tag: 0eb7b19e-0d93-4e0b-9ea2-72b574076a56
 ;;; flow-ctrl.el ends here