Mercurial > hg > xemacs-beta

diff lisp/mule/mule-cmds.el @ 778:2923009caf47

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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
line wrap: on
line diff
--- a/lisp/mule/mule-cmds.el	Fri Mar 15 11:00:56 2002 +0000
+++ b/lisp/mule/mule-cmds.el	Sat Mar 16 10:39:19 2002 +0000
@@ -1110,7 +1110,8 @@
 	   (let ((ms-locale
 		  (gethash langenv mswindows-langenv-to-locale-table)))
 	     (if ms-locale (progn
-			  (mswindows-set-current-locale ms-locale)
+			  (declare-fboundp (mswindows-set-current-locale
+					    ms-locale))
 			  ms-locale)
 	       ;; ... if not, see if the langenv specifies any locale(s).
 	       ;; if not, construct one from the langenv name.
@@ -1129,7 +1130,8 @@
 		   (or (consp msloc) (setq msloc (cons msloc "DEFAULT")))
 		   (when (condition-case nil
 			     (progn
-			       (mswindows-set-current-locale msloc)
+			       (declare-fboundp (mswindows-set-current-locale
+						 msloc))
 			       t)
 			   (error nil))
 		     (return msloc))))))))
@@ -1198,7 +1200,7 @@
 of buffer-file-coding-system set by this function."
 
 ;; The following appeared as the third paragraph of the doc string for this
-;; function, but it's not in FSF 21.0.103, and it's not true, since we call
+;; function, but it's not in FSF 21.1, and it's not true, since we call
 ;; reset-coding-categories-to-default before calling this function.  ####
 ;; Should we rethink this?
 
@@ -1287,8 +1289,8 @@
   (let (langenv)
     ;; under ms windows (any):
     (if (memq system-type '(windows-nt cygwin32))
-      (let ((userdef (mswindows-user-default-locale))
-	    (sysdef (mswindows-system-default-locale)))
+      (let ((userdef (declare-fboundp (mswindows-user-default-locale)))
+	    (sysdef (declare-fboundp (mswindows-system-default-locale))))
 	;; (1) current langenv comes from user-default locale.
 	(setq langenv (mswindows-get-language-environment-from-locale
 		       userdef))
@@ -1310,7 +1312,7 @@
 	;;     user-default locale even if the langenv doesn't correspond;
 	;;     we might not be able to find a langenv for the user-default
 	;;     locale but we should still use the right code page, etc.
-	(mswindows-set-current-locale userdef))
+	(declare-fboundp (mswindows-set-current-locale userdef)))
       ;; Unix:
       (let ((locstring (set-current-locale "")))
 	;; assume C lib locale and LANG env var are set correctly.  use