Minor eieio-comp changes.

* lisp/emacs-lisp/eieio-comp.el (byte-compile-file-form-defmethod):
Use boundp tests to silence compiler.  Update for changed name of
bytecomp-filename variable.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5bf9f565ca0cede4352e01517c296cd2204e00ad..da40654f0ded7c479e27e1a2714402d4d700c895 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2010-11-06  Glenn Morris  <rgm@gnu.org>
 
+       * emacs-lisp/eieio-comp.el (byte-compile-file-form-defmethod):
+       Use boundp tests to silence compiler.  Update for changed name of
+       bytecomp-filename variable.
+
        * emulation/viper-cmd.el (viper-read-string-with-history):
        Prefix dynamic local `initial'.
        (viper-minibuffer-standard-hook): Update for above name change.

diff --git a/lisp/emacs-lisp/eieio-comp.el b/lisp/emacs-lisp/eieio-comp.el
index 0e76f4bb3312483d5a022389bceb31bc8087f5db..e07a7b20d14a8a41cde93e744e9fb155191d1188 100644 (file)
--- a/lisp/emacs-lisp/eieio-comp.el
+++ b/lisp/emacs-lisp/eieio-comp.el
@@ -47,10 +47,6 @@
 ;; This teaches the byte compiler how to do this sort of thing.
 (put 'defmethod 'byte-hunk-handler 'byte-compile-file-form-defmethod)
 
-;; Variables used free:
-(defvar outbuffer)
-(defvar filename)
-
 (defun byte-compile-file-form-defmethod (form)
   "Mumble about the method we are compiling.
 This function is mostly ripped from `byte-compile-file-form-defun',
@@ -83,14 +79,18 @@ that is called but rarely.  Argument FORM is the body of the method."
         (class (if (listp arg1) (nth 1 arg1) nil))
         (my-outbuffer (if (eval-when-compile (featurep 'xemacs))
                           byte-compile-outbuffer
-                        (condition-case nil
-                            bytecomp-outbuffer
-                          (error outbuffer))))
-        )
+                        (cond ((boundp 'bytecomp-outbuffer)
+                               bytecomp-outbuffer) ; Emacs >= 23.2
+                              ((boundp 'outbuffer) outbuffer)
+                              (t (error "Unable to set outbuffer"))))))
     (let ((name (format "%s::%s" (or class "#<generic>") meth)))
       (if byte-compile-verbose
          ;; #### filename used free
-         (message "Compiling %s... (%s)" (or filename "") name))
+         (message "Compiling %s... (%s)"
+                  (cond ((boundp 'bytecomp-filename) bytecomp-filename)
+                        ((boundp 'filename) filename)
+                        (t ""))
+                  name))
       (setq byte-compile-current-form name) ; for warnings
       )
     ;; Flush any pending output
@@ -139,5 +139,4 @@ Argument PARAMLIST is the parameter list to convert."
 
 (provide 'eieio-comp)
 
-;; arch-tag: f2aacdd3-1da2-4ee9-b3e5-e8eac0832ee3
 ;;; eieio-comp.el ends here