diff options
| author | Paul Eggert | 2011-04-01 13:19:36 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-01 13:19:36 -0700 |
| commit | 6ddae4efd9e8a3035eb610c39fb2c8f79e7f9893 (patch) | |
| tree | 1b704b34e4f2f2bd4a6f13e4d1dd058c61c8a6ff /src/window.h | |
| parent | 0b918413f336dbfa9a9c266ae857bce103556c57 (diff) | |
| parent | 034086489cff2a23cb4d9f8c536e18456be617ef (diff) | |
| download | emacs-6ddae4efd9e8a3035eb610c39fb2c8f79e7f9893.tar.gz emacs-6ddae4efd9e8a3035eb610c39fb2c8f79e7f9893.zip | |
Merge from mainline.
Diffstat (limited to 'src/window.h')
| -rw-r--r-- | src/window.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/window.h b/src/window.h index f788e126d6d..ad627aca340 100644 --- a/src/window.h +++ b/src/window.h | |||
| @@ -853,7 +853,6 @@ EXFUN (Fwindow_minibuffer_p, 1); | |||
| 853 | EXFUN (Fdelete_window, 1); | 853 | EXFUN (Fdelete_window, 1); |
| 854 | EXFUN (Fwindow_buffer, 1); | 854 | EXFUN (Fwindow_buffer, 1); |
| 855 | EXFUN (Fget_buffer_window, 2); | 855 | EXFUN (Fget_buffer_window, 2); |
| 856 | EXFUN (Fsave_window_excursion, UNEVALLED); | ||
| 857 | EXFUN (Fset_window_configuration, 1); | 856 | EXFUN (Fset_window_configuration, 1); |
| 858 | EXFUN (Fcurrent_window_configuration, 1); | 857 | EXFUN (Fcurrent_window_configuration, 1); |
| 859 | extern int compare_window_configurations (Lisp_Object, Lisp_Object, int); | 858 | extern int compare_window_configurations (Lisp_Object, Lisp_Object, int); |