diff options
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/data.c | 3 | ||||
| -rw-r--r-- | src/image.c | 4 | ||||
| -rw-r--r-- | src/minibuf.c | 2 | ||||
| -rw-r--r-- | src/window.c | 5 | ||||
| -rw-r--r-- | src/window.h | 3 |
6 files changed, 15 insertions, 9 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index b0a3606ee5a..eb0d744f50f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,12 @@ 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_deletion_count, delete_deletable_window): Remove; unused. (window_body_lines): Now static. diff --git a/src/data.c b/src/data.c index a41ffe7a1f6..57d7753e393 100644 --- a/src/data.c +++ b/src/data.c @@ -90,7 +90,8 @@ static Lisp_Object Qsymbol, Qstring, Qcons, Qmarker, Qoverlay; Lisp_Object Qwindow; static Lisp_Object Qfloat, Qwindow_configuration; 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 Qsubrp, Qmany, Qunevalled; Lisp_Object Qfont_spec, Qfont_entity, Qfont_object; diff --git a/src/image.c b/src/image.c index 3d1724492a0..8169a9098d8 100644 --- a/src/image.c +++ b/src/image.c @@ -7365,7 +7365,7 @@ gif_load (struct frame *f, struct image *img) ***********************************************************************/ #if defined (HAVE_IMAGEMAGICK) -Lisp_Object Qimagemagick; +static Lisp_Object Qimagemagick; static int imagemagick_image_p (Lisp_Object); static int imagemagick_load (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. */ -Lisp_Object Qsvg; +static Lisp_Object Qsvg; /* Indices of image specification fields in svg_format, below. */ diff --git a/src/minibuf.c b/src/minibuf.c index 8f1987298b3..1b555035cfe 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -1895,7 +1895,7 @@ the values STRING, PREDICATE and `lambda'. */) return Qt; } -Lisp_Object Qmetadata; +static Lisp_Object Qmetadata; extern Lisp_Object Qbuffer; DEFUN ("internal-complete-buffer", Finternal_complete_buffer, Sinternal_complete_buffer, 3, 3, 0, diff --git a/src/window.c b/src/window.c index 3e43d8386b6..7a026b3a1c7 100644 --- a/src/window.c +++ b/src/window.c @@ -82,6 +82,7 @@ static int foreach_window_1 (struct window *, int (* fn) (struct window *, void *), void *); 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 Lisp_Object select_window (Lisp_Object, Lisp_Object, int); @@ -2632,7 +2633,7 @@ selected frame and no others. */) return Qnil; } -Lisp_Object +static Lisp_Object resize_root_window (Lisp_Object window, Lisp_Object delta, Lisp_Object horizontal, Lisp_Object 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. */) Note: This function does not check any of `window-fixed-size-p', `window-min-height' or `window-min-width'. It does check that window sizes do not drop below one line (two columns). */ -int +static int resize_window_check (struct window *w, int horflag) { struct window *c; diff --git a/src/window.h b/src/window.h index 87d0dc8fb23..1ebc99055a5 100644 --- a/src/window.h +++ b/src/window.h @@ -924,9 +924,6 @@ extern void init_window (void); extern void syms_of_window (void); extern void keys_of_window (void); 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 */ |