Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Include cm.h after dispextern.h to avoid name conflicts

Browse source 
in Windows system headers.
(term_init) [WINDOWSNT]: Do not include remainder of function.
This commit is contained in:
Geoff Voelker 1998-04-29 04:34:52 +00:00
parent 38adb313a0
commit eccec691ae
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/term.c
View file

@ -24,7 +24,6 @@ Boston, MA 02111-1307, USA. */
#include <ctype.h>
#include "termchar.h"
#include "termopts.h"
#include "cm.h"
#undef NULL
#include "lisp.h"
#include "charset.h"
@ -34,6 +33,7 @@ Boston, MA 02111-1307, USA. */
#include "termhooks.h"
#include "keyboard.h"
#include "dispextern.h"
#include "cm.h"
#ifdef HAVE_X_WINDOWS
#include "xterm.h"
#endif
@ -1604,7 +1604,7 @@ term_init (terminal_type)
FRAME_VERTICAL_SCROLL_BAR_TYPE (selected_frame) = vertical_scroll_bar_none;
return;
#endif /* WINDOWSNT */
#else /* not WINDOWSNT */
Wcm_clear ();
@ -1929,6 +1929,7 @@ to do `unset TERMCAP' (C-shell: `unsetenv TERMCAP') as well.",
FRAME_CAN_HAVE_SCROLL_BARS (selected_frame) = 0;
FRAME_VERTICAL_SCROLL_BAR_TYPE (selected_frame) = vertical_scroll_bar_none;
#endif /* WINDOWSNT */
}
/* VARARGS 1 */