Mercurial > emacs
comparison lisp/term/mac-win.el @ 94307:df6f9d73861f
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1126
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Thu, 24 Apr 2008 05:11:07 +0000 |
| parents | ca9efc5939fc 393b3d64ca25 |
| children | f3ab0c2464f5 |
comparison
equal
deleted
inserted
replaced
| 94306:efca1113a630 | 94307:df6f9d73861f |
|---|---|
| 81 (defvar mac-service-selection) | 81 (defvar mac-service-selection) |
| 82 (defvar mac-system-script-code) | 82 (defvar mac-system-script-code) |
| 83 (defvar mac-apple-event-map) | 83 (defvar mac-apple-event-map) |
| 84 (defvar mac-font-panel-mode) | 84 (defvar mac-font-panel-mode) |
| 85 (defvar mac-ts-active-input-overlay) | 85 (defvar mac-ts-active-input-overlay) |
| 86 (defvar mac-ts-active-input-buf) | |
| 86 (defvar x-invocation-args) | 87 (defvar x-invocation-args) |
| 87 (declare-function mac-code-convert-string "mac.c") | 88 (declare-function mac-code-convert-string "mac.c") |
| 88 (declare-function mac-coerce-ae-data "mac.c") | 89 (declare-function mac-coerce-ae-data "mac.c") |
| 89 (declare-function mac-resume-apple-event "macselect.c") | 90 (declare-function mac-resume-apple-event "macselect.c") |
| 90 ;; Suppress warning when compiling on non-Mac. | 91 ;; Suppress warning when compiling on non-Mac. |
| 1924 'showhide-speedbar) | 1925 'showhide-speedbar) |
| 1925 | 1926 |
| 1926 ) ;; (fboundp 'mac-set-font-panel-visible-p) | 1927 ) ;; (fboundp 'mac-set-font-panel-visible-p) |
| 1927 | 1928 |
| 1928 ;;; Text Services | 1929 ;;; Text Services |
| 1929 (defvar mac-ts-active-input-buf "" | |
| 1930 "Byte sequence of the current Mac TSM active input area.") | |
| 1931 (defvar mac-ts-update-active-input-area-seqno 0 | 1930 (defvar mac-ts-update-active-input-area-seqno 0 |
| 1932 "Number of processed update-active-input-area events.") | 1931 "Number of processed update-active-input-area events.") |
| 1933 (setq mac-ts-active-input-overlay (make-overlay 0 0)) | 1932 (setq mac-ts-active-input-overlay (make-overlay 0 0)) |
| 1934 | 1933 |
| 1935 (defface mac-ts-caret-position | 1934 (defface mac-ts-caret-position |