aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYAMAMOTO Mitsuharu2008-04-23 08:57:18 +0000
committerYAMAMOTO Mitsuharu2008-04-23 08:57:18 +0000
commit9f0d1d6f744a15997572318cffe2bfb65322137c (patch)
treed1958546b14d8fd453fd016d43e626b939cf16d5
parent1289aeb85cb7c330283fa3049f7f11f092055004 (diff)
downloademacs-9f0d1d6f744a15997572318cffe2bfb65322137c.tar.gz
emacs-9f0d1d6f744a15997572318cffe2bfb65322137c.zip
(mac-ts-active-input-buf): Move defvar to macterm.c.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/term/mac-win.el3
2 files changed, 5 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 20f04983fbd..e2d01ec3ba0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12008-04-23 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
2
3 * term/mac-win.el (mac-ts-active-input-buf): Move defvar to macterm.c.
4
12008-04-12 Nick Roberts <nickrob@snap.net.nz> 52008-04-12 Nick Roberts <nickrob@snap.net.nz>
2 6
3 * progmodes/gdb-ui.el (gdb-init-buffer): New function. 7 * progmodes/gdb-ui.el (gdb-init-buffer): New function.
diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el
index eaa0e35fa5b..e63ffdf486c 100644
--- a/lisp/term/mac-win.el
+++ b/lisp/term/mac-win.el
@@ -83,6 +83,7 @@
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 88
88(defvar x-command-line-resources nil) 89(defvar x-command-line-resources nil)
@@ -1859,8 +1860,6 @@ With numeric ARG, display the font panel if and only if ARG is positive."
1859) ;; (fboundp 'mac-set-font-panel-visible-p) 1860) ;; (fboundp 'mac-set-font-panel-visible-p)
1860 1861
1861;;; Text Services 1862;;; Text Services
1862(defvar mac-ts-active-input-buf ""
1863 "Byte sequence of the current Mac TSM active input area.")
1864(defvar mac-ts-update-active-input-area-seqno 0 1863(defvar mac-ts-update-active-input-area-seqno 0
1865 "Number of processed update-active-input-area events.") 1864 "Number of processed update-active-input-area events.")
1866(setq mac-ts-active-input-overlay (make-overlay 0 0)) 1865(setq mac-ts-active-input-overlay (make-overlay 0 0))