User: aidan
Date: 06/06/03 08:58:19
Modified: packages/mule-packages/leim ChangeLog quail.el
Log:
Quail docstring improvements, and a bugfix.
Revision Changes Path
1.27 +11 -0 XEmacs/packages/mule-packages/leim/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/leim/ChangeLog,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- ChangeLog 2003/10/31 17:19:52 1.26
+++ ChangeLog 2006/06/03 06:58:18 1.27
@@ -1,3 +1,14 @@
+2006-06-03 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * quail.el (quail-define-rules):
+ * quail.el (quail-defrule):
+ Document in more detail what happens when a function symbol is
+ specified as the Quail translation for a key.
+ * quail.el (quail-show-translations):
+ Check that quail-overlay is an overlay before trying to move
+ it. Fixes an occasional "Wrong type argument: overlayp, nil"
+ message in XEmacs 21.5.
+
2003-10-31 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 1.22 released.
1.7 +20 -5 XEmacs/packages/mule-packages/leim/quail.el
Index: quail.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/leim/quail.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- quail.el 2003/06/30 12:36:25 1.6
+++ quail.el 2006/06/03 06:58:18 1.7
@@ -808,9 +808,16 @@ If it is a string, each character is a c
If it is a vector, each element (string or character) is a candidate
for the translation.
In these cases, a key specific Quail map is generated and assigned to KEY.
+(A Quail map is a cons that satisfies `quail-map-p', which see.)
-If TRANSLATION is a Quail map or a function symbol which returns a Quail map,
- it is used to handle KEY."
+If TRANSLATION is a Quail map it is used to handle KEY.
+
+If TRANSLATION is a function symbol, that function should take two
+arguments, the input string and its length, and it should return a Quail map
+to be used to handle KEY. For each KEY that translates to the function,
+that function will be called just once, and the result cached by Quail--this
+means that some of the context-dependent processing you may be tempted to
+do, like manipulating unread-command-events, is not possible. "
`(quail-install-map
',(let ((l rules)
(map (list nil)))
@@ -844,9 +851,17 @@ If it is a cons, the car is one of the a
variable `quail-current-data'). If the cdr part is not a function,
the value itself is assigned to `quail-current-data'.
In these cases, a key specific Quail map is generated and assigned to KEY.
+(A Quail map is a cons that satisfies `quail-map-p', which see.)
+
+If TRANSLATION is a Quail map it is used to handle KEY.
+
+If TRANSLATION is a function symbol, that function should take two
+arguments, the input string and its length. It should return a Quail map to
+be used to handle KEY. For each KEY that translates to the function, that
+function will be called just once, and the result cached by Quail--this
+means that some of the context-dependent processing you may be tempted to
+do, like manipulating `unread-command-events', is not possible.
-If TRANSLATION is a Quail map or a function symbol which returns a Quail map,
- it is used to handle KEY.
Optional argument NAME, if specified, says which Quail package
to define this translation rule in. The default is to define it in the
current Quail package."
@@ -1635,7 +1650,7 @@ or in a newly created frame (if the sele
(1+ (- idx start)))))
(let ((pos (point)))
(insert (aref (cdr quail-current-translations) idx))
- (if (= idx cur)
+ (if (and (overlayp quail-overlay) (= idx cur))
(move-overlay quail-overlay pos (point))))
(setq idx (1+ idx)))))
)))
Show replies by date