[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] feature/gnus-select 3b92c80 068/218: * lisp/subr.el (focus
From: |
Andrew G Cohen |
Subject: |
[Emacs-diffs] feature/gnus-select 3b92c80 068/218: * lisp/subr.el (focus-frame, unfocus-frame): Remove obsolete no-ops. |
Date: |
Fri, 14 Dec 2018 03:35:01 -0500 (EST) |
branch: feature/gnus-select
commit 3b92c80680bddab2cbd6bf8073e856cbbb81274d
Author: Glenn Morris <address@hidden>
Commit: Andrew G Cohen <address@hidden>
* 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.
---
etc/NEWS | 6 +++---
lisp/subr.el | 6 ------
lisp/vc/ediff-util.el | 4 ++--
3 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/etc/NEWS b/etc/NEWS
index ade9512..91c9d43 100644
--- 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 b621042..113bd97 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 be36273..1158b71 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)
- [Emacs-diffs] feature/gnus-select d25b161 042/218: Fix wrong behavior of 'outline-headers-as-kill' command (Bug#30209), (continued)
- [Emacs-diffs] feature/gnus-select d25b161 042/218: Fix wrong behavior of 'outline-headers-as-kill' command (Bug#30209), Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 064037f 050/218: * lisp/simple.el (mark-whole-buffer): Clarify its behavior., Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 906b8fb 048/218: Port to NetBSD tzalloc, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select fd1f96f 060/218: Replace use of the obsolete write-contents-hooks, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 7f35e7d 055/218: Improve documentation of Xref, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 2fe4ae7 057/218: Fix last change in Xref documentation, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select b92cf09 065/218: Stop mentioning options.el in doc, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 2005a72 069/218: Avoid assertion violation under visual-order-cursor-movement, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select b405149 072/218: * src/xdisp.c (Fwindow_text_pixel_size): Fix last change., Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select ea586a7 081/218: Fix problems caused by fontconfig-2.13.0, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 3b92c80 068/218: * lisp/subr.el (focus-frame, unfocus-frame): Remove obsolete no-ops.,
Andrew G Cohen <=
- [Emacs-diffs] feature/gnus-select 64c4ec0 082/218: More hydra.nixos.org logging for unfinished tests, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 066e71d 056/218: More changes in the Emacs manual, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 212e217 064/218: * lisp/loadhist.el (unload-hook-features-list): Remove obsolete alias., Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 88a19e4 080/218: * lisp/desktop.el: Make use some "new" functionality, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select d27fdc5 085/218: Fix an error in tramp-archive-test42-auto-load, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select e3338f2 078/218: Extend ert to print duration of single tests, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 7928693 020/218: Fix 'window-text-pixel-size' when display properties are around, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 850e683 023/218: ; Tiny fix for recent doc change, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 7a082db 022/218: Minor change in the manual, Andrew G Cohen, 2018/12/14
- [Emacs-diffs] feature/gnus-select 6e30330 041/218: Clarify that nil doesn't match itself as a cl-case clause (Bug#30749), Andrew G Cohen, 2018/12/14