aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYAMAMOTO Mitsuharu2007-05-07 08:05:55 +0000
committerYAMAMOTO Mitsuharu2007-05-07 08:05:55 +0000
commit59c58feafb764126fa08e1a3560cb158817f556e (patch)
treeff43d188a2ff0a162cfd40a27775af09bdf506d5
parent589e28cdeb6ed3759c13ceab8412ff9a3ac2f809 (diff)
downloademacs-59c58feafb764126fa08e1a3560cb158817f556e.tar.gz
emacs-59c58feafb764126fa08e1a3560cb158817f556e.zip
(mac-ts-unicode-for-key-event): Check if text is available.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/term/mac-win.el3
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 363d2510ded..afba0b285ec 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12007-05-07 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
2
3 * term/mac-win.el (mac-ts-unicode-for-key-event): Check if text is
4 available.
5
12007-05-06 Richard Stallman <rms@gnu.org> 62007-05-06 Richard Stallman <rms@gnu.org>
2 7
3 * emacs-lisp/eldoc.el (turn-on-eldoc-mode): Doc fix. 8 * 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."
2104 (coding (or (cdr (assq (car script-language) 2104 (coding (or (cdr (assq (car script-language)
2105 mac-script-code-coding-systems)) 2105 mac-script-code-coding-systems))
2106 'mac-roman))) 2106 'mac-roman)))
2107 (mac-unread-string (mac-utxt-to-string text coding)))) 2107 (if text
2108 (mac-unread-string (mac-utxt-to-string text coding)))))
2108 2109
2109;; kEventClassTextInput/kEventTextInputUpdateActiveInputArea 2110;; kEventClassTextInput/kEventTextInputUpdateActiveInputArea
2110(define-key mac-apple-event-map [text-input update-active-input-area] 2111(define-key mac-apple-event-map [text-input update-active-input-area]