[Emacs-diffs] /srv/bzr/emacs/trunk r110498: Clean out old termopts cruft.

[Paul Eggert]

------------------------------------------------------------
revno: 110498
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Wed 2012-10-10 08:10:57 -0700
message:
  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.
modified:
  src/ChangeLog
  src/dispnew.c
  src/indent.c
  src/nsterm.m
  src/term.c
  src/termopts.h
  src/xsettings.c
  src/xsmfns.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-10-10 14:45:07 +0000
+++ b/src/ChangeLog     2012-10-10 15:10:57 +0000
@@ -1,3 +1,10 @@
+2012-10-10  Paul Eggert  <address@hidden>
+
+       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  <address@hidden>
 
        * alloc.c (gc_sweep): Use pointer-to-a-pointer loop for buffers.

=== modified file 'src/dispnew.c'
--- a/src/dispnew.c     2012-10-01 06:36:54 +0000
+++ b/src/dispnew.c     2012-10-10 15:10:57 +0000
@@ -26,7 +26,6 @@
 
 #include "lisp.h"
 #include "termchar.h"
-#include "termopts.h"
 /* cm.h must come after dispextern.h on Windows.  */
 #include "dispextern.h"
 #include "cm.h"

=== modified file 'src/indent.c'
--- a/src/indent.c      2012-09-24 21:38:23 +0000
+++ b/src/indent.c      2012-10-10 15:10:57 +0000
@@ -30,7 +30,6 @@
 #include "frame.h"
 #include "window.h"
 #include "termchar.h"
-#include "termopts.h"
 #include "disptab.h"
 #include "intervals.h"
 #include "dispextern.h"

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2012-10-07 11:09:04 +0000
+++ b/src/nsterm.m      2012-10-10 15:10:57 +0000
@@ -55,7 +55,6 @@
 #include "ccl.h"
 
 #include "termhooks.h"
-#include "termopts.h"
 #include "termchar.h"
 
 #include "window.h"
@@ -1315,7 +1314,7 @@
 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 @@
       [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 @@
             }
           break;
         }
-  
+
       emacsframe->want_fullscreen = FULLSCREEN_NONE;
     }
 

=== modified file 'src/term.c'
--- a/src/term.c        2012-09-23 08:44:20 +0000
+++ b/src/term.c        2012-10-10 15:10:57 +0000
@@ -28,7 +28,6 @@
 
 #include "lisp.h"
 #include "termchar.h"
-#include "termopts.h"
 #include "tparam.h"
 #include "character.h"
 #include "buffer.h"

=== modified file 'src/termopts.h'
--- a/src/termopts.h    2012-01-19 07:21:25 +0000
+++ b/src/termopts.h    2012-10-10 15:10:57 +0000
@@ -17,15 +17,8 @@
 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;
-

=== modified file 'src/xsettings.c'
--- a/src/xsettings.c   2012-09-23 08:44:20 +0000
+++ b/src/xsettings.c   2012-10-10 15:10:57 +0000
@@ -29,7 +29,6 @@
 #include "keyboard.h"
 #include "blockinput.h"
 #include "termhooks.h"
-#include "termopts.h"
 
 #include <X11/Xproto.h>
 

=== modified file 'src/xsmfns.c'
--- a/src/xsmfns.c      2012-09-15 07:06:56 +0000
+++ b/src/xsmfns.c      2012-10-10 15:10:57 +0000
@@ -35,7 +35,6 @@
 #include "sysselect.h"
 #include "frame.h"
 #include "termhooks.h"
-#include "termopts.h"
 #include "xterm.h"
 #include "process.h"
 #include "keyboard.h"