Commit 5f3f57be authored by Paul Eggert's avatar Paul Eggert
Browse files

Clean out old termopts cruft.

* termopts.h (flow_control, meta_key): Remove unused decls.
* dispnew.c, indent.c, nsterm.m, term.c, xsettings.c, xsmfns.c:
Don't include termopts.h.
parent 90e847e2
2012-10-10 Paul Eggert <eggert@cs.ucla.edu>
Clean out old termopts cruft.
* termopts.h (flow_control, meta_key): Remove unused decls.
* dispnew.c, indent.c, nsterm.m, term.c, xsettings.c, xsmfns.c:
Don't include termopts.h.
2012-10-10 Dmitry Antipov <dmantipov@yandex.ru>
 
* alloc.c (gc_sweep): Use pointer-to-a-pointer loop for buffers.
......
......@@ -26,7 +26,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include "lisp.h"
#include "termchar.h"
#include "termopts.h"
/* cm.h must come after dispextern.h on Windows. */
#include "dispextern.h"
#include "cm.h"
......
......@@ -30,7 +30,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include "frame.h"
#include "window.h"
#include "termchar.h"
#include "termopts.h"
#include "disptab.h"
#include "intervals.h"
#include "dispextern.h"
......
......@@ -55,7 +55,6 @@ Updated by Christian Limpach (chris@nice.ch)
#include "ccl.h"
#include "termhooks.h"
#include "termopts.h"
#include "termchar.h"
#include "window.h"
......@@ -1315,7 +1314,7 @@ Free a pool and temporary objects it refers to (callable from C)
ns_fullscreen_hook (FRAME_PTR f)
{
EmacsView *view = (EmacsView *)FRAME_NS_VIEW (f);
if (! f->async_visible) return;
#ifndef NEW_STYLE_FS
if (f->want_fullscreen == FULLSCREEN_BOTH)
......@@ -5942,7 +5941,7 @@ - (void)toggleFullScreen: (id)sender
[w setBackgroundColor: col];
if ([col alphaComponent] != 1.0)
[w setOpaque: NO];
f->border_width = bwidth;
FRAME_NS_TITLEBAR_HEIGHT (f) = tibar_height;
FRAME_TOOLBAR_HEIGHT (f) = tobar_height;
......@@ -5995,7 +5994,7 @@ - (void)handleFS
}
break;
}
emacsframe->want_fullscreen = FULLSCREEN_NONE;
}
......
......@@ -28,7 +28,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include "lisp.h"
#include "termchar.h"
#include "termopts.h"
#include "tparam.h"
#include "character.h"
#include "buffer.h"
......
......@@ -17,15 +17,8 @@ You should have received a copy of the GNU General Public License
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Nonzero means use ^S/^Q as cretinous flow control. */
extern int flow_control;
/* Nonzero means use interrupt-driven input. */
extern int interrupt_input;
/* Nonzero while interrupts are temporarily deferred during redisplay. */
extern int interrupts_deferred;
/* Terminal has meta key */
extern int meta_key;
......@@ -29,7 +29,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include "keyboard.h"
#include "blockinput.h"
#include "termhooks.h"
#include "termopts.h"
#include <X11/Xproto.h>
......
......@@ -35,7 +35,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include "sysselect.h"
#include "frame.h"
#include "termhooks.h"
#include "termopts.h"
#include "xterm.h"
#include "process.h"
#include "keyboard.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment