diff options
| author | Kim F. Storm | 2006-07-12 13:22:00 +0000 |
|---|---|---|
| committer | Kim F. Storm | 2006-07-12 13:22:00 +0000 |
| commit | 663fbbba4d9f50656e3f278fda1f38f3eafd2339 (patch) | |
| tree | 41aad98dc3e1c052afe90540685c448750a2d7b3 /src | |
| parent | 47f5f6ae553af87d5d1975ae5848b98ebd422de3 (diff) | |
| download | emacs-663fbbba4d9f50656e3f278fda1f38f3eafd2339.tar.gz emacs-663fbbba4d9f50656e3f278fda1f38f3eafd2339.zip | |
(Fwindow_configuration_frame, Fset_window_configuration):
(compare_window_configurations): Use CHECK_WINDOW_CONFIGURATION.
Diffstat (limited to 'src')
| -rw-r--r-- | src/window.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/window.c b/src/window.c index c68c67c0afa..6859fc92f30 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -5883,8 +5883,7 @@ DEFUN ("window-configuration-frame", Fwindow_configuration_frame, Swindow_config | |||
| 5883 | register struct save_window_data *data; | 5883 | register struct save_window_data *data; |
| 5884 | struct Lisp_Vector *saved_windows; | 5884 | struct Lisp_Vector *saved_windows; |
| 5885 | 5885 | ||
| 5886 | if (! WINDOW_CONFIGURATIONP (config)) | 5886 | CHECK_WINDOW_CONFIGURATION (config); |
| 5887 | wrong_type_argument (Qwindow_configuration_p, config); | ||
| 5888 | 5887 | ||
| 5889 | data = (struct save_window_data *) XVECTOR (config); | 5888 | data = (struct save_window_data *) XVECTOR (config); |
| 5890 | saved_windows = XVECTOR (data->saved_windows); | 5889 | saved_windows = XVECTOR (data->saved_windows); |
| @@ -5909,8 +5908,7 @@ the return value is nil. Otherwise the value is t. */) | |||
| 5909 | FRAME_PTR f; | 5908 | FRAME_PTR f; |
| 5910 | int old_point = -1; | 5909 | int old_point = -1; |
| 5911 | 5910 | ||
| 5912 | while (!WINDOW_CONFIGURATIONP (configuration)) | 5911 | CHECK_WINDOW_CONFIGURATION (configuration); |
| 5913 | wrong_type_argument (Qwindow_configuration_p, configuration); | ||
| 5914 | 5912 | ||
| 5915 | data = (struct save_window_data *) XVECTOR (configuration); | 5913 | data = (struct save_window_data *) XVECTOR (configuration); |
| 5916 | saved_windows = XVECTOR (data->saved_windows); | 5914 | saved_windows = XVECTOR (data->saved_windows); |
| @@ -6949,10 +6947,8 @@ compare_window_configurations (c1, c2, ignore_positions) | |||
| 6949 | struct Lisp_Vector *sw1, *sw2; | 6947 | struct Lisp_Vector *sw1, *sw2; |
| 6950 | int i; | 6948 | int i; |
| 6951 | 6949 | ||
| 6952 | if (!WINDOW_CONFIGURATIONP (c1)) | 6950 | CHECK_WINDOW_CONFIGURATION (c1); |
| 6953 | wrong_type_argument (Qwindow_configuration_p, c1); | 6951 | CHECK_WINDOW_CONFIGURATION (c2); |
| 6954 | if (!WINDOW_CONFIGURATIONP (c2)) | ||
| 6955 | wrong_type_argument (Qwindow_configuration_p, c2); | ||
| 6956 | 6952 | ||
| 6957 | d1 = (struct save_window_data *) XVECTOR (c1); | 6953 | d1 = (struct save_window_data *) XVECTOR (c1); |
| 6958 | d2 = (struct save_window_data *) XVECTOR (c2); | 6954 | d2 = (struct save_window_data *) XVECTOR (c2); |