emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r103653: src/w32*.c: Clean up extern


From: Juanma Barranquero
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r103653: src/w32*.c: Clean up extern declarations.
Date: Mon, 14 Mar 2011 18:07:53 +0100
User-agent: Bazaar (2.0.3)

------------------------------------------------------------
revno: 103653
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Mon 2011-03-14 18:07:53 +0100
message:
  src/w32*.c: Clean up extern declarations.
  
  * w32select.c: Don't #include "keyboard.h".
    (run_protected): Add extern declaration for  waiting_for_input.
  
  * lisp.h (VWindow_system, Qfile_name_history):
  * keyboard.h (lispy_function_keys) [WINDOWSNT]:
  * w32term.h (w32_system_caret_hwnd, w32_system_caret_height)
    (w32_system_caret_x, w32_system_caret_y): Declare extern.
  
  * w32.c (Qlocal, noninteractive1, inhibit_window_system):
  * w32console.c (detect_input_pending, read_input_pending)
    (encode_terminal_code):
  * w32fns.c (quit_char, lispy_function_keys, Qtooltip)
    (w32_system_caret_hwnd, w32_system_caret_height, w32_system_caret_x)
    (w32_system_caret_y, Qfile_name_history):
  * w32font.c (w32font_driver, QCantialias, QCotf, QClang):
  * w32inevt.c (reinvoke_input_signal, lispy_function_keys):
  * w32menu.c (Qmenu_bar, QCtoggle, QCradio, Qoverriding_local_map)
    (Qoverriding_terminal_local_map, Qmenu_bar_update_hook):
  * w32proc.c (Qlocal, report_file_error):
  * w32term.c (Vwindow_system, updating_frame):
  * w32uniscribe.c (initialized, uniscribe_font_driver):
    Remove unneeded extern declarations.
modified:
  src/ChangeLog
  src/keyboard.h
  src/lisp.h
  src/w32.c
  src/w32console.c
  src/w32fns.c
  src/w32font.c
  src/w32inevt.c
  src/w32menu.c
  src/w32proc.c
  src/w32select.c
  src/w32term.c
  src/w32term.h
  src/w32uniscribe.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-03-14 16:18:25 +0000
+++ b/src/ChangeLog     2011-03-14 17:07:53 +0000
@@ -1,3 +1,28 @@
+2011-03-14  Juanma Barranquero  <address@hidden>
+
+       * lisp.h (VWindow_system, Qfile_name_history):
+       * keyboard.h (lispy_function_keys) [WINDOWSNT]:
+       * w32term.h (w32_system_caret_hwnd, w32_system_caret_height)
+       (w32_system_caret_x, w32_system_caret_y): Declare extern.
+
+       * w32select.c: Don't #include "keyboard.h".
+       (run_protected): Add extern declaration for  waiting_for_input.
+
+       * w32.c (Qlocal, noninteractive1, inhibit_window_system):
+       * w32console.c (detect_input_pending, read_input_pending)
+       (encode_terminal_code):
+       * w32fns.c (quit_char, lispy_function_keys, Qtooltip)
+       (w32_system_caret_hwnd, w32_system_caret_height, w32_system_caret_x)
+       (w32_system_caret_y, Qfile_name_history):
+       * w32font.c (w32font_driver, QCantialias, QCotf, QClang):
+       * w32inevt.c (reinvoke_input_signal, lispy_function_keys):
+       * w32menu.c (Qmenu_bar, QCtoggle, QCradio, Qoverriding_local_map)
+       (Qoverriding_terminal_local_map, Qmenu_bar_update_hook):
+       * w32proc.c (Qlocal, report_file_error):
+       * w32term.c (Vwindow_system, updating_frame):
+       * w32uniscribe.c (initialized, uniscribe_font_driver):
+       Remove unneeded extern declarations.
+
 2011-03-14  Chong Yidong  <address@hidden>
 
        * buffer.c (Fmake_indirect_buffer): Fix incorrect assertion.

=== modified file 'src/keyboard.h'
--- a/src/keyboard.h    2011-02-16 16:35:16 +0000
+++ b/src/keyboard.h    2011-03-14 17:07:53 +0000
@@ -90,7 +90,7 @@
 
     /* User-supplied table to translate input characters through.  */
     Lisp_Object KBOARD_INTERNAL_FIELD (Vkeyboard_translate_table);
-    
+
     /* Last command that may be repeated by `repeat'.  */
     Lisp_Object KBOARD_INTERNAL_FIELD (Vlast_repeatable_command);
 
