Commit 9f8e7712 authored by Glenn Morris's avatar Glenn Morris
Browse files

* 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.
parent 2734e29f
......@@ -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,
......
......@@ -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")
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment