* lisp/subr.el (focus-frame, unfocus-frame): Remove obsolete no-ops.

* lisp/vc/ediff-util.el (ediff-recenter):
Don't try focus-frame on Emacs.
; * etc/NEWS: Mention this.
; Comments in subr.el mention VM as a user, however this is untrue since
; 2010-07.  Ref https://bazaar.launchpad.net/~vm/vm/trunk/revision/840
; and 853.

2 files changed, 2 insertions, 8 deletions

diff --git a/lisp/subr.el b/lisp/subr.el
index b621042c233..113bd978b63 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1449,12 +1449,6 @@ be a list of the form returned by `event-start' and `event-end'."
   (declare (obsolete log "24.4"))
   (log x 10))
 
-;; These are used by VM and some old programs
-(defalias 'focus-frame 'ignore "")
-(make-obsolete 'focus-frame "it does nothing." "22.1")
-(defalias 'unfocus-frame 'ignore "")
-(make-obsolete 'unfocus-frame "it does nothing." "22.1")
-
 (set-advertised-calling-convention
  'all-completions '(string collection &optional predicate) "23.1")
 (set-advertised-calling-convention 'unintern '(name obarray) "23.3")
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index be36273592b..1158b7146e2 100644
--- a/lisp/vc/ediff-util.el
+++ b/lisp/vc/ediff-util.el
@@ -778,8 +778,8 @@ Reestablish the default window display."
           (select-frame-set-input-focus ediff-control-frame)
         (raise-frame ediff-control-frame)
         (select-frame ediff-control-frame)
-        (if (fboundp 'focus-frame)
-            (focus-frame ediff-control-frame))))
+        (and (featurep 'xemacs) (fboundp 'focus-frame)
+             (focus-frame ediff-control-frame))))
 
   ;; Redisplay whatever buffers are showing, if there is a selected difference
   (let ((control-frame ediff-control-frame)