comparison lisp/leim/quail.el @ 169:15872534500d r20-3b11

Import from CVS: tag r20-3b11
author cvs
date Mon, 13 Aug 2007 09:46:53 +0200
parents 5a88923fcbfe
children 6075d714658b
comparison
equal deleted inserted replaced
168:9851d5c6556e 169:15872534500d
255 ;; minor-mode-map-alist buffer-local, we must be sure to register 255 ;; minor-mode-map-alist buffer-local, we must be sure to register
256 ;; quail-mode-map in default-value of minor-mode-map-alist. 256 ;; quail-mode-map in default-value of minor-mode-map-alist.
257 (if (local-variable-p 'minor-mode-map-alist nil) 257 (if (local-variable-p 'minor-mode-map-alist nil)
258 (let ((map (default-value 'minor-mode-map-alist))) 258 (let ((map (default-value 'minor-mode-map-alist)))
259 (or (assq 'quail-mode map) 259 (or (assq 'quail-mode map)
260 (set-default 'minor-mode-map-alist (cons 'quail-mode map))))) 260 ;; (set-default 'minor-mode-map-alist (cons 'quail-mode map)))))
261 (set-default 'minor-mode-map-alist
262 (cons (cons 'quail-mode quail-mode-map) map)))))
261 263
262 (defvar quail-translation-keymap 264 (defvar quail-translation-keymap
263 (let ((map (make-keymap)) 265 (let ((map (make-keymap))
264 (i 0)) 266 (i 0))
265 (while (< i ?\ ) 267 (while (< i ?\ )
502 (run-hooks 'quail-mode-exit-hook) 504 (run-hooks 'quail-mode-exit-hook)
503 (run-hooks 'input-method-inactivate-hook)) 505 (run-hooks 'input-method-inactivate-hook))
504 ;; Let's turn on Quail mode. 506 ;; Let's turn on Quail mode.
505 ;; At first, be sure that quail-mode is at the first element of 507 ;; At first, be sure that quail-mode is at the first element of
506 ;; minor-mode-map-alist. 508 ;; minor-mode-map-alist.
507 (or (eq (car minor-mode-map-alist) 'quail-mode) 509 ;; The following code removed by slb because it corrupts the XEmacs
508 (let ((l minor-mode-map-alist)) 510 ;; minor-mode-map-alist
509 (while (cdr l) 511 ; (or (eq (car minor-mode-map-alist) 'quail-mode)
510 (if (eq (car (cdr l)) 'quail-mode) 512 ; (let ((l minor-mode-map-alist))
511 (progn 513 ; (while (cdr l)
512 (setcdr l (cdr (cdr l))) 514 ; (if (eq (car (cdr l)) 'quail-mode)
513 (setq l nil)) 515 ; (progn
514 (setq l (cdr l)))) 516 ; (setcdr l (cdr (cdr l)))
515 (setq minor-mode-map-alist (cons 'quail-mode minor-mode-map-alist)))) 517 ; (setq l nil))
518 ; (setq l (cdr l))))
519 ; (setq minor-mode-map-alist (cons 'quail-mode minor-mode-map-alist))))
520 ;; End bogus code removal.
521 (delete-if (lambda (item) (eq (car item) 'quail-mode))
522 minor-mode-map-alist)
523 (setq minor-mode-map-alist
524 (cons (cons 'quail-mode quail-mode-map) minor-mode-map-alist))
525
516 (if (null quail-current-package) 526 (if (null quail-current-package)
517 ;; Quail package is not yet selected. Select one now. 527 ;; Quail package is not yet selected. Select one now.
518 (let (name) 528 (let (name)
519 (if quail-package-alist 529 (if quail-package-alist
520 (setq name (car (car quail-package-alist))) 530 (setq name (car (car quail-package-alist)))