Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1126

1 files changed, 1 insertions, 2 deletions

diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el
index e15f2e4c873..91d14a9c8fa 100644
--- a/lisp/term/mac-win.el
+++ b/lisp/term/mac-win.el
@@ -83,6 +83,7 @@
 (defvar mac-apple-event-map)
 (defvar mac-font-panel-mode)
 (defvar mac-ts-active-input-overlay)
+(defvar mac-ts-active-input-buf)
 (defvar x-invocation-args)
 (declare-function mac-code-convert-string "mac.c")
 (declare-function mac-coerce-ae-data "mac.c")
@@ -1926,8 +1927,6 @@ With numeric ARG, display the font panel if and only if ARG is positive."
 ) ;; (fboundp 'mac-set-font-panel-visible-p)
 
 ;;; Text Services
-(defvar mac-ts-active-input-buf ""
-  "Byte sequence of the current Mac TSM active input area.")
 (defvar mac-ts-update-active-input-area-seqno 0
   "Number of processed update-active-input-area events.")
 (setq mac-ts-active-input-overlay (make-overlay 0 0))