[Emacs-diffs] Changes to emacs/lisp/international/mule-cmds.el

[Richard M. Stallman]

Index: emacs/lisp/international/mule-cmds.el
diff -c emacs/lisp/international/mule-cmds.el:1.235 
emacs/lisp/international/mule-cmds.el:1.236
*** emacs/lisp/international/mule-cmds.el:1.235 Fri Jun 27 16:19:21 2003
--- emacs/lisp/international/mule-cmds.el       Sat Jun 28 07:54:47 2003
***************
*** 64,73 ****
  (define-key-after mule-menu-keymap [set-language-environment]
    (list 'menu-item  "Set Language Environment" setup-language-environment-map
        :help "Multilingual environment suitable for a specific language"))
- (define-key-after menu-bar-options-menu [mouse-set-font]
-   '(menu-item "Set Font/Fontset" mouse-set-font
-              :visible (fboundp 'generate-fontset-menu)
-              :help "Select a font from list of known fonts/fontsets"))
  (define-key-after mule-menu-keymap [separator-mule]
    '("--")
    t)
--- 64,69 ----
***************
*** 1688,1698 ****
--- 1684,1699 ----
    (let ((coding (get-language-info language-name 'unibyte-display)))
      (if coding
        (standard-display-european-internal)
+ <<<<<<< mule-cmds.el
+       (dotimes (i 128)
+       (aset standard-display-table (+ i 128) nil))
+ =======
        ;; The following 2 lines undo the 8-bit display that we set up
        ;; in standard-display-european-internal, which see.  This is in
        ;; case the user has used standard-display-european earlier in
        ;; this session.  (The MS-DOS port doesn't use that setup, so it
        ;; doesn't need to undo it.)
+ >>>>>>> 1.234
        (standard-display-default (if (eq window-system 'pc) 128 160) 255)
        (aset standard-display-table 146 nil))
      (or (eq window-system 'pc)