diff options
| author | Gerd Moellmann <gerd@gnu.org> | 2001-07-31 09:50:56 +0000 |
|---|---|---|
| committer | Gerd Moellmann <gerd@gnu.org> | 2001-07-31 09:50:56 +0000 |
| commit | b23bad0b77191825b150ab7e35de74c21485546c (patch) | |
| tree | 1cd280fb24bcea3b9df0e7097fae4b6c09238619 | |
| parent | 6b053e39e1da267866b17a0ce2752b888a5e526e (diff) | |
| download | emacs-b23bad0b77191825b150ab7e35de74c21485546c.tar.gz | |
(set-keyboard-coding-system): Set
keyboard-coding-system.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/international/mule.el | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9c747b9319a..a80a5a00f90 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2001-07-31 Gerd Moellmann <gerd@gnu.org> + * international/mule.el (set-keyboard-coding-system): Set + keyboard-coding-system. + * smerge-mode.el (smerge-mode): Check if `font-lock-mode' is bound before accessing it. diff --git a/lisp/international/mule.el b/lisp/international/mule.el index 5d86f69bdea..5609d5bffeb 100644 --- a/lisp/international/mule.el +++ b/lisp/international/mule.el @@ -1136,6 +1136,7 @@ or by the previous use of this command." (if coding-system (setq default-keyboard-coding-system coding-system)) (set-keyboard-coding-system-internal coding-system) + (setq keyboard-coding-system coding-system) (encoded-kbd-mode (if coding-system 1 0))) (defcustom keyboard-coding-system nil |