[COMMIT] Correct #'define-key syntax, eliminate byte-compile warnings, quail.el
APPROVE COMMIT
NOTE: This patch has been committed.
mule-packages/leim/ChangeLog addition:
2010-09-03 Aidan Kehoe <kehoea(a)parhasard.net>
* quail.el:
* quail.el (quail-translation-keymap):
* quail.el (quail-simple-translation-keymap):
* quail.el (quail-set-keyboard-layout):
* quail.el (quail-update-current-translations):
* quail.el (frame-char-height): New.
* quail.el (quail-completion-list-translations):
* quail.el (quail-translation-help):
* quail.el (quail-update-leim-list-file):
Make the #'define-key syntax in this file conform to our
documentation; eliminate byte-compiler warnings, in the process
fixing at least two honest-to-goodness bugs.
XEmacs Packages source patch:
Diff command: cvs -q diff -Nu
Files affected: mule-packages/leim/quail.el
Index: mule-packages/leim/quail.el
===================================================================
RCS file: /cvsroot/xemacs/XEmacs/packages/mule-packages/leim/quail.el,v
retrieving revision 1.11
diff -u -r1.11 quail.el
--- mule-packages/leim/quail.el 18 Feb 2010 20:49:44 -0000 1.11
+++ mule-packages/leim/quail.el 3 Sep 2010 18:42:25 -0000
＠＠ -304,7 +304,7 ＠＠
(define-key map "\C-h" 'quail-translation-help)
;;; This interferes with handling of escape sequences on non-X terminals.
;;; (define-key map "\e" '(keymap (t .
quail-execute-non-quail-command)))
- (define-key map [?\C-\ ] 'quail-select-current)
+ (define-key map [(control space)] 'quail-select-current)
(define-key map [tab] 'quail-completion)
(define-key map [delete] 'quail-backward-or-forward-delete-char)
(define-key map [backspace] 'quail-delete-backward-char)
＠＠ -313,7 +313,7 ＠＠
(define-key map (char-to-string meta-prefix-char) meta-map))
(define-key map [escape] meta-map))
(when (characterp meta-prefix-char)
- (define-key map (vector meta-prefix-char t)
+ (define-key map (string meta-prefix-char ?t)
'quail-execute-non-quail-command))
;; At last, define default key binding.
(set-keymap-default-binding map 'quail-execute-non-quail-command)
＠＠ -341,7 +341,7 ＠＠
(define-key map (char-to-string meta-prefix-char) meta-map))
(define-key map [escape] meta-map))
(when (characterp meta-prefix-char)
- (define-key map (vector meta-prefix-char t)
+ (define-key map (string meta-prefix-char ?t)
'quail-execute-non-quail-command))
;; At last, define default key binding.
(set-keymap-default-binding map 'quail-execute-non-quail-command)
＠＠ -731,7 +731,7 ＠＠
function tells Quail system the layout of your keyboard so that what
you type is correctly handled."
(interactive
- (let* ((completing-ignore-case t)
+ (let* ((completion-ignore-case t)
(type (completing-read "Keyboard type: "
quail-keyboard-layout-alist)))
(list type)))
＠＠ -1219,7 +1219,7 ＠＠
(maxcol (- (window-width quail-guidance-win)
quail-guidance-translations-starting-column))
(block (nth 3 indices))
- col idx width trans num-items blocks)
+ col idx width trans num-items)
(if (< cur start)
;; We must calculate from the head.
(setq start 0 block 0)
＠＠ -1459,6 +1459,12 ＠＠
;; Guidance, Completion, and Help buffer handlers.
+(defun-when-void frame-char-height (&optional frame)
+ "Return the height in pixels of a line of text on FRAME.
+
+If FRAME is on a TTY console, return the integer 1."
+ (face-height 'default (or frame (selected-frame))))
+
;; Make a new one-line frame for Quail guidance buffer.
(defun quail-make-guidance-frame (buf)
(let* ((fparam (frame-parameters))
＠＠ -1724,8 +1730,7 ＠＠
(setq translations (cdr translations))
;; Insert every 10 elements with indices in a line.
(let ((len (length translations))
- (i 0)
- num)
+ (i 0))
(while (< i len)
(when (zerop (% i 10))
(when (>= i 10)
＠＠ -1842,7 +1847,7 ＠＠
(set-buffer standard-output)
(let ((quail-current-package package))
(princ "You are translating the key sequence ")
- (prin1 quail-current-key)
+ (prin1 current-key)
(princ" in Quail mode.\n")
(quail-help-insert-keymap-description
(quail-translation-keymap)
＠＠ -2009,7 +2014,7 ＠＠
(interactive "FDirectory of LEIM: ")
(setq dirname (expand-file-name dirname))
(let ((leim-list (expand-file-name leim-list-file-name dirname))
- quail-dirs list-buf pkg-list pkg-buf pos)
+ quail-dirs list-buf pkg-list pos)
(if (not (file-writable-p leim-list))
(error "Can't write to file \"%s\"" leim-list))
(message "Updating %s ..." leim-list)
--
¿Dónde estará ahora mi sobrino Yoghurtu Nghe, que tuvo que huir
precipitadamente de la aldea por culpa de la escasez de rinocerontes?
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/mailman/listinfo/xemacs-patches