diff options
| author | Miles Bader <miles@gnu.org> | 2007-05-15 07:17:13 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-05-15 07:17:13 +0000 |
| commit | 4ace64cc90e38c77c11546fead24782a60eb1d4d (patch) | |
| tree | efebad2b13253bfe060be37dccbbbf9603010b7a /lisp/term/mac-win.el | |
| parent | 06253b0e7aca3ca2deb2093f187bb52cee09ec5c (diff) | |
| parent | 9fff44d50016108a350c90c39b68e302277080d7 (diff) | |
| download | emacs-4ace64cc90e38c77c11546fead24782a60eb1d4d.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 726-750)
- Update from CVS
- Merge from emacs--rel--22
- Merge from gnus--rel--5.10
* emacs--rel--22 (patch 6-17)
- Update from CVS
- Update from CVS: src/xterm.c (XTread_socket): Revert last change.
* gnus--rel--5.10 (patch 218-221)
- Merge from emacs--devo--0, emacs--rel--22
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-205
Diffstat (limited to 'lisp/term/mac-win.el')
| -rw-r--r-- | lisp/term/mac-win.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el index 92cbb7270d2..0a2de1e9a38 100644 --- a/lisp/term/mac-win.el +++ b/lisp/term/mac-win.el @@ -2154,7 +2154,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] |