/[emacs]/emacs/lisp/international/mule-cmds.el
ViewVC logotype

Diff of /emacs/lisp/international/mule-cmds.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.235 by kai, Fri Jun 27 20:19:21 2003 UTC revision 1.236 by rms, Sat Jun 28 11:54:47 2003 UTC
# Line 64  Line 64 
64  (define-key-after mule-menu-keymap [set-language-environment]  (define-key-after mule-menu-keymap [set-language-environment]
65    (list 'menu-item  "Set Language Environment" setup-language-environment-map    (list 'menu-item  "Set Language Environment" setup-language-environment-map
66          :help "Multilingual environment suitable for a specific language"))          :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"))  
67  (define-key-after mule-menu-keymap [separator-mule]  (define-key-after mule-menu-keymap [separator-mule]
68    '("--")    '("--")
69    t)    t)
# Line 1688  The default status is as follows: Line 1684  The default status is as follows:
1684    (let ((coding (get-language-info language-name 'unibyte-display)))    (let ((coding (get-language-info language-name 'unibyte-display)))
1685      (if coding      (if coding
1686          (standard-display-european-internal)          (standard-display-european-internal)
1687    <<<<<<< mule-cmds.el
1688          (dotimes (i 128)
1689            (aset standard-display-table (+ i 128) nil))
1690    =======
1691        ;; The following 2 lines undo the 8-bit display that we set up        ;; The following 2 lines undo the 8-bit display that we set up
1692        ;; in standard-display-european-internal, which see.  This is in        ;; in standard-display-european-internal, which see.  This is in
1693        ;; case the user has used standard-display-european earlier in        ;; case the user has used standard-display-european earlier in
1694        ;; this session.  (The MS-DOS port doesn't use that setup, so it        ;; this session.  (The MS-DOS port doesn't use that setup, so it
1695        ;; doesn't need to undo it.)        ;; doesn't need to undo it.)
1696    >>>>>>> 1.234
1697        (standard-display-default (if (eq window-system 'pc) 128 160) 255)        (standard-display-default (if (eq window-system 'pc) 128 160) 255)
1698        (aset standard-display-table 146 nil))        (aset standard-display-table 146 nil))
1699      (or (eq window-system 'pc)      (or (eq window-system 'pc)

Legend:
Removed from v.1.235  
changed lines
  Added in v.1.236

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26