[Emacs-diffs] Changes to emacs/lisp/international/encoded-kb.el

[Stefan Monnier]

Index: emacs/lisp/international/encoded-kb.el
diff -c emacs/lisp/international/encoded-kb.el:1.24 
emacs/lisp/international/encoded-kb.el:1.25
*** emacs/lisp/international/encoded-kb.el:1.24 Wed Nov 21 05:41:45 2001
--- emacs/lisp/international/encoded-kb.el      Fri Nov 30 19:18:21 2001
***************
*** 24,50 ****
  
  ;;; Code:
  
- (defvar encoded-kbd-mode nil
-   "Non-nil if in Encoded-kbd minor mode.")
- (put 'encoded-kbd-mode 'permanent-local t)
- 
- ;;; (let ((slot (assq 'encoded-kbd-mode minor-mode-alist))
- ;;;       (name " Encoded-kbd"))
- ;;;   (if slot
- ;;;       (setcar (cdr slot) name)
- ;;;     (setq minor-mode-alist
- ;;;     (cons '(encoded-kbd-mode " Encoded-kbd") minor-mode-alist))))
- 
  (defconst encoded-kbd-mode-map (make-sparse-keymap)
    "Keymap for Encoded-kbd minor mode.")
  
- (let ((slot (assq 'encoded-kbd-mode minor-mode-map-alist)))
-   (if slot
-       (setcdr slot encoded-kbd-mode-map)
-     (setq minor-mode-map-alist
-         (cons (cons 'encoded-kbd-mode encoded-kbd-mode-map)
-               minor-mode-map-alist))))
- 
  ;; Subsidiary keymaps for handling ISO2022 escape sequences.
  
  (defvar encoded-kbd-iso2022-esc-map
--- 24,32 ----
***************
*** 305,312 ****
  ;; Input mode at the time Encoded-kbd mode is turned on is saved here.
  (defvar saved-input-mode nil)
  
  ;;;###autoload
! (defun encoded-kbd-mode (&optional arg)
    "Toggle Encoded-kbd minor mode.
  With arg, turn Encoded-kbd mode on if and only if arg is positive.
  
--- 287,295 ----
  ;; Input mode at the time Encoded-kbd mode is turned on is saved here.
  (defvar saved-input-mode nil)
  
+ (put 'encoded-kbd-mode 'permanent-local t)
  ;;;###autoload
! (define-minor-mode encoded-kbd-mode
    "Toggle Encoded-kbd minor mode.
  With arg, turn Encoded-kbd mode on if and only if arg is positive.
  
***************
*** 317,328 ****
  In Encoded-kbd mode, a text sent from keyboard is accepted
  as a multilingual text encoded in a coding system set by
  \\[set-keyboard-coding-system]."
!   (if encoded-kbd-mode
!       ;; We must at first reset input-mode to the original.
!       (apply 'set-input-mode saved-input-mode))
!   (setq encoded-kbd-mode
!       (if (null arg) (null encoded-kbd-mode)
!         (> (prefix-numeric-value arg) 0)))
    (if encoded-kbd-mode
        (let ((coding (keyboard-coding-system)))
        (setq saved-input-mode  (current-input-mode))
--- 300,308 ----
  In Encoded-kbd mode, a text sent from keyboard is accepted
  as a multilingual text encoded in a coding system set by
  \\[set-keyboard-coding-system]."
!   :global t
!   ;; We must at first reset input-mode to the original.
!   (if saved-input-mode (apply 'set-input-mode saved-input-mode))
    (if encoded-kbd-mode
        (let ((coding (keyboard-coding-system)))
        (setq saved-input-mode  (current-input-mode))
***************
*** 374,380 ****
               (setq encoded-kbd-mode nil)
               (error "Coding-system `%s' is not supported in Encoded-kbd mode"
                      (keyboard-coding-system))))
!       (encoded-kbd-setup-keymap coding)
!       (run-hooks 'encoded-kbd-mode-hook))))
  
  ;;; encoded-kb.el ends here
--- 354,359 ----
               (setq encoded-kbd-mode nil)
               (error "Coding-system `%s' is not supported in Encoded-kbd mode"
                      (keyboard-coding-system))))
!       (encoded-kbd-setup-keymap coding))))
  
  ;;; encoded-kb.el ends here