Merged in changes from CVS trunk.

[gnu-emacs] / lisp / flow-ctrl.el

diff --git a/lisp/flow-ctrl.el b/lisp/flow-ctrl.el
index de2109b4b86ea613222839643486d953d637f0dc..63654572f9b13fdb39cb9f44afacd5580f30d38b 100644 (file)
--- a/lisp/flow-ctrl.el
+++ b/lisp/flow-ctrl.el
@@ -29,14 +29,14 @@
 ;; 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 +95,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 +123,5 @@ to get the effect of a C-q."
 
 (provide 'flow-ctrl)
 
+;;; arch-tag: 0eb7b19e-0d93-4e0b-9ea2-72b574076a56
 ;;; flow-ctrl.el ends here