# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1209177171 0
# Node ID b5f8ef4e33580d33016621c9a2b2a8725fca08e0
# Parent  26ba760c38d0d55543e6ee9ed4fb3aa21fc4d072
(byte-compile-warn-obsolete): New function.
(byte-compile-obsolete, byte-compile-variable-ref): Use it.

diff -r 26ba760c38d0 -r b5f8ef4e3358 lisp/emacs-lisp/bytecomp.el
--- a/lisp/emacs-lisp/bytecomp.el	Sat Apr 26 02:32:33 2008 +0000
+++ b/lisp/emacs-lisp/bytecomp.el	Sat Apr 26 02:32:51 2008 +0000
@@ -1106,6 +1106,22 @@
       (error "%s" format)		; byte-compile-file catches and logs it
     (byte-compile-log-warning format t :warning)))
 
+(defun byte-compile-warn-obsolete (symbol)
+  "Warn that SYMBOL (a variable or function) is obsolete."
+  (when (byte-compile-warning-enabled-p 'obsolete)
+    (let* ((funcp (get symbol 'byte-obsolete-info))
+	   (obsolete (or funcp (get symbol 'byte-obsolete-variable)))
+	   (instead (car obsolete))
+	   (asof (if funcp (nth 2 obsolete) (cdr obsolete))))
+      (byte-compile-warn "`%s' is an obsolete %s%s%s" symbol
+			 (if funcp "function" "variable")
+			 (if asof (concat " (as of Emacs " asof ")") "")
+			 (cond ((stringp instead)
+				(concat "; " instead))
+			       (instead
+				(format "; use `%s' instead." instead))
+			       (t "."))))))
+
 (defun byte-compile-report-error (error-info)
   "Report Lisp error in compilation.  ERROR-INFO is the error data."
   (setq byte-compiler-error-flag t)
@@ -1115,19 +1131,10 @@
 
 ;;; Used by make-obsolete.
 (defun byte-compile-obsolete (form)
-  (let* ((new (get (car form) 'byte-obsolete-info))
-	 (use (car new))
-	 (handler (nth 1 new))
-	 (when (nth 2 new)))
-    (byte-compile-set-symbol-position (car form))
-    (if (byte-compile-warning-enabled-p 'obsolete)
-	(byte-compile-warn "`%s' is an obsolete function%s%s" (car form)
-			   (if when (concat " (as of Emacs " when ")") "")
-			   (cond ((stringp use)
-				  (concat "; " use))
-				 (use (format "; use `%s' instead." use))
-				 (t "."))))
-    (funcall (or handler 'byte-compile-normal-call) form)))
+  (byte-compile-set-symbol-position (car form))
+  (byte-compile-warn-obsolete (car form))
+  (funcall (or (cadr (get (car form) 'byte-obsolete-info)) ; handler
+	       'byte-compile-normal-call) form))
 
 ;; Compiler options
 
@@ -2930,16 +2937,9 @@
 	     (t "variable reference to %s `%s'"))
        (if (symbolp var) "constant" "nonvariable")
        (prin1-to-string var))
-    (if (and (get var 'byte-obsolete-variable)
-	     (byte-compile-warning-enabled-p 'obsolete)
-	     (not (eq var byte-compile-not-obsolete-var)))
-	(let* ((ob (get var 'byte-obsolete-variable))
-	       (when (cdr ob)))
-	  (byte-compile-warn "`%s' is an obsolete variable%s; %s" var
-			     (if when (concat " (as of Emacs " when ")") "")
-			     (if (stringp (car ob))
-				 (car ob)
-			       (format "use `%s' instead." (car ob))))))
+    (and (get var 'byte-obsolete-variable)
+	 (not (eq var byte-compile-not-obsolete-var))
+	 (byte-compile-warn-obsolete var))
     (if (byte-compile-warning-enabled-p 'free-vars)
 	(if (eq base-op 'byte-varbind)
 	    (push var byte-compile-bound-variables)