--- a/lisp/ChangeLog	Sat Feb 07 17:13:37 2009 +0000
+++ b/lisp/ChangeLog	Sat Feb 07 18:31:21 2009 +0000
@@ -1,3 +1,19 @@
+2009-02-07  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* descr-text.el (describe-text-sexp):
+	pp is in packages, use cl-prettyprint instead. 
+	* mule/mule-coding.el (make-8-bit-generate-helper): 
+	Don't uselessly bind args-out-of-range, thank you the byte
+	compiler. 	
+	* mule/mule-coding.el (8-bit-fixed-query-coding-region): 
+	Don't uselessly bind previous-fail, thank you the byte compiler.
+	* tty-init.el (make-device-early-tty-entry-point): 
+	Set make-device-early-tty-entry-point-called-p, not 
+	pre-tty-win-initted, thank you the byte compiler. 
+	* unicode.el (unicode-query-coding-region): 
+	Don't uselessly bind invalid-sequence-p, thank you the
+	byte-compiler. 
+
 2009-02-07  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* coding.el (query-coding-clear-highlights): 

--- a/lisp/descr-text.el	Sat Feb 07 17:13:37 2009 +0000
+++ b/lisp/descr-text.el	Sat Feb 07 18:31:21 2009 +0000
@@ -58,7 +58,9 @@
   "Insert a short description of SEXP in the current buffer."
   ;; XEmacs change; use the widget functions. 
   (let ((pp (condition-case signal
-		(pp-to-string sexp)
+                ;; XEmacs change; pp is in packages, use cl-prettyprint
+                ;; instead.
+		(with-output-to-string (cl-prettyprint sexp))
 	      (error (prin1-to-string signal)))))
     (when (string-match "\n\\'" pp)
       (setq pp (substring pp 0 (1- (length pp)))))

--- a/lisp/mule/mule-coding.el	Sat Feb 07 17:13:37 2009 +0000
+++ b/lisp/mule/mule-coding.el	Sat Feb 07 18:31:21 2009 +0000
@@ -287,7 +287,7 @@
 	(charset-lower -1)
 	(charset-upper -1)
 	worth-trying known-charsets encode-program
-	other-charset-vector ucs args-out-of-range)
+	other-charset-vector ucs)
 
     (loop for char across decode-table
       do (pushnew (char-charset char) known-charsets))
@@ -297,7 +297,6 @@
       do
       ;; This is not possible for two dimensional charsets. 
       (when (eq 1 (charset-dimension known-charset))
-	(setq args-out-of-range t)
         (if (eq 'control-1 known-charset)
             (setq charset-lower 0
                   charset-upper 31)
@@ -677,7 +676,7 @@
 				'8-bit-fixed-invalid-sequences-skip-chars)))
 	(ranges (make-range-table))
         (case-fold-search nil)
-        char-after fail-range-start fail-range-end previous-fail extent
+        char-after fail-range-start fail-range-end extent
 	failed invalid-sequences-looking-at failed-reason
         previous-failed-reason)
     (check-type from-unicode hash-table)

--- a/lisp/tty-init.el	Sat Feb 07 17:13:37 2009 +0000
+++ b/lisp/tty-init.el	Sat Feb 07 18:31:21 2009 +0000
@@ -57,7 +57,7 @@
       (register-tty-color "brightcyan"    "\e[1;36m" "\e[1;46m")
       (register-tty-color "brightwhite"   "\e[1;37m" "\e[1;47m")
 
-      (setq pre-tty-win-initted t))))
+      (setq make-device-early-tty-entry-point-called-p t))))
 
 ;; We have to do this for every created TTY console, after the first frame
 ;; has been created.

--- a/lisp/unicode.el	Sat Feb 07 17:13:37 2009 +0000
+++ b/lisp/unicode.el	Sat Feb 07 18:31:21 2009 +0000
@@ -641,8 +641,7 @@
          (looking-at-arg (concat "[" skip-chars-arg "]"))
          (case-fold-search nil)
          fail-range-start fail-range-end char-after failed
-	 extent char-unicode invalid-sequence-p failed-reason
-         previous-failed-reason)
+	 extent char-unicode failed-reason previous-failed-reason)
     (save-excursion
       (when highlightp
         (query-coding-clear-highlights begin end buffer))