From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Mon, 7 May 2007 08:06:55 +0000 (+0000)
Subject: (mac-ts-unicode-for-key-event): Check if text is available.
X-Git-Tag: emacs-pretest-22.0.990~70
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b70b6847b7f9a26a2220b4a737001fba4e884b90;p=emacs.git

(mac-ts-unicode-for-key-event): Check if text is available.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ff30935012d..957e975ded7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-07  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* term/mac-win.el (mac-ts-unicode-for-key-event): Check if text is
+	available.
+
 2007-05-06  Richard Stallman  <rms@gnu.org>
 
 	* emacs-lisp/eldoc.el (turn-on-eldoc-mode): Doc fix.
diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el
index 51274e6f5be..6370b40d367 100644
--- a/lisp/term/mac-win.el
+++ b/lisp/term/mac-win.el
@@ -2104,7 +2104,8 @@ either in the current buffer or in the echo area."
 	 (coding (or (cdr (assq (car script-language)
 				mac-script-code-coding-systems))
 		     'mac-roman)))
-    (mac-unread-string (mac-utxt-to-string text coding))))
+    (if text
+	(mac-unread-string (mac-utxt-to-string text coding)))))
 
 ;; kEventClassTextInput/kEventTextInputUpdateActiveInputArea
 (define-key mac-apple-event-map [text-input update-active-input-area]