Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-71

Merge from emacs--cvs-trunk--0

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-692
   Update from CVS

2 files changed, 19 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d1826a7fade..4d222e66fcd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -13,6 +13,21 @@
 
 2004-11-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * emacs-lisp/byte-opt.el (byte-compile-inline-expand): Understand the
+        new byte-compile-function-environment binding to t.
+
+        * font-lock.el (font-lock-fontify-syntactically-region):
+        Don't forget to highlight the last char when we hit `end'.
+
+        * mwheel.el (mouse-wheel-progressive-speed): Fix typo in name.
+        (mwheel-scroll): Adjust accordingly.
+
+        * cvs-status.el: Reduce spurious warnings.
+        (cvs-status-checkout): Remove.
+        (cvs-status-mode-map): Use cvs-mode-checkout instead.
+
+        * pcvs.el (cvs-mode-checkout): New command.
+
         * international/iso-cvt.el (iso-cvt-define-menu): Fix typo.
 
         * tooltip.el: Require CL.
diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el
index 18913893642..62919c5b5c7 100644
--- a/lisp/emacs-lisp/byte-opt.el
+++ b/lisp/emacs-lisp/byte-opt.el
@@ -1,6 +1,7 @@
 ;;; byte-opt.el --- the optimization passes of the emacs-lisp byte compiler
 
-;; Copyright (c) 1991,1994,2000,01,02,2004  Free Software Foundation, Inc.
+;; Copyright (c) 1991, 1994, 2000, 2001, 2002, 2004
+;;           Free Software Foundation, Inc.
 
 ;; Author: Jamie Zawinski <jwz@lucid.com>
 ;;      Hallvard Furuseth <hbf@ulrik.uio.no>
@@ -266,7 +267,7 @@
                      (cdr (assq name byte-compile-function-environment)))))
       (if (and (consp fn) (eq (car fn) 'autoload))
           (error "File `%s' didn't define `%s'" (nth 1 fn) name))
-      (if (symbolp fn)
+      (if (and (symbolp fn) (not (eq fn t)))
           (byte-compile-inline-expand (cons fn (cdr form)))
         (if (byte-code-function-p fn)
             (let (string)
@@ -2037,5 +2038,5 @@ If FOR-EFFECT is non-nil, the return value is assumed to be of no importance."
                  byte-optimize-lapcode))))
  nil)
 
-;;; arch-tag: 0f14076b-737e-4bef-aae6-908826ec1ff1
+;; arch-tag: 0f14076b-737e-4bef-aae6-908826ec1ff1
 ;;; byte-opt.el ends here