Mercurial > emacs
changeset 109121:07c5d1a43f6a
Fix menu bar and colors on MS-DOS.
msdos.c (IT_set_frame_parameters): Set menu-bar-lines
according to menu-bar-mode, if not set in the frame parameters
or in default-frame-alist. Fix setting of colors in frames
other than the initial one. Fix reversal of colors when
`reverse' is specified in the frame parameters. Call
update_face_from_frame_parameter instead of
internal-set-lisp-face-attribute. Initialize screen colors
from initial_screen_colors[] when f->default_face_done_p is
zero, instead of depending on being called with
default-frame-alist as the alist argument.
xfaces.c (update_face_from_frame_parameter): Move out of
HAVE_WINDOW_SYSTEM portion. Condition window-system only parts
with HAVE_WINDOW_SYSTEM.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Sat, 03 Jul 2010 17:42:02 +0300 |
| parents | 9983eb21a9c9 (diff) 254d81c0e750 (current diff) |
| children | 373163855d38 |
| files | |
| diffstat | 3 files changed, 15 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lib-src/ChangeLog Sat Jul 03 17:36:18 2010 +0300 +++ b/lib-src/ChangeLog Sat Jul 03 17:42:02 2010 +0300 @@ -1,3 +1,13 @@ +2010-07-03 Andreas Schwab <schwab@linux-m68k.org> + + * sorted-doc.c (cmpdoc): Fix signature. + (qsort_compare): Delete. + (main): Remove cast. + +2010-07-03 Juanma Barranquero <lekktu@gmail.com> + + * ebrowse.c (match_qualified_namespace_alias): Check for null pointer. + 2010-07-03 Juanma Barranquero <lekktu@gmail.com> Fix prototype warnings.
--- a/lib-src/ebrowse.c Sat Jul 03 17:36:18 2010 +0300 +++ b/lib-src/ebrowse.c Sat Jul 03 17:42:02 2010 +0300 @@ -2385,7 +2385,7 @@ { case IDENT: tmp = (struct link *) xmalloc (sizeof *cur); - tmp->sym = find_namespace (yytext, cur->sym); + tmp->sym = find_namespace (yytext, cur ? cur->sym : NULL); tmp->next = NULL; if (head) {
--- a/lib-src/sorted-doc.c Sat Jul 03 17:36:18 2010 +0300 +++ b/lib-src/sorted-doc.c Sat Jul 03 17:42:02 2010 +0300 @@ -103,15 +103,15 @@ /* Comparison function for qsort to call. */ int -cmpdoc (DOCSTR **a, DOCSTR **b) +cmpdoc (const void *va, const void *vb) { + DOCSTR *const *a = va; + DOCSTR *const *b = vb; register int val = strcmp ((*a)->name, (*b)->name); if (val) return val; return (*a)->type - (*b)->type; } -typedef int (*qsort_compare) (const void *, const void *); - enum state { WAITING, BEG_NAME, NAME_GET, BEG_DESC, DESC_GET @@ -228,7 +228,7 @@ /* sort the array by name; within each name, by type */ - qsort ((char*)array, cnt, sizeof (DOCSTR*), (qsort_compare)cmpdoc); + qsort ((char*)array, cnt, sizeof (DOCSTR*), cmpdoc); /* write the output header */