@@ -140,12 +140,12 @@
     /* Keymap mapping keys to alternative preferred forms.
        See the DEFVAR for more documentation.  */
     Lisp_Object KBOARD_INTERNAL_FIELD (Vlocal_function_key_map);
-    
+
     /* Keymap mapping ASCII function key sequences onto their preferred
        forms.  Initialized by the terminal-specific lisp files.  See the
        DEFVAR for more documentation.  */
     Lisp_Object KBOARD_INTERNAL_FIELD (Vinput_decode_map);
-    
+
     /* Minibufferless frames on this display use this frame's minibuffer.  */
     Lisp_Object KBOARD_INTERNAL_FIELD (Vdefault_minibuffer_frame);
 
@@ -518,3 +518,6 @@
                                  struct input_event *);
 extern EMACS_TIME timer_check (int);
 
+#ifdef WINDOWSNT
+extern const char *const lispy_function_keys[];
+#endif

=== modified file 'src/lisp.h'
--- a/src/lisp.h        2011-03-10 02:01:53 +0000
+++ b/src/lisp.h        2011-03-14 17:07:53 +0000
@@ -2607,6 +2607,7 @@
 
 /* Defined in dispnew.c */
 extern Lisp_Object selected_frame;
+extern Lisp_Object Vwindow_system;
 EXFUN (Fding, 1);
 EXFUN (Fredraw_frame, 1);
 EXFUN (Fsleep_for, 2);
@@ -3009,6 +3010,7 @@
 extern Lisp_Object Qfile_exists_p;
 extern Lisp_Object Qfile_directory_p;
 extern Lisp_Object Qinsert_file_contents;
+extern Lisp_Object Qfile_name_history;
 EXFUN (Ffind_file_name_handler, 2);
 EXFUN (Ffile_name_as_directory, 1);
 EXFUN (Fexpand_file_name, 2);

=== modified file 'src/w32.c'
--- a/src/w32.c 2011-02-27 19:48:31 +0000
+++ b/src/w32.c 2011-03-14 17:07:53 +0000
@@ -147,9 +147,6 @@
 void globals_of_w32 (void);
 static DWORD get_rid (PSID);
 
-/* Defined in process.c for its own purpose.  */
-extern Lisp_Object Qlocal;
-
 
 /* Initialization states.
 
@@ -5666,8 +5663,6 @@
 static void
 check_windows_init_file (void)
 {
-  extern int noninteractive, inhibit_window_system;
-
   /* A common indication that Emacs is not installed properly is when
      it cannot find the Windows installation file.  If this file does
      not exist in the expected place, tell the user.  */

=== modified file 'src/w32console.c'
--- a/src/w32console.c  2011-01-25 04:08:28 +0000
+++ b/src/w32console.c  2011-03-14 17:07:53 +0000
@@ -41,12 +41,6 @@
 /* from window.c */
 extern Lisp_Object Frecenter (Lisp_Object);
 
-/* from keyboard.c */
-extern int detect_input_pending (void);
-
-/* from sysdep.c */
-extern int read_input_pending (void);
-
 static void w32con_move_cursor (struct frame *f, int row, int col);
 static void w32con_clear_to_end (struct frame *f);
 static void w32con_clear_frame (struct frame *f);
@@ -277,9 +271,6 @@
     }
 }
 
-extern unsigned char *encode_terminal_code (struct glyph *, int,
-                                            struct coding_system *);
-
 static void
 w32con_write_glyphs (struct frame *f, register struct glyph *string,
                      register int len)

=== modified file 'src/w32fns.c'
--- a/src/w32fns.c      2011-03-07 21:11:24 +0000
+++ b/src/w32fns.c      2011-03-14 17:07:53 +0000
@@ -80,10 +80,6 @@
 extern void w32_free_menu_strings (HWND);
 extern const char *map_w32_filename (const char *, const char **);
 
-extern int quit_char;
-
-extern const char *const lispy_function_keys[];
-
 /* If non-zero, a w32 timer that, when it expires, displays an
    hourglass cursor on all frames.  */
 static unsigned hourglass_timer = 0;
@@ -187,18 +183,10 @@
 #define MENU_FREE_DELAY 1000
 static unsigned menu_free_timer = 0;
 
-extern Lisp_Object Qtooltip;
-
 #ifdef GLYPH_DEBUG
 int image_cache_refcount, dpyinfo_refcount;
 #endif
 
