Mercurial > hg > xemacs-beta
comparison lisp/mule/mule-cmds.el @ 778:2923009caf47
[xemacs-hg @ 2002-03-16 10:38:59 by ben]
cm.c, file-coding.c: fix warnings.
.cvsignore: Those pesky *.tmp files.
mule\arabic.el, mule\canna-leim.el, mule\china-util.el, mule\chinese.el, mule\cyril-util.el, mule\cyrillic.el, mule\devan-util.el, mule\devanagari.el, mule\english.el, mule\ethio-util.el, mule\ethiopic.el, mule\european.el, mule\greek.el, mule\hebrew.el, mule\indian.el, mule\japan-util.el, mule\japanese.el, mule\korea-util.el, mule\korean.el, mule\lao-util.el, mule\lao.el, mule\misc-lang.el, mule\mule-charset.el, mule\mule-cmds.el, mule\thai-util.el, mule\thai.el, mule\tibet-util.el, mule\tibetan.el, mule\viet-util.el, mule\vietnamese.el, unicode.el: Fix lots of warnings. Sync up some files to FSF 21.1. Copy over
all charset definitions from FSF 21.1, convert them to our format,
and stick them in the relevant files. Eventually we will actually
be able to dump these files (though they may not quite work).
autoload.el: Support defun*, defmacro*.
mule/mule-composite.el, mule/mule-composite-stub.el: New file, stubs for
nonexistent composition funs/vars.
mule/viet-chars.el, dumped-lisp.el: Account for these changes.
font.el, mouse.el, msw-font-menu.el, printer.el, startup.el: fix warnings.
author | ben |
---|---|
date | Sat, 16 Mar 2002 10:39:19 +0000 |
parents | 943eaba38521 |
children | 2b676dc88c66 |
comparison
equal
deleted
inserted
replaced
777:e65d9cf16707 | 778:2923009caf47 |
---|---|
1108 ;; and return it. first we check the langenv-to-locale table | 1108 ;; and return it. first we check the langenv-to-locale table |
1109 ;; ... | 1109 ;; ... |
1110 (let ((ms-locale | 1110 (let ((ms-locale |
1111 (gethash langenv mswindows-langenv-to-locale-table))) | 1111 (gethash langenv mswindows-langenv-to-locale-table))) |
1112 (if ms-locale (progn | 1112 (if ms-locale (progn |
1113 (mswindows-set-current-locale ms-locale) | 1113 (declare-fboundp (mswindows-set-current-locale |
1114 ms-locale)) | |
1114 ms-locale) | 1115 ms-locale) |
1115 ;; ... if not, see if the langenv specifies any locale(s). | 1116 ;; ... if not, see if the langenv specifies any locale(s). |
1116 ;; if not, construct one from the langenv name. | 1117 ;; if not, construct one from the langenv name. |
1117 (let* ((mslocs (get-language-info langenv 'mswindows-locale)) | 1118 (let* ((mslocs (get-language-info langenv 'mswindows-locale)) |
1118 (mslocs (or mslocs (cons (upcase langenv) "DEFAULT"))) | 1119 (mslocs (or mslocs (cons (upcase langenv) "DEFAULT"))) |
1127 ;; gives Taiwan (DEFAULT), the former PRC (SYS_DEFAULT). | 1128 ;; gives Taiwan (DEFAULT), the former PRC (SYS_DEFAULT). |
1128 ;; In the interests of consistency, we always use DEFAULT. | 1129 ;; In the interests of consistency, we always use DEFAULT. |
1129 (or (consp msloc) (setq msloc (cons msloc "DEFAULT"))) | 1130 (or (consp msloc) (setq msloc (cons msloc "DEFAULT"))) |
1130 (when (condition-case nil | 1131 (when (condition-case nil |
1131 (progn | 1132 (progn |
1132 (mswindows-set-current-locale msloc) | 1133 (declare-fboundp (mswindows-set-current-locale |
1134 msloc)) | |
1133 t) | 1135 t) |
1134 (error nil)) | 1136 (error nil)) |
1135 (return msloc)))))))) | 1137 (return msloc)))))))) |
1136 (if (eq system-type 'windows-nt) | 1138 (if (eq system-type 'windows-nt) |
1137 (let ((ms-locale (mswindows-get-and-set-locale-from-langenv langenv))) | 1139 (let ((ms-locale (mswindows-get-and-set-locale-from-langenv langenv))) |
1196 | 1198 |
1197 The optional arg EOL-TYPE specifies the eol-type of the default value | 1199 The optional arg EOL-TYPE specifies the eol-type of the default value |
1198 of buffer-file-coding-system set by this function." | 1200 of buffer-file-coding-system set by this function." |
1199 | 1201 |
1200 ;; The following appeared as the third paragraph of the doc string for this | 1202 ;; The following appeared as the third paragraph of the doc string for this |
1201 ;; function, but it's not in FSF 21.0.103, and it's not true, since we call | 1203 ;; function, but it's not in FSF 21.1, and it's not true, since we call |
1202 ;; reset-coding-categories-to-default before calling this function. #### | 1204 ;; reset-coding-categories-to-default before calling this function. #### |
1203 ;; Should we rethink this? | 1205 ;; Should we rethink this? |
1204 | 1206 |
1205 ; Note that `coding-priority-list' is not reset first; thus changing language | 1207 ; Note that `coding-priority-list' is not reset first; thus changing language |
1206 ; environment allows recognition of coding systems from previously set language | 1208 ; environment allows recognition of coding systems from previously set language |
1285 ;; -- coding categories (for detection) | 1287 ;; -- coding categories (for detection) |
1286 | 1288 |
1287 (let (langenv) | 1289 (let (langenv) |
1288 ;; under ms windows (any): | 1290 ;; under ms windows (any): |
1289 (if (memq system-type '(windows-nt cygwin32)) | 1291 (if (memq system-type '(windows-nt cygwin32)) |
1290 (let ((userdef (mswindows-user-default-locale)) | 1292 (let ((userdef (declare-fboundp (mswindows-user-default-locale))) |
1291 (sysdef (mswindows-system-default-locale))) | 1293 (sysdef (declare-fboundp (mswindows-system-default-locale)))) |
1292 ;; (1) current langenv comes from user-default locale. | 1294 ;; (1) current langenv comes from user-default locale. |
1293 (setq langenv (mswindows-get-language-environment-from-locale | 1295 (setq langenv (mswindows-get-language-environment-from-locale |
1294 userdef)) | 1296 userdef)) |
1295 ;; (2) init the langenv-to-locale table. | 1297 ;; (2) init the langenv-to-locale table. |
1296 (puthash (mswindows-get-language-environment-from-locale sysdef) | 1298 (puthash (mswindows-get-language-environment-from-locale sysdef) |
1308 ;; (4) override current MS Windows locale with the user-default | 1310 ;; (4) override current MS Windows locale with the user-default |
1309 ;; locale. Always init the MS Windows locale from the | 1311 ;; locale. Always init the MS Windows locale from the |
1310 ;; user-default locale even if the langenv doesn't correspond; | 1312 ;; user-default locale even if the langenv doesn't correspond; |
1311 ;; we might not be able to find a langenv for the user-default | 1313 ;; we might not be able to find a langenv for the user-default |
1312 ;; locale but we should still use the right code page, etc. | 1314 ;; locale but we should still use the right code page, etc. |
1313 (mswindows-set-current-locale userdef)) | 1315 (declare-fboundp (mswindows-set-current-locale userdef))) |
1314 ;; Unix: | 1316 ;; Unix: |
1315 (let ((locstring (set-current-locale ""))) | 1317 (let ((locstring (set-current-locale ""))) |
1316 ;; assume C lib locale and LANG env var are set correctly. use | 1318 ;; assume C lib locale and LANG env var are set correctly. use |
1317 ;; them to find the langenv. | 1319 ;; them to find the langenv. |
1318 (setq langenv | 1320 (setq langenv |