diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-03-12 23:42:17 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-03-12 23:42:17 -0700 |
| commit | 9f8e7712d98f49dfdd6975f781bc392b50394120 (patch) | |
| tree | bbdd1855fbbdfaa2bd58a7bd143835c6bc1d3dd3 | |
| parent | 2734e29ff5b10b97196b4da32606524eefa47653 (diff) | |
| download | emacs-9f8e7712d98f49dfdd6975f781bc392b50394120.tar.gz | |
* 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.
| -rw-r--r-- | etc/NEWS | 6 | ||||
| -rw-r--r-- | lisp/subr.el | 6 | ||||
| -rw-r--r-- | lisp/vc/ediff-util.el | 4 |
3 files changed, 5 insertions, 11 deletions
@@ -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 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) |