-
-extern HWND w32_system_caret_hwnd;
-
-extern int w32_system_caret_height;
-extern int w32_system_caret_x;
-extern int w32_system_caret_y;
 static HWND w32_visible_system_caret_hwnd;
 
 /* From w32menu.c  */
@@ -5851,7 +5839,6 @@
 /***********************************************************************
                        File selection dialog
  ***********************************************************************/
-extern Lisp_Object Qfile_name_history;
 
 /* Callback for altering the behavior of the Open File dialog.
    Makes the Filename text field contain "Current Directory" and be
@@ -5899,7 +5886,7 @@
                 no man's land and the user will be unable to tab through the
                 dialog box (pressing tab will only result in a beep).
                 Avoid that problem by setting focus to the list here.  */
-             if (CDN_INITDONE == notify->hdr.code)
+             if (notify->hdr.code == CDN_INITDONE)
                SetFocus (list);
            }
          else

=== modified file 'src/w32font.c'
--- a/src/w32font.c     2011-01-25 04:08:28 +0000
+++ b/src/w32font.c     2011-03-14 17:07:53 +0000
@@ -54,8 +54,6 @@
 #define JOHAB_CHARSET 130
 #endif
 
-extern struct font_driver w32font_driver;
-
 Lisp_Object Qgdi;
 Lisp_Object Quniscribe;
 static Lisp_Object QCformat;
@@ -64,7 +62,6 @@
 static Lisp_Object Qraster, Qoutline, Qunknown;
 
 /* antialiasing  */
-extern Lisp_Object QCantialias, QCotf, QClang; /* defined in font.c  */
 extern Lisp_Object Qnone; /* reuse from w32fns.c  */
 static Lisp_Object Qstandard, Qsubpixel, Qnatural;
 

=== modified file 'src/w32inevt.c'
--- a/src/w32inevt.c    2011-01-25 04:08:28 +0000
+++ b/src/w32inevt.c    2011-03-14 17:07:53 +0000
@@ -40,18 +40,15 @@
 #include "w32heap.h"
 #include "w32term.h"
 
-/* stdin, from ntterm */
+/* stdin, from w32console.c */
 extern HANDLE keyboard_handle;
 
 /* Info for last mouse motion */
 static COORD movement_pos;
 static DWORD movement_time;
 
-/* from keyboard.c */
-extern void reinvoke_input_signal (void);
-
+/* from w32fns.c */
 extern unsigned int map_keypad_keys (unsigned int, unsigned int);
-
 extern unsigned int w32_key_to_modifier (int key);
 
 /* Event queue */
@@ -261,8 +258,6 @@
 }
 
 
-extern const char *const lispy_function_keys[];
-
 static int faked_key = 0;
 
 /* return code -1 means that event_queue_ptr won't be incremented.

=== modified file 'src/w32menu.c'
--- a/src/w32menu.c     2011-01-25 04:08:28 +0000
+++ b/src/w32menu.c     2011-03-14 17:07:53 +0000
@@ -84,14 +84,6 @@
 
 Lisp_Object Qdebug_on_next_call;
 
-extern Lisp_Object Qmenu_bar;
-
-extern Lisp_Object QCtoggle, QCradio;
-
-extern Lisp_Object Qoverriding_local_map, Qoverriding_terminal_local_map;
-
-extern Lisp_Object Qmenu_bar_update_hook;
-
 void set_frame_menubar (FRAME_PTR, int, int);
 
 #ifdef HAVE_DIALOGS

=== modified file 'src/w32proc.c'
--- a/src/w32proc.c     2011-02-28 01:07:29 +0000
+++ b/src/w32proc.c     2011-03-14 17:07:53 +0000
@@ -67,8 +67,6 @@
            + ((DWORD)(var) - (section)->VirtualAddress)                \
            + (filedata).file_base))
 
-extern Lisp_Object Qlocal;
-
 Lisp_Object Qhigh, Qlow;
 
 #ifdef EMACSDEBUG
@@ -1053,7 +1051,7 @@
    detect that we were woken up by C-g, we return -1 with errno set to
    EINTR as on Unix.  */
 
-/* From ntterm.c */
+/* From w32console.c */
 extern HANDLE keyboard_handle;
 
 /* From w32xfns.c */
@@ -1559,8 +1557,6 @@
   return rc;
 }
 
-/* extern int report_file_error (char *, Lisp_Object); */
-
 /* The following two routines are used to manipulate stdin, stdout, and
    stderr of our child processes.
 
@@ -1660,7 +1656,7 @@
    dial-up users to only be connected when they actually need to use
    socket services.  */
 
