Mercurial > emacs

diff lisp/cus-start.el @ 90472:138027c8c982

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 300-313) - Update from CVS - Update from CVS: lispref/display.texi (Forcing Redisplay): Fix typo. - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 105-106) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-74
author Miles Bader <miles@gnu.org>
date Sat, 17 Jun 2006 20:57:37 +0000
parents 146cd8369025 763764b2c2a4
children 7f3f771c85fa
line wrap: on
line diff
--- a/lisp/cus-start.el	Fri Jun 16 13:22:32 2006 +0000
+++ b/lisp/cus-start.el	Sat Jun 17 20:57:37 2006 +0000
@@ -225,6 +225,13 @@
 	     (mac-pass-command-to-system mac boolean "22.1")
 	     (mac-pass-control-to-system mac boolean "22.1")
 	     (mac-allow-anti-aliasing mac boolean "22.1")
+	     (mac-ts-script-language-on-focus mac
+					      (choice (const :tag "System default behavior" nil)
+						      (const :tag "Restore to script/language used in the last focus frame" t)
+						      (cons :tag "Specify script/language"
+							    (integer :tag "Script code")
+							    (integer :tag "Language code")))
+					      "22.1")
 
 ;; This is not good news because it will use the wrong
 ;; version-specific directories when you upgrade.  We need