* lisp/term.el (term-set-escape-char): Make it idempotent.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6bd304bf815f78f9ee8e4e0ca27f9a566b6b626b..ec747affc95aa3024be48ccaea2a13949e8028f9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-11  Glenn Morris  <rgm@gnu.org>
+
+       * term.el (term-set-escape-char): Make it idempotent.
+
 2013-05-10  Leo Liu  <sdl.web@gmail.com>
 
        * progmodes/octave.el (inferior-octave-completion-table): No

diff --git a/lisp/term.el b/lisp/term.el
index b37e71280dac9cfade927534d332f638b9fdc72f..1c67057d3a79b7094ca04d1c6c9c401c0347d6b2 100644 (file)
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -953,7 +953,7 @@ is buffer-local."
   (when term-escape-char
     ;; Undo previous term-set-escape-char.
     (define-key term-raw-map term-escape-char 'term-send-raw))
-  (setq term-escape-char (vector key))
+  (setq term-escape-char (if (vectorp key) key (vector key)))
   (define-key term-raw-map term-escape-char term-raw-escape-map)
   ;; FIXME: If we later call term-set-escape-char again with another key,
   ;; we should undo this binding.