* 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.

diff --git a/etc/NEWS b/etc/NEWS
index ade95125d25c2a1ead25df4a8fda9424d26f4229..91c9d4312429fb2c4b4e1dc27ff305e69e4bba01 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -333,8 +333,8 @@ desktop-basefilename, desktop-buffer-handlers,
 desktop-buffer-misc-functions, desktop-buffer-modes-to-save,
 desktop-enable, desktop-load-default, dired-omit-files-p,
 disabled-command-hook, dungeon-mode-map, electric-nroff-mode,
-electric-nroff-newline, electric-perl-terminator, forward-text-line,
-generic-define-mswindows-modes, generic-define-unix-modes,
+electric-nroff-newline, electric-perl-terminator, focus-frame,
+forward-text-line, generic-define-mswindows-modes, generic-define-unix-modes,
 generic-font-lock-defaults, goto-address-at-mouse,
 highlight-changes-colours, ibuffer-elide-long-columns, ibuffer-hooks,
 ibuffer-mode-hooks, icalendar-convert-diary-to-ical,
@@ -351,7 +351,7 @@ speedbar-add-ignored-path-regexp, speedbar-buffers-line-path,
 speedbar-buffers-line-path, speedbar-ignored-path-expressions,
 speedbar-ignored-path-regexp, speedbar-line-path, speedbar-path-line,
 timer-set-time-with-usecs, tooltip-gud-display, tooltip-gud-modes,
-tooltip-gud-toggle-dereference, unload-hook-features-list,
+tooltip-gud-toggle-dereference, unfocus-frame, unload-hook-features-list,
 update-autoloads-from-directories, vc-comment-ring, vc-comment-ring-index,
 vc-comment-search-forward, vc-comment-search-reverse, vc-comment-to-change-log,
 vc-diff-switches-list, vc-next-comment, vc-previous-comment, view-todo,

diff --git a/lisp/subr.el b/lisp/subr.el
index b621042c233736ceaae36a7c142a5be43c90dff6..113bd978b63e9150fb1d390b6826ba5cb49194ee 100644 (file)
--- 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 be36273592b8b1c4db8a1d8700ef4a75ed715e3a..1158b7146e2e4538df96ecafbc53fc3d9c0ace3f 100644 (file)
--- 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)