Commit 4b66faf3 authored by Paul Eggert's avatar Paul Eggert

Make identifiers static if they are not used in other modules.

* data.c (Qcompiled_function, Qframe, Qvector):
* image.c (QimageMagick, Qsvg):
* minibuf.c (Qmetadata):
* window.c (resize_window_check, resize_root_window): Now static.
* window.h (resize_window_check, resize_root_window): Remove decls.
parent f7e13da3
2011-06-10 Paul Eggert <eggert@cs.ucla.edu> 2011-06-10 Paul Eggert <eggert@cs.ucla.edu>
Make identifiers static if they are not used in other modules.
* data.c (Qcompiled_function, Qframe, Qvector):
* image.c (QimageMagick, Qsvg):
* minibuf.c (Qmetadata):
* window.c (resize_window_check, resize_root_window): Now static.
* window.h (resize_window_check, resize_root_window): Remove decls.
* window.c: Fix minor problems reported by GCC 4.6.0. * window.c: Fix minor problems reported by GCC 4.6.0.
(window_deletion_count, delete_deletable_window): Remove; unused. (window_deletion_count, delete_deletable_window): Remove; unused.
(window_body_lines): Now static. (window_body_lines): Now static.
......
...@@ -90,7 +90,8 @@ static Lisp_Object Qsymbol, Qstring, Qcons, Qmarker, Qoverlay; ...@@ -90,7 +90,8 @@ static Lisp_Object Qsymbol, Qstring, Qcons, Qmarker, Qoverlay;
Lisp_Object Qwindow; Lisp_Object Qwindow;
static Lisp_Object Qfloat, Qwindow_configuration; static Lisp_Object Qfloat, Qwindow_configuration;
static Lisp_Object Qprocess; static Lisp_Object Qprocess;
Lisp_Object Qcompiled_function, Qbuffer, Qframe, Qvector; static Lisp_Object Qcompiled_function, Qframe, Qvector;
Lisp_Object Qbuffer;
static Lisp_Object Qchar_table, Qbool_vector, Qhash_table; static Lisp_Object Qchar_table, Qbool_vector, Qhash_table;
static Lisp_Object Qsubrp, Qmany, Qunevalled; static Lisp_Object Qsubrp, Qmany, Qunevalled;
Lisp_Object Qfont_spec, Qfont_entity, Qfont_object; Lisp_Object Qfont_spec, Qfont_entity, Qfont_object;
......
...@@ -7365,7 +7365,7 @@ gif_load (struct frame *f, struct image *img) ...@@ -7365,7 +7365,7 @@ gif_load (struct frame *f, struct image *img)
***********************************************************************/ ***********************************************************************/
#if defined (HAVE_IMAGEMAGICK) #if defined (HAVE_IMAGEMAGICK)
Lisp_Object Qimagemagick; static Lisp_Object Qimagemagick;
static int imagemagick_image_p (Lisp_Object); static int imagemagick_image_p (Lisp_Object);
static int imagemagick_load (struct frame *, struct image *); static int imagemagick_load (struct frame *, struct image *);
...@@ -7884,7 +7884,7 @@ static int svg_load_image (struct frame *, struct image *, ...@@ -7884,7 +7884,7 @@ static int svg_load_image (struct frame *, struct image *,
/* The symbol `svg' identifying images of this type. */ /* The symbol `svg' identifying images of this type. */
Lisp_Object Qsvg; static Lisp_Object Qsvg;
/* Indices of image specification fields in svg_format, below. */ /* Indices of image specification fields in svg_format, below. */
......
...@@ -1895,7 +1895,7 @@ the values STRING, PREDICATE and `lambda'. */) ...@@ -1895,7 +1895,7 @@ the values STRING, PREDICATE and `lambda'. */)
return Qt; return Qt;
} }
Lisp_Object Qmetadata; static Lisp_Object Qmetadata;
extern Lisp_Object Qbuffer; extern Lisp_Object Qbuffer;
DEFUN ("internal-complete-buffer", Finternal_complete_buffer, Sinternal_complete_buffer, 3, 3, 0, DEFUN ("internal-complete-buffer", Finternal_complete_buffer, Sinternal_complete_buffer, 3, 3, 0,
......
...@@ -82,6 +82,7 @@ static int foreach_window_1 (struct window *, ...@@ -82,6 +82,7 @@ static int foreach_window_1 (struct window *,
int (* fn) (struct window *, void *), int (* fn) (struct window *, void *),
void *); void *);
static Lisp_Object window_list_1 (Lisp_Object, Lisp_Object, Lisp_Object); static Lisp_Object window_list_1 (Lisp_Object, Lisp_Object, Lisp_Object);
static int resize_window_check (struct window *, int);
static void resize_window_apply (struct window *, int); static void resize_window_apply (struct window *, int);
static Lisp_Object select_window (Lisp_Object, Lisp_Object, int); static Lisp_Object select_window (Lisp_Object, Lisp_Object, int);
...@@ -2632,7 +2633,7 @@ selected frame and no others. */) ...@@ -2632,7 +2633,7 @@ selected frame and no others. */)
return Qnil; return Qnil;
} }
Lisp_Object static Lisp_Object
resize_root_window (Lisp_Object window, Lisp_Object delta, Lisp_Object horizontal, Lisp_Object ignore) resize_root_window (Lisp_Object window, Lisp_Object delta, Lisp_Object horizontal, Lisp_Object ignore)
{ {
return call4 (Qresize_root_window, window, delta, horizontal, ignore); return call4 (Qresize_root_window, window, delta, horizontal, ignore);
...@@ -3522,7 +3523,7 @@ Note: This function does not operate on any subwindows of WINDOW. */) ...@@ -3522,7 +3523,7 @@ Note: This function does not operate on any subwindows of WINDOW. */)
Note: This function does not check any of `window-fixed-size-p', Note: This function does not check any of `window-fixed-size-p',
`window-min-height' or `window-min-width'. It does check that window `window-min-height' or `window-min-width'. It does check that window
sizes do not drop below one line (two columns). */ sizes do not drop below one line (two columns). */
int static int
resize_window_check (struct window *w, int horflag) resize_window_check (struct window *w, int horflag)
{ {
struct window *c; struct window *c;
......
...@@ -924,9 +924,6 @@ extern void init_window (void); ...@@ -924,9 +924,6 @@ extern void init_window (void);
extern void syms_of_window (void); extern void syms_of_window (void);
extern void keys_of_window (void); extern void keys_of_window (void);
extern void resize_frame_windows (struct frame *, int, int); extern void resize_frame_windows (struct frame *, int, int);
extern int resize_window_check (struct window *, int);
extern Lisp_Object resize_root_window (Lisp_Object, Lisp_Object, Lisp_Object,
Lisp_Object);
#endif /* not WINDOW_H_INCLUDED */ #endif /* not WINDOW_H_INCLUDED */
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