diff lisp/international/mule.el @ 83548:c71725faff1a

Merged from [e-mail]. Last-minute emacsclient rewrites be damned! Patches applied: * [e-mail]/emacs--devo--0--patch-490 Update from CVS * [e-mail]/emacs--devo--0--patch-491 Update from CVS * [e-mail]/emacs--devo--0--patch-492 Update from CVS * [e-mail]/emacs--devo--0--patch-493 Update from CVS * [e-mail]/emacs--devo--0--patch-494 Update from CVS * [e-mail]/emacs--devo--0--patch-495 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-496 Update from CVS * [e-mail]/emacs--devo--0--patch-497 Update from CVS * [e-mail]/emacs--devo--0--patch-498 Update from CVS * [e-mail]/emacs--devo--0--patch-499 Update from CVS * [e-mail]/emacs--devo--0--patch-500 Update from CVS * [e-mail]/emacs--devo--0--patch-501 Update from CVS * [e-mail]/emacs--devo--0--patch-502 Update from CVS * [e-mail]/emacs--devo--0--patch-503 Update from CVS * [e-mail]/emacs--devo--0--patch-504 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-505 Update from CVS * [e-mail]/emacs--devo--0--patch-506 Update from CVS * [e-mail]/emacs--devo--0--patch-507 Update from CVS * [e-mail]/emacs--devo--0--patch-508 Update from CVS * [e-mail]/emacs--devo--0--patch-509 Update from CVS * [e-mail]/emacs--devo--0--patch-510 Update from CVS * [e-mail]/emacs--devo--0--patch-511 Update from CVS * [e-mail]/emacs--devo--0--patch-512 Update from CVS * [e-mail]/emacs--devo--0--patch-513 Update from CVS * [e-mail]/emacs--devo--0--patch-514 Update from CVS * [e-mail]/emacs--devo--0--patch-515 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-516 Update from CVS * [e-mail]/emacs--devo--0--patch-517 Update from CVS * [e-mail]/emacs--devo--0--patch-518 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-519 Update from CVS: etc/TUTORIAL.cn: Updated. * [e-mail]/emacs--devo--0--patch-520 Merge from erc--emacs--22 * [e-mail]/emacs--devo--0--patch-521 Update from CVS * [e-mail]/emacs--devo--0--patch-522 Update from CVS * [e-mail]/emacs--devo--0--patch-523 Update from CVS * [e-mail]/emacs--devo--0--patch-524 Update from CVS * [e-mail]/emacs--devo--0--patch-525 Update from CVS * [e-mail]/emacs--devo--0--patch-526 Update from CVS * [e-mail]/emacs--devo--0--patch-527 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-528 Update from CVS * [e-mail]/emacs--devo--0--patch-529 Update from CVS * [e-mail]/emacs--devo--0--patch-530 Update from CVS * [e-mail]/emacs--devo--0--patch-531 Update from CVS * [e-mail]/emacs--devo--0--patch-532 Update from CVS * [e-mail]/emacs--devo--0--patch-533 Update from CVS * [e-mail]/emacs--devo--0--patch-534 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-535 Update from CVS * [e-mail]/gnus--rel--5.10--patch-161 Update from CVS * [e-mail]/gnus--rel--5.10--patch-162 Update from CVS * [e-mail]/gnus--rel--5.10--patch-163 Merge from emacs--devo--0 * [e-mail]/gnus--rel--5.10--patch-164 Update from CVS * [e-mail]/gnus--rel--5.10--patch-165 Update from CVS * [e-mail]/gnus--rel--5.10--patch-166 Update from CVS * [e-mail]/gnus--rel--5.10--patch-167 Update from CVS * [e-mail]/gnus--rel--5.10--patch-168 Update from CVS * [e-mail]/gnus--rel--5.10--patch-169 Merge from emacs--devo--0 * [e-mail]/gnus--rel--5.10--patch-170 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-588

