[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r100876: Remove unused static functio
From: |
Juanma Barranquero |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r100876: Remove unused static functions. |
Date: |
Fri, 23 Jul 2010 19:50:14 +0200 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 100876
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Fri 2010-07-23 19:50:14 +0200
message:
Remove unused static functions.
* alloc.c (free_float)
* font.c [ENABLE_CHECKING] (font_match_xlfd, font_check_xlfd_parse)
* frame.c (delete_frame_handler)
* ralloc.c (reorder_bloc)
* w32menu.c (menubar_id_to_frame, add_left_right_boundary)
modified:
src/ChangeLog
src/alloc.c
src/font.c
src/frame.c
src/ralloc.c
src/w32menu.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2010-07-23 10:32:02 +0000
+++ b/src/ChangeLog 2010-07-23 17:50:14 +0000
@@ -1,5 +1,12 @@
2010-07-23 Juanma Barranquero <address@hidden>
+ * alloc.c (free_float):
+ * font.c [ENABLE_CHECKING] (font_match_xlfd, font_check_xlfd_parse):
+ * frame.c (delete_frame_handler):
+ * ralloc.c (reorder_bloc):
+ * w32menu.c (menubar_id_to_frame, add_left_right_boundary):
+ Remove unused static functions.
+
* menu.c (cleanup_popup_menu): Set inside "#ifdef HAVE_NS";
it is called only from NS code.
=== modified file 'src/alloc.c'
--- a/src/alloc.c 2010-07-20 20:21:03 +0000
+++ b/src/alloc.c 2010-07-23 17:50:14 +0000
@@ -2538,16 +2538,6 @@
}
-/* Explicitly free a float cell by putting it on the free-list. */
-
-static void
-free_float (struct Lisp_Float *ptr)
-{
- ptr->u.chain = float_free_list;
- float_free_list = ptr;
-}
-
-
/* Return a new float object with value FLOAT_VALUE. */
Lisp_Object
=== modified file 'src/font.c'
--- a/src/font.c 2010-07-14 03:40:47 +0000
+++ b/src/font.c 2010-07-23 17:50:14 +0000
@@ -980,39 +980,6 @@
}
-#ifdef ENABLE_CHECKING
-/* Match a 14-field XLFD pattern against a full XLFD font name. */
-static int
-font_match_xlfd (char *pattern, char *name)
-{
- while (*pattern && *name)
- {
- if (*pattern == *name)
- pattern++;
- else if (*pattern == '*')
- if (*name == pattern[1])
- pattern += 2;
- else
- ;
- else
- return 0;
- name++;
- }
- return 1;
-}
-
-/* Make sure the font object matches the XLFD font name. */
-static int
-font_check_xlfd_parse (Lisp_Object font, char *name)
-{
- char name_check[256];
- font_unparse_xlfd (font, 0, name_check, 255);
- return font_match_xlfd (name_check, name);
-}
-
-#endif
-
-
/* Parse NAME (null terminated) as XLFD and store information in FONT
(font-spec or font-entity). Size property of FONT is set as
follows:
=== modified file 'src/frame.c'
--- a/src/frame.c 2010-07-17 18:34:44 +0000
+++ b/src/frame.c 2010-07-23 17:50:14 +0000
@@ -1280,14 +1280,6 @@
return 1;
}
-/* Error handler for `delete-frame-functions'. */
-static Lisp_Object
-delete_frame_handler (Lisp_Object arg)
-{
- add_to_log ("Error during `delete-frame': %s", arg, Qnil);
- return Qnil;
-}
-
extern Lisp_Object Qrun_hook_with_args;
/* Delete FRAME. When FORCE equals Qnoelisp, delete FRAME
@@ -1299,7 +1291,7 @@
/* If we use `register' here, gcc-4.0.2 on amd64 using
-DUSE_LISP_UNION_TYPE complains further down that we're getting the
address of `force'. Go figure. */
-
+
{
struct frame *f;
struct frame *sf = SELECTED_FRAME ();
=== modified file 'src/ralloc.c'
--- a/src/ralloc.c 2010-07-07 22:18:28 +0000
+++ b/src/ralloc.c 2010-07-23 17:50:14 +0000
@@ -519,35 +519,6 @@
return 1;
}
-
-/* Reorder the bloc BLOC to go before bloc BEFORE in the doubly linked list.
- This is necessary if we put the memory of space of BLOC
- before that of BEFORE. */
-
-static void
-reorder_bloc (bloc_ptr bloc, bloc_ptr before)
-{
- bloc_ptr prev, next;
-
- /* Splice BLOC out from where it is. */
- prev = bloc->prev;
- next = bloc->next;
-
- if (prev)
- prev->next = next;
- if (next)
- next->prev = prev;
-
- /* Splice it in before BEFORE. */
- prev = before->prev;
-
- if (prev)
- prev->next = bloc;
- bloc->prev = prev;
-
- before->prev = bloc;
- bloc->next = before;
-}
/* Update the records of which heaps contain which blocs, starting
with heap HEAP and bloc BLOC. */
=== modified file 'src/w32menu.c'
--- a/src/w32menu.c 2010-07-08 21:25:08 +0000
+++ b/src/w32menu.c 2010-07-23 17:50:14 +0000
@@ -111,30 +111,6 @@
int pending_menu_activation;
-
-/* Return the frame whose ->output_data.w32->menubar_widget equals
- ID, or 0 if none. */
-
-static struct frame *
-menubar_id_to_frame (HMENU id)
-{
- Lisp_Object tail, frame;
- FRAME_PTR f;
-
- for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail))
- {
- frame = XCAR (tail);
- if (!FRAMEP (frame))
- continue;
- f = XFRAME (frame);
- if (!FRAME_WINDOW_P (f))
- continue;
- if (f->output_data.w32->menubar_widget == id)
- return f;
- }
- return 0;
-}
-
#ifdef HAVE_MENUS
DEFUN ("x-popup-dialog", Fx_popup_dialog, Sx_popup_dialog, 2, 3, 0,
@@ -1316,14 +1292,6 @@
return (*name == '\0' || start + 2 == name);
}
-
-/* Indicate boundary between left and right. */
-static int
-add_left_right_boundary (HMENU menu)
-{
- return AppendMenu (menu, MF_MENUBARBREAK, 0, NULL);
-}
-
/* UTF8: 0xxxxxxx, 110xxxxx 10xxxxxx, 1110xxxx, 10xxxxxx, 10xxxxxx */
static void
utf8to16 (unsigned char * src, int len, WCHAR * dest)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r100876: Remove unused static functions.,
Juanma Barranquero <=