[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 0508d7c4d6: Remove now unused parameter TRACK from do_switch_fram
From: |
Alan Mackenzie |
Subject: |
master 0508d7c4d6: Remove now unused parameter TRACK from do_switch_frame. |
Date: |
Fri, 8 Jul 2022 16:32:46 -0400 (EDT) |
branch: master
commit 0508d7c4d6637d63a823b66e9f87ab54c2e73b09
Author: Alan Mackenzie <acm@muc.de>
Commit: Alan Mackenzie <acm@muc.de>
Remove now unused parameter TRACK from do_switch_frame.
* src/lisp.h (extern do_swith_frame declaration)
* src/frame.c (do_switch_frame): Remove parameter TRACK and its comment.
* src/frame.c (Fselect_frame, Fhandle_switch_frame, delete_frame)
* src/keyboard.c (quit_throw_to_read_char)
* src/minibuf.c (read_minibuf_unwind (twice))
* src/window.c (Fset_window_configuration): Remove argument TRACK.
---
src/frame.c | 12 ++++--------
src/keyboard.c | 2 +-
src/lisp.h | 2 +-
src/minibuf.c | 6 +++---
src/window.c | 2 +-
5 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/src/frame.c b/src/frame.c
index 4828595b93..923ef2d609 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1444,10 +1444,6 @@ affects all frames on the same terminal device. */)
If FRAME is a switch-frame event `(switch-frame FRAME1)', use
FRAME1 as frame.
- If TRACK is non-zero and the frame that currently has the focus
- redirects its focus to the selected frame, redirect that focused
- frame's focus to FRAME instead.
-
FOR_DELETION non-zero means that the selected frame is being
deleted, which includes the possibility that the frame's terminal
is dead.
@@ -1455,7 +1451,7 @@ affects all frames on the same terminal device. */)
The value of NORECORD is passed as argument to Fselect_window. */
Lisp_Object
-do_switch_frame (Lisp_Object frame, int track, int for_deletion, Lisp_Object
norecord)
+do_switch_frame (Lisp_Object frame, int for_deletion, Lisp_Object norecord)
{
struct frame *sf = SELECTED_FRAME (), *f;
@@ -1574,7 +1570,7 @@ This function returns FRAME, or nil if FRAME has been
deleted. */)
/* Do not select a tooltip frame (Bug#47207). */
error ("Cannot select a tooltip frame");
else
- return do_switch_frame (frame, 1, 0, norecord);
+ return do_switch_frame (frame, 0, norecord);
}
DEFUN ("handle-switch-frame", Fhandle_switch_frame,
@@ -1590,7 +1586,7 @@ necessarily represent user-visible input focus. */)
kset_prefix_arg (current_kboard, Vcurrent_prefix_arg);
run_hook (Qmouse_leave_buffer_hook);
- return do_switch_frame (event, 0, 0, Qnil);
+ return do_switch_frame (event, 0, Qnil);
}
DEFUN ("selected-frame", Fselected_frame, Sselected_frame, 0, 0, 0,
@@ -2105,7 +2101,7 @@ delete_frame (Lisp_Object frame, Lisp_Object force)
Fraise_frame (frame1);
#endif
- do_switch_frame (frame1, 0, 1, Qnil);
+ do_switch_frame (frame1, 1, Qnil);
sf = SELECTED_FRAME ();
}
else
diff --git a/src/keyboard.c b/src/keyboard.c
index a520e53397..7c13ac9611 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -11459,7 +11459,7 @@ quit_throw_to_read_char (bool from_signal)
if (FRAMEP (internal_last_event_frame)
&& !EQ (internal_last_event_frame, selected_frame))
do_switch_frame (make_lispy_switch_frame (internal_last_event_frame),
- 0, 0, Qnil);
+ 0, Qnil);
sys_longjmp (getcjmp, 1);
}
diff --git a/src/lisp.h b/src/lisp.h
index 35cc7f5a09..5ffc2bb038 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -4842,7 +4842,7 @@ extern void syms_of_indent (void);
/* Defined in frame.c. */
extern void store_frame_param (struct frame *, Lisp_Object, Lisp_Object);
extern void store_in_alist (Lisp_Object *, Lisp_Object, Lisp_Object);
-extern Lisp_Object do_switch_frame (Lisp_Object, int, int, Lisp_Object);
+extern Lisp_Object do_switch_frame (Lisp_Object, int, Lisp_Object);
extern Lisp_Object get_frame_param (struct frame *, Lisp_Object);
extern void frames_discard_buffer (Lisp_Object);
extern void init_frame_once (void);
diff --git a/src/minibuf.c b/src/minibuf.c
index c2e270a450..0fba334b22 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -1123,8 +1123,8 @@ read_minibuf_unwind (void)
found:
if (!EQ (exp_MB_frame, saved_selected_frame)
&& !NILP (exp_MB_frame))
- do_switch_frame (exp_MB_frame, 0, 0, Qt); /* This also sets
- minibuf_window */
+ do_switch_frame (exp_MB_frame, 0, Qt); /* This also sets
+ minibuf_window */
/* To keep things predictable, in case it matters, let's be in the
minibuffer when we reset the relevant variables. Don't depend on
@@ -1236,7 +1236,7 @@ read_minibuf_unwind (void)
/* Restore the selected frame. */
if (!EQ (exp_MB_frame, saved_selected_frame)
&& !NILP (exp_MB_frame))
- do_switch_frame (saved_selected_frame, 0, 0, Qt);
+ do_switch_frame (saved_selected_frame, 0, Qt);
}
/* Replace the expired minibuffer in frame exp_MB_frame with the next less
diff --git a/src/window.c b/src/window.c
index af463b90ce..70438b70b8 100644
--- a/src/window.c
+++ b/src/window.c
@@ -7299,7 +7299,7 @@ the return value is nil. Otherwise the value is t. */)
do_switch_frame (NILP (dont_set_frame)
? data->selected_frame
: old_frame
- , 0, 0, Qnil);
+ , 0, Qnil);
}
FRAME_WINDOW_CHANGE (f) = true;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 0508d7c4d6: Remove now unused parameter TRACK from do_switch_frame.,
Alan Mackenzie <=