-/* From nt.c */
+/* From w32.c */
 extern HANDLE winsock_lib;
 extern BOOL term_winsock (void);
 extern BOOL init_winsock (int load_now);

=== modified file 'src/w32select.c'
--- a/src/w32select.c   2011-01-25 04:08:28 +0000
+++ b/src/w32select.c   2011-03-14 17:07:53 +0000
@@ -78,7 +78,6 @@
 #include "w32term.h"   /* for all of the w32 includes */
 #include "w32heap.h"   /* os_subtype */
 #include "blockinput.h"
-#include "keyboard.h"  /* cmd_error_internal() */
 #include "charset.h"
 #include "coding.h"
 #include "character.h"
@@ -391,6 +390,7 @@
      with global variables and calling strange looking functions.  Is
      this really the right way to run Lisp callbacks?  */
 
+  extern int waiting_for_input; /* from keyboard.c */
   int owfi;
 
   BLOCK_INPUT;

=== modified file 'src/w32term.c'
--- a/src/w32term.c     2011-02-28 01:07:29 +0000
+++ b/src/w32term.c     2011-03-14 17:07:53 +0000
@@ -88,8 +88,6 @@
 extern int w32_codepage_for_font (char *fontname);
 extern Cursor w32_load_cursor (LPCTSTR name);
 
-extern Lisp_Object Vwindow_system;
-
 #define x_any_window_to_frame x_window_to_frame
 #define x_top_window_to_frame x_window_to_frame
 
@@ -138,13 +136,6 @@
 #define WS_EX_LAYERED 0x80000
 #endif
 
-/* Frame being updated by update_frame.  This is declared in term.c.
-   This is set by update_begin and looked at by all the
-   w32 functions.  It is zero while not inside an update.
-   In that case, the w32 functions assume that `SELECTED_FRAME ()'
-   is the frame to apply to.  */
-extern struct frame *updating_frame;
-
 /* This is a frame waiting to be autoraised, within w32_read_socket.  */
 struct frame *pending_autoraise_frame;
 
@@ -2536,8 +2527,7 @@
 }
 
 
-/* Clear entire frame.  If updating_frame is non-null, clear that
-   frame.  Otherwise clear the selected frame.  */
+/* Clear entire frame.  */
 
 static void
 x_clear_frame (struct frame *f)
@@ -6060,7 +6050,7 @@
   terminal->mouse_position_hook = w32_mouse_position;
   terminal->frame_rehighlight_hook = w32_frame_rehighlight;
   terminal->frame_raise_lower_hook = w32_frame_raise_lower;
-  //  terminal->fullscreen_hook = XTfullscreen_hook;
+  /* terminal->fullscreen_hook = XTfullscreen_hook; */
   terminal->set_vertical_scroll_bar_hook = w32_set_vertical_scroll_bar;
   terminal->condemn_scroll_bars_hook = w32_condemn_scroll_bars;
   terminal->redeem_scroll_bar_hook = w32_redeem_scroll_bar;

=== modified file 'src/w32term.h'
--- a/src/w32term.h     2011-01-25 04:08:28 +0000
+++ b/src/w32term.h     2011-03-14 17:07:53 +0000
@@ -547,7 +547,7 @@
 #define WM_APPCOMMAND 0x319
 #define GET_APPCOMMAND_LPARAM(lParam)  (HIWORD(lParam) & 0x7fff)
 #endif
-#ifndef WM_UNICHAR 
+#ifndef WM_UNICHAR
 #define WM_UNICHAR 0x109
 #endif
 #ifndef UNICODE_NOCHAR
@@ -697,3 +697,7 @@
     IN UINT_PTR,
     IN LPCWSTR);
 
+extern HWND w32_system_caret_hwnd;
+extern int w32_system_caret_height;
+extern int w32_system_caret_x;
+extern int w32_system_caret_y;

=== modified file 'src/w32uniscribe.c'
--- a/src/w32uniscribe.c        2011-01-25 04:08:28 +0000
+++ b/src/w32uniscribe.c        2011-03-14 17:07:53 +0000
@@ -52,10 +52,6 @@
 extern Lisp_Object Quniscribe;
 extern Lisp_Object Qopentype;
 
-extern int initialized;
-
-extern struct font_driver uniscribe_font_driver;
-
 /* EnumFontFamiliesEx callback.  */
 static int CALLBACK add_opentype_font_name_to_list (ENUMLOGFONTEX *,
                                                     NEWTEXTMETRICEX *,


reply via email to

[Prev in Thread] Current Thread [Next in Thread]