diff options
| author | Karoly Lorentey | 2005-10-23 22:47:29 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2005-10-23 22:47:29 +0000 |
| commit | 6dc59f76f49a35140b3bbdeb9c495609f8e55f3a (patch) | |
| tree | 3694df29f4ce4ab94220bd377cd0d32b64f98b0a /src/window.c | |
| parent | a095475c5f316eed7b27f6e0e6df52dae53dc2a5 (diff) | |
| parent | c286104c51b4510ead8e92d265a84aa661ddbf97 (diff) | |
| download | emacs-6dc59f76f49a35140b3bbdeb9c495609f8e55f3a.tar.gz emacs-6dc59f76f49a35140b3bbdeb9c495609f8e55f3a.zip | |
Merged from miles@gnu.org--gnu-2005 (patch 610-614)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-610
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-611
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-612
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-613
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-614
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-429
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/window.c b/src/window.c index 7b3f28ac799..520d5ae8eaa 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -6295,7 +6295,6 @@ selected frame. */) | |||
| 6295 | (frame) | 6295 | (frame) |
| 6296 | Lisp_Object frame; | 6296 | Lisp_Object frame; |
| 6297 | { | 6297 | { |
| 6298 | Lisp_Object alist; | ||
| 6299 | FRAME_PTR f; | 6298 | FRAME_PTR f; |
| 6300 | 6299 | ||
| 6301 | if (NILP (frame)) | 6300 | if (NILP (frame)) |