From: Gerd Moellmann Date: Tue, 31 Jul 2001 09:50:56 +0000 (+0000) Subject: (set-keyboard-coding-system): Set X-Git-Tag: emacs-pretest-21.0.105~346 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b23bad0b77191825b150ab7e35de74c21485546c;p=emacs.git (set-keyboard-coding-system): Set keyboard-coding-system. --- 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 + * 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