--- a/lisp/international/mule.el	Sun Dec 03 12:36:08 2006 +0000
+++ b/lisp/international/mule.el	Sun Dec 03 15:03:30 2006 +0000
@@ -38,10 +38,10 @@
 (defun load-with-code-conversion (fullname file &optional noerror nomessage)
   "Execute a file of Lisp code named FILE whose absolute name is FULLNAME.
 The file contents are decoded before evaluation if necessary.
-If optional second arg NOERROR is non-nil,
+If optional third arg NOERROR is non-nil,
  report no error if FILE doesn't exist.
 Print messages at start and end of loading unless
- optional third arg NOMESSAGE is non-nil.
+ optional fourth arg NOMESSAGE is non-nil.
 Return t if file exists."
   (if (null (file-readable-p fullname))
       (and (null noerror)
@@ -71,8 +71,7 @@
 	  (let ((load-file-name fullname)
 		(set-auto-coding-for-load t)
 		(inhibit-file-name-operation nil))
-	    (save-excursion
-	      (set-buffer buffer)
+	    (with-current-buffer buffer
 	      ;; Don't let deactivate-mark remain set.
 	      (let (deactivate-mark)
 		(insert-file-contents fullname))
@@ -100,7 +99,7 @@
 	  (kill-buffer buffer)))
       (unless purify-flag
  	(do-after-load-evaluation fullname))
-      
+
       (unless (or nomessage noninteractive)
 	(if source
 	    (message "Loading %s (source)...done" file)
@@ -118,7 +117,7 @@
 	      (< (aref vector 0) 160)))))
 
 (defsubst charsetp (object)
-  "T if OBJECT is a charset."
+  "Return t if OBJECT is a charset."
   (and (symbolp object) (vectorp (get object 'charset))))
 
 (defsubst charset-info (charset)
@@ -268,7 +267,7 @@
 CODE1 and CODE2 are optional, but if you don't supply
 sufficient position codes, return a generic character which stands for
 all characters or group of characters in the character set.
-A generic character can be used to index a char table (e.g. syntax-table).
+A generic character can be used to index a char table (e.g. `syntax-table').
 
 Such character sets as ascii, eight-bit-control, and eight-bit-graphic
 don't have corresponding generic characters.  If CHARSET is one of
@@ -1683,8 +1682,7 @@
 system and SOURCE is a symbol `auto-coding-alist',
 `auto-coding-regexp-alist', `coding:', or `auto-coding-functions'
 indicating by what CODING is specified.  Note that the validity
-of CODING is not checked; it's callers responsibility to check
-it.
+of CODING is not checked; it's callers responsibility to check it.
 
 If nothing is specified, the return value is nil."
   (or (let ((coding-system (auto-coding-alist-lookup filename)))
@@ -1705,7 +1703,7 @@
 	;; and for "unibyte:" at the head and tail of SIZE bytes.
 	(setq head-found (or (search-forward "coding:" head-end t)
 			     (search-forward "unibyte:" head-end t)
-			     (search-forward "enable-character-translation:" 
+			     (search-forward "enable-character-translation:"
 					     head-end t)))
 	(if (and head-found (> head-found tail-start))
 	    ;; Head and tail are overlapped.
@@ -1879,7 +1877,7 @@
 		      (set-buffer-multibyte nil))
 		  (set-buffer-multibyte nil))
 		(setq inserted (- pos-marker (point)))))
-	  (set-buffer-modified-p modified-p))))
+	  (restore-buffer-modified-p modified-p))))
   inserted)
 
 ;; The coding-spec and eol-type of coding-system returned is decided
@@ -2231,8 +2229,7 @@
 	   (progn
 	     (set-category-table ,table)
 	     ,@body)
-	 (save-current-buffer
-	   (set-buffer ,old-buffer)
+	 (with-current-buffer ,old-buffer
 	   (set-category-table ,old-table))))))
 
 (defun define-translation-hash-table (symbol table)