Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 103767. ------------------------------------------------------------ revno: 103767 committer: Juanma Barranquero branch nick: trunk timestamp: Mon 2011-03-28 05:29:18 +0200 message: src/*.c: Remove unused parameters and other warnings. * dispextern.h (string_buffer_position): Remove declaration. * print.c (strout): Remove parameter `multibyte', unused since revno:25356 (1999-08-21). All callers changed. * search.c (boyer_moore): Remove parameters `len', `pos' and `lim', never used since function introduction in revno:20870 (1998-02-08). All callers changed. * w32.c (_wsa_errlist): Use braces for struct initializers. * xdisp.c (string_buffer_position_lim): Remove parameter `w', never used since function introduction in revno:36704 (2001-03-09). All callers changed. (string_buffer_position): Likewise. Also, make static (it's never used outside xdisp.c). (cursor_row_p): Remove parameter `w', unused since revno:32591 (2000-10-17). All callers changed. (decode_mode_spec): Remove parameter `precision', introduced during Gerd Moellmann's rewrite at revno:25013 (1999-07-21), but never used. All callers changed. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-03-27 10:55:07 +0000 +++ src/ChangeLog 2011-03-28 03:29:18 +0000 @@ -1,3 +1,27 @@ +2011-03-28 Juanma Barranquero + + * dispextern.h (string_buffer_position): Remove declaration. + + * print.c (strout): Remove parameter `multibyte', unused since + revno:25356 (1999-08-21). All callers changed. + + * search.c (boyer_moore): Remove parameters `len', `pos' and `lim', + never used since function introduction in revno:20870 (1998-02-08). + All callers changed. + + * w32.c (_wsa_errlist): Use braces for struct initializers. + + * xdisp.c (string_buffer_position_lim): Remove parameter `w', + never used since function introduction in revno:36704 (2001-03-09). + All callers changed. + (string_buffer_position): Likewise. Also, make static (it's never + used outside xdisp.c). + (cursor_row_p): Remove parameter `w', unused since + revno:32591 (2000-10-17). All callers changed. + (decode_mode_spec): Remove parameter `precision', introduced during + Gerd Moellmann's rewrite at revno:25013 (1999-07-21), but never used. + All callers changed. + 2011-03-27 Jan Djärv * nsterm.m (syms_of_nsterm): Use doc: for ns-auto-hide-menu-bar. === modified file 'src/dispextern.h' --- src/dispextern.h 2011-03-25 15:39:59 +0000 +++ src/dispextern.h 2011-03-28 03:29:18 +0000 @@ -2953,8 +2953,6 @@ struct glyph_row *row_containing_pos (struct window *, EMACS_INT, struct glyph_row *, struct glyph_row *, int); -EMACS_INT string_buffer_position (struct window *, Lisp_Object, - EMACS_INT); int line_bottom_y (struct it *); int display_prop_intangible_p (Lisp_Object); void resize_echo_area_exactly (void); === modified file 'src/print.c' --- src/print.c 2011-03-17 16:32:03 +0000 +++ src/print.c 2011-03-28 03:29:18 +0000 @@ -273,7 +273,7 @@ static void strout (const char *ptr, EMACS_INT size, EMACS_INT size_byte, - Lisp_Object printcharfun, int multibyte) + Lisp_Object printcharfun) { if (size < 0) size_byte = size = strlen (ptr); @@ -406,16 +406,13 @@ SAFE_ALLOCA (buffer, char *, nbytes); memcpy (buffer, SDATA (string), nbytes); - strout (buffer, chars, SBYTES (string), - printcharfun, STRING_MULTIBYTE (string)); + strout (buffer, chars, SBYTES (string), printcharfun); SAFE_FREE (); } else /* No need to copy, since output to print_buffer can't GC. */ - strout (SSDATA (string), - chars, SBYTES (string), - printcharfun, STRING_MULTIBYTE (string)); + strout (SSDATA (string), chars, SBYTES (string), printcharfun); } else { @@ -472,7 +469,7 @@ printcharfun = Vstandard_output; PRINTPREPARE; - strout (data, size, size, printcharfun, 0); + strout (data, size, size, printcharfun); PRINTFINISH; } @@ -486,7 +483,7 @@ PRINTDECLARE; PRINTPREPARE; - strout (data, size, size, printcharfun, 0); + strout (data, size, size, printcharfun); PRINTFINISH; } @@ -1404,7 +1401,7 @@ if (EQ (obj, being_printed[i])) { sprintf (buf, "#%d", i); - strout (buf, -1, -1, printcharfun, 0); + strout (buf, -1, -1, printcharfun); return; } being_printed[print_depth] = obj; @@ -1420,7 +1417,7 @@ { /* Add a prefix #n= if OBJ has not yet been printed; that is, its status field is nil. */ sprintf (buf, "#%d=", -n); - strout (buf, -1, -1, printcharfun, 0); + strout (buf, -1, -1, printcharfun); /* OBJ is going to be printed. Remember that fact. */ Fputhash (obj, make_number (- n), Vprint_number_table); } @@ -1428,7 +1425,7 @@ { /* Just print #n# if OBJ has already been printed. */ sprintf (buf, "#%d#", n); - strout (buf, -1, -1, printcharfun, 0); + strout (buf, -1, -1, printcharfun); return; } } @@ -1446,7 +1443,7 @@ sprintf (buf, "%ld", (long) XINT (obj)); else abort (); - strout (buf, -1, -1, printcharfun, 0); + strout (buf, -1, -1, printcharfun); break; case Lisp_Float: @@ -1454,7 +1451,7 @@ char pigbuf[FLOAT_TO_STRING_BUFSIZE]; float_to_string (pigbuf, XFLOAT_DATA (obj)); - strout (pigbuf, -1, -1, printcharfun, 0); + strout (pigbuf, -1, -1, printcharfun); } break; @@ -1532,7 +1529,7 @@ sprintf (outbuf, "\\x%04x", c); need_nonhex = 1; } - strout (outbuf, -1, -1, printcharfun, 0); + strout (outbuf, -1, -1, printcharfun); } else if (! multibyte && SINGLE_BYTE_CHAR_P (c) && ! ASCII_BYTE_P (c) @@ -1544,7 +1541,7 @@ using octal escapes. */ char outbuf[5]; sprintf (outbuf, "\\%03o", c); - strout (outbuf, -1, -1, printcharfun, 0); + strout (outbuf, -1, -1, printcharfun); } else { @@ -1557,7 +1554,7 @@ if ((c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F') || (c >= '0' && c <= '9')) - strout ("\\ ", -1, -1, printcharfun, 0); + strout ("\\ ", -1, -1, printcharfun); } if (c == '\"' || c == '\\') @@ -1645,7 +1642,7 @@ /* If deeper than spec'd depth, print placeholder. */ if (INTEGERP (Vprint_level) && print_depth > XINT (Vprint_level)) - strout ("...", -1, -1, printcharfun, 0); + strout ("...", -1, -1, printcharfun); else if (print_quoted && CONSP (XCDR (obj)) && NILP (XCDR (XCDR (obj))) && (EQ (XCAR (obj), Qquote))) { @@ -1705,7 +1702,7 @@ if (i != 0 && EQ (obj, halftail)) { sprintf (buf, " . #%d", i / 2); - strout (buf, -1, -1, printcharfun, 0); + strout (buf, -1, -1, printcharfun); goto end_of_list; } } @@ -1717,7 +1714,7 @@ Lisp_Object num = Fgethash (obj, Vprint_number_table, Qnil); if (INTEGERP (num)) { - strout (" . ", 3, 3, printcharfun, 0); + strout (" . ", 3, 3, printcharfun); print_object (obj, printcharfun, escapeflag); goto end_of_list; } @@ -1729,7 +1726,7 @@ if (print_length && i > print_length) { - strout ("...", 3, 3, printcharfun, 0); + strout ("...", 3, 3, printcharfun); goto end_of_list; } @@ -1744,7 +1741,7 @@ /* OBJ non-nil here means it's the end of a dotted list. */ if (!NILP (obj)) { - strout (" . ", 3, 3, printcharfun, 0); + strout (" . ", 3, 3, printcharfun); print_object (obj, printcharfun, escapeflag); } @@ -1758,7 +1755,7 @@ { if (escapeflag) { - strout ("#name, printcharfun); PRINTCHAR ('>'); } @@ -1779,7 +1776,7 @@ PRINTCHAR ('#'); PRINTCHAR ('&'); sprintf (buf, "%ld", (long) XBOOL_VECTOR (obj)->size); - strout (buf, -1, -1, printcharfun, 0); + strout (buf, -1, -1, printcharfun); PRINTCHAR ('\"'); /* Don't print more characters than the specified maximum. @@ -1824,18 +1821,18 @@ } else if (SUBRP (obj)) { - strout ("#symbol_name, -1, -1, printcharfun, 0); + strout ("#symbol_name, -1, -1, printcharfun); PRINTCHAR ('>'); } else if (WINDOWP (obj)) { - strout ("#sequence_number)); - strout (buf, -1, -1, printcharfun, 0); + strout (buf, -1, -1, printcharfun); if (!NILP (XWINDOW (obj)->buffer)) { - strout (" on ", -1, -1, printcharfun, 0); + strout (" on ", -1, -1, printcharfun); print_string (BVAR (XBUFFER (XWINDOW (obj)->buffer), name), printcharfun); } PRINTCHAR ('>'); @@ -1843,13 +1840,13 @@ else if (TERMINALP (obj)) { struct terminal *t = XTERMINAL (obj); - strout ("#id); - strout (buf, -1, -1, printcharfun, 0); + strout (buf, -1, -1, printcharfun); if (t->name) { - strout (" on ", -1, -1, printcharfun, 0); - strout (t->name, -1, -1, printcharfun, 0); + strout (" on ", -1, -1, printcharfun); + strout (t->name, -1, -1, printcharfun); } PRINTCHAR ('>'); } @@ -1859,21 +1856,21 @@ int i; EMACS_INT real_size, size; #if 0 - strout ("#test)) { PRINTCHAR (' '); PRINTCHAR ('\''); - strout (SDATA (SYMBOL_NAME (h->test)), -1, -1, printcharfun, 0); + strout (SDATA (SYMBOL_NAME (h->test)), -1, -1, printcharfun); PRINTCHAR (' '); - strout (SDATA (SYMBOL_NAME (h->weak)), -1, -1, printcharfun, 0); + strout (SDATA (SYMBOL_NAME (h->weak)), -1, -1, printcharfun); PRINTCHAR (' '); sprintf (buf, "%ld/%ld", (long) h->count, (long) XVECTOR (h->next)->size); - strout (buf, -1, -1, printcharfun, 0); + strout (buf, -1, -1, printcharfun); } sprintf (buf, " 0x%lx", (unsigned long) h); - strout (buf, -1, -1, printcharfun, 0); + strout (buf, -1, -1, printcharfun); PRINTCHAR ('>'); #endif /* Implement a readable output, e.g.: @@ -1881,33 +1878,33 @@ /* Always print the size. */ sprintf (buf, "#s(hash-table size %ld", (long) XVECTOR (h->next)->size); - strout (buf, -1, -1, printcharfun, 0); + strout (buf, -1, -1, printcharfun); if (!NILP (h->test)) { - strout (" test ", -1, -1, printcharfun, 0); + strout (" test ", -1, -1, printcharfun); print_object (h->test, printcharfun, escapeflag); } if (!NILP (h->weak)) { - strout (" weakness ", -1, -1, printcharfun, 0); + strout (" weakness ", -1, -1, printcharfun); print_object (h->weak, printcharfun, escapeflag); } if (!NILP (h->rehash_size)) { - strout (" rehash-size ", -1, -1, printcharfun, 0); + strout (" rehash-size ", -1, -1, printcharfun); print_object (h->rehash_size, printcharfun, escapeflag); } if (!NILP (h->rehash_threshold)) { - strout (" rehash-threshold ", -1, -1, printcharfun, 0); + strout (" rehash-threshold ", -1, -1, printcharfun); print_object (h->rehash_threshold, printcharfun, escapeflag); } - strout (" data ", -1, -1, printcharfun, 0); + strout (" data ", -1, -1, printcharfun); /* Print the data here as a plist. */ real_size = HASH_TABLE_SIZE (h); @@ -1929,7 +1926,7 @@ } if (size < real_size) - strout (" ...", 4, 4, printcharfun, 0); + strout (" ...", 4, 4, printcharfun); PRINTCHAR (')'); PRINTCHAR (')'); @@ -1938,10 +1935,10 @@ else if (BUFFERP (obj)) { if (NILP (BVAR (XBUFFER (obj), name))) - strout ("#", -1, -1, printcharfun, 0); + strout ("#", -1, -1, printcharfun); else if (escapeflag) { - strout ("#'); } @@ -1950,16 +1947,16 @@ } else if (WINDOW_CONFIGURATIONP (obj)) { - strout ("#", -1, -1, printcharfun, 0); + strout ("#", -1, -1, printcharfun); } else if (FRAMEP (obj)) { strout ((FRAME_LIVE_P (XFRAME (obj)) ? "#name, printcharfun); sprintf (buf, " 0x%lx", (unsigned long) (XFRAME (obj))); - strout (buf, -1, -1, printcharfun, 0); + strout (buf, -1, -1, printcharfun); PRINTCHAR ('>'); } else if (FONTP (obj)) @@ -1969,9 +1966,9 @@ if (! FONT_OBJECT_P (obj)) { if (FONT_SPEC_P (obj)) - strout ("#insertion_type != 0) - strout ("(moves after insertion) ", -1, -1, printcharfun, 0); + strout ("(moves after insertion) ", -1, -1, printcharfun); if (! XMARKER (obj)->buffer) - strout ("in no buffer", -1, -1, printcharfun, 0); + strout ("in no buffer", -1, -1, printcharfun); else { sprintf (buf, "at %ld", (long)marker_position (obj)); - strout (buf, -1, -1, printcharfun, 0); - strout (" in ", -1, -1, printcharfun, 0); + strout (buf, -1, -1, printcharfun); + strout (" in ", -1, -1, printcharfun); print_string (BVAR (XMARKER (obj)->buffer, name), printcharfun); } PRINTCHAR ('>'); break; case Lisp_Misc_Overlay: - strout ("#buffer) - strout ("in no buffer", -1, -1, printcharfun, 0); + strout ("in no buffer", -1, -1, printcharfun); else { sprintf (buf, "from %ld to %ld in ", (long)marker_position (OVERLAY_START (obj)), (long)marker_position (OVERLAY_END (obj))); - strout (buf, -1, -1, printcharfun, 0); + strout (buf, -1, -1, printcharfun); print_string (BVAR (XMARKER (OVERLAY_START (obj))->buffer, name), printcharfun); } @@ -2082,15 +2079,15 @@ /* Remaining cases shouldn't happen in normal usage, but let's print them anyway for the benefit of the debugger. */ case Lisp_Misc_Free: - strout ("#", -1, -1, printcharfun, 0); + strout ("#", -1, -1, printcharfun); break; case Lisp_Misc_Save_Value: - strout ("#pointer, XSAVE_VALUE (obj)->integer); - strout (buf, -1, -1, printcharfun, 0); + strout (buf, -1, -1, printcharfun); PRINTCHAR ('>'); break; @@ -2104,16 +2101,16 @@ { /* We're in trouble if this happens! Probably should just abort () */ - strout ("#size); else sprintf (buf, "(0x%02x)", (int) XTYPE (obj)); - strout (buf, -1, -1, printcharfun, 0); + strout (buf, -1, -1, printcharfun); strout (" Save your buffers immediately and please report this bug>", - -1, -1, printcharfun, 0); + -1, -1, printcharfun); } } === modified file 'src/search.c' --- src/search.c 2011-03-15 21:14:06 +0000 +++ src/search.c 2011-03-28 03:29:18 +0000 @@ -95,10 +95,9 @@ static EMACS_INT simple_search (EMACS_INT, unsigned char *, EMACS_INT, EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT, EMACS_INT, EMACS_INT); -static EMACS_INT boyer_moore (EMACS_INT, unsigned char *, EMACS_INT, EMACS_INT, - Lisp_Object, Lisp_Object, - EMACS_INT, EMACS_INT, - EMACS_INT, EMACS_INT, int); +static EMACS_INT boyer_moore (EMACS_INT, unsigned char *, EMACS_INT, + Lisp_Object, Lisp_Object, EMACS_INT, + EMACS_INT, int); static EMACS_INT search_buffer (Lisp_Object, EMACS_INT, EMACS_INT, EMACS_INT, EMACS_INT, EMACS_INT, int, Lisp_Object, Lisp_Object, int); @@ -1416,15 +1415,14 @@ } len_byte = pat - patbuf; - len = raw_pattern_size; pat = base_pat = patbuf; if (boyer_moore_ok) - return boyer_moore (n, pat, len, len_byte, trt, inverse_trt, - pos, pos_byte, lim, lim_byte, + return boyer_moore (n, pat, len_byte, trt, inverse_trt, + pos_byte, lim_byte, char_base); else - return simple_search (n, pat, len, len_byte, trt, + return simple_search (n, pat, raw_pattern_size, len_byte, trt, pos, pos_byte, lim, lim_byte); } } @@ -1636,8 +1634,8 @@ } /* Do Boyer-Moore search N times for the string BASE_PAT, - whose length is LEN/LEN_BYTE, - from buffer position POS/POS_BYTE until LIM/LIM_BYTE. + whose length is LEN_BYTE, + from buffer position POS_BYTE until LIM_BYTE. DIRECTION says which direction we search in. TRT and INVERSE_TRT are translation tables. Characters in PAT are already translated by TRT. @@ -1652,10 +1650,10 @@ static EMACS_INT boyer_moore (EMACS_INT n, unsigned char *base_pat, - EMACS_INT len, EMACS_INT len_byte, + EMACS_INT len_byte, Lisp_Object trt, Lisp_Object inverse_trt, - EMACS_INT pos, EMACS_INT pos_byte, - EMACS_INT lim, EMACS_INT lim_byte, int char_base) + EMACS_INT pos_byte, EMACS_INT lim_byte, + int char_base) { int direction = ((n > 0) ? 1 : -1); register EMACS_INT dirlen; @@ -1776,8 +1774,8 @@ stride_for_teases = BM_tab[j]; BM_tab[j] = dirlen - i; - /* A translation table is accompanied by its inverse -- see */ - /* comment following downcase_table for details */ + /* A translation table is accompanied by its inverse -- see + comment following downcase_table for details. */ if (ch >= 0) { int starting_ch = ch; === modified file 'src/w32.c' --- src/w32.c 2011-03-26 02:48:03 +0000 +++ src/w32.c 2011-03-28 03:29:18 +0000 @@ -4517,75 +4517,75 @@ int errnum; char * msg; } _wsa_errlist[] = { - WSAEINTR , "Interrupted function call", - WSAEBADF , "Bad file descriptor", - WSAEACCES , "Permission denied", - WSAEFAULT , "Bad address", - WSAEINVAL , "Invalid argument", - WSAEMFILE , "Too many open files", - - WSAEWOULDBLOCK , "Resource temporarily unavailable", - WSAEINPROGRESS , "Operation now in progress", - WSAEALREADY , "Operation already in progress", - WSAENOTSOCK , "Socket operation on non-socket", - WSAEDESTADDRREQ , "Destination address required", - WSAEMSGSIZE , "Message too long", - WSAEPROTOTYPE , "Protocol wrong type for socket", - WSAENOPROTOOPT , "Bad protocol option", - WSAEPROTONOSUPPORT , "Protocol not supported", - WSAESOCKTNOSUPPORT , "Socket type not supported", - WSAEOPNOTSUPP , "Operation not supported", - WSAEPFNOSUPPORT , "Protocol family not supported", - WSAEAFNOSUPPORT , "Address family not supported by protocol family", - WSAEADDRINUSE , "Address already in use", - WSAEADDRNOTAVAIL , "Cannot assign requested address", - WSAENETDOWN , "Network is down", - WSAENETUNREACH , "Network is unreachable", - WSAENETRESET , "Network dropped connection on reset", - WSAECONNABORTED , "Software caused connection abort", - WSAECONNRESET , "Connection reset by peer", - WSAENOBUFS , "No buffer space available", - WSAEISCONN , "Socket is already connected", - WSAENOTCONN , "Socket is not connected", - WSAESHUTDOWN , "Cannot send after socket shutdown", - WSAETOOMANYREFS , "Too many references", /* not sure */ - WSAETIMEDOUT , "Connection timed out", - WSAECONNREFUSED , "Connection refused", - WSAELOOP , "Network loop", /* not sure */ - WSAENAMETOOLONG , "Name is too long", - WSAEHOSTDOWN , "Host is down", - WSAEHOSTUNREACH , "No route to host", - WSAENOTEMPTY , "Buffer not empty", /* not sure */ - WSAEPROCLIM , "Too many processes", - WSAEUSERS , "Too many users", /* not sure */ - WSAEDQUOT , "Double quote in host name", /* really not sure */ - WSAESTALE , "Data is stale", /* not sure */ - WSAEREMOTE , "Remote error", /* not sure */ - - WSASYSNOTREADY , "Network subsystem is unavailable", - WSAVERNOTSUPPORTED , "WINSOCK.DLL version out of range", - WSANOTINITIALISED , "Winsock not initialized successfully", - WSAEDISCON , "Graceful shutdown in progress", + {WSAEINTR , "Interrupted function call"}, + {WSAEBADF , "Bad file descriptor"}, + {WSAEACCES , "Permission denied"}, + {WSAEFAULT , "Bad address"}, + {WSAEINVAL , "Invalid argument"}, + {WSAEMFILE , "Too many open files"}, + + {WSAEWOULDBLOCK , "Resource temporarily unavailable"}, + {WSAEINPROGRESS , "Operation now in progress"}, + {WSAEALREADY , "Operation already in progress"}, + {WSAENOTSOCK , "Socket operation on non-socket"}, + {WSAEDESTADDRREQ , "Destination address required"}, + {WSAEMSGSIZE , "Message too long"}, + {WSAEPROTOTYPE , "Protocol wrong type for socket"}, + {WSAENOPROTOOPT , "Bad protocol option"}, + {WSAEPROTONOSUPPORT , "Protocol not supported"}, + {WSAESOCKTNOSUPPORT , "Socket type not supported"}, + {WSAEOPNOTSUPP , "Operation not supported"}, + {WSAEPFNOSUPPORT , "Protocol family not supported"}, + {WSAEAFNOSUPPORT , "Address family not supported by protocol family"}, + {WSAEADDRINUSE , "Address already in use"}, + {WSAEADDRNOTAVAIL , "Cannot assign requested address"}, + {WSAENETDOWN , "Network is down"}, + {WSAENETUNREACH , "Network is unreachable"}, + {WSAENETRESET , "Network dropped connection on reset"}, + {WSAECONNABORTED , "Software caused connection abort"}, + {WSAECONNRESET , "Connection reset by peer"}, + {WSAENOBUFS , "No buffer space available"}, + {WSAEISCONN , "Socket is already connected"}, + {WSAENOTCONN , "Socket is not connected"}, + {WSAESHUTDOWN , "Cannot send after socket shutdown"}, + {WSAETOOMANYREFS , "Too many references"}, /* not sure */ + {WSAETIMEDOUT , "Connection timed out"}, + {WSAECONNREFUSED , "Connection refused"}, + {WSAELOOP , "Network loop"}, /* not sure */ + {WSAENAMETOOLONG , "Name is too long"}, + {WSAEHOSTDOWN , "Host is down"}, + {WSAEHOSTUNREACH , "No route to host"}, + {WSAENOTEMPTY , "Buffer not empty"}, /* not sure */ + {WSAEPROCLIM , "Too many processes"}, + {WSAEUSERS , "Too many users"}, /* not sure */ + {WSAEDQUOT , "Double quote in host name"}, /* really not sure */ + {WSAESTALE , "Data is stale"}, /* not sure */ + {WSAEREMOTE , "Remote error"}, /* not sure */ + + {WSASYSNOTREADY , "Network subsystem is unavailable"}, + {WSAVERNOTSUPPORTED , "WINSOCK.DLL version out of range"}, + {WSANOTINITIALISED , "Winsock not initialized successfully"}, + {WSAEDISCON , "Graceful shutdown in progress"}, #ifdef WSAENOMORE - WSAENOMORE , "No more operations allowed", /* not sure */ - WSAECANCELLED , "Operation cancelled", /* not sure */ - WSAEINVALIDPROCTABLE , "Invalid procedure table from service provider", - WSAEINVALIDPROVIDER , "Invalid service provider version number", - WSAEPROVIDERFAILEDINIT , "Unable to initialize a service provider", - WSASYSCALLFAILURE , "System call failure", - WSASERVICE_NOT_FOUND , "Service not found", /* not sure */ - WSATYPE_NOT_FOUND , "Class type not found", - WSA_E_NO_MORE , "No more resources available", /* really not sure */ - WSA_E_CANCELLED , "Operation already cancelled", /* really not sure */ - WSAEREFUSED , "Operation refused", /* not sure */ + {WSAENOMORE , "No more operations allowed"}, /* not sure */ + {WSAECANCELLED , "Operation cancelled"}, /* not sure */ + {WSAEINVALIDPROCTABLE , "Invalid procedure table from service provider"}, + {WSAEINVALIDPROVIDER , "Invalid service provider version number"}, + {WSAEPROVIDERFAILEDINIT , "Unable to initialize a service provider"}, + {WSASYSCALLFAILURE , "System call failure"}, + {WSASERVICE_NOT_FOUND , "Service not found"}, /* not sure */ + {WSATYPE_NOT_FOUND , "Class type not found"}, + {WSA_E_NO_MORE , "No more resources available"}, /* really not sure */ + {WSA_E_CANCELLED , "Operation already cancelled"}, /* really not sure */ + {WSAEREFUSED , "Operation refused"}, /* not sure */ #endif - WSAHOST_NOT_FOUND , "Host not found", - WSATRY_AGAIN , "Authoritative host not found during name lookup", - WSANO_RECOVERY , "Non-recoverable error during name lookup", - WSANO_DATA , "Valid name, no data record of requested type", + {WSAHOST_NOT_FOUND , "Host not found"}, + {WSATRY_AGAIN , "Authoritative host not found during name lookup"}, + {WSANO_RECOVERY , "Non-recoverable error during name lookup"}, + {WSANO_DATA , "Valid name, no data record of requested type"}, - -1, NULL + {-1, NULL} }; char * === modified file 'src/xdisp.c' --- src/xdisp.c 2011-03-26 12:20:20 +0000 +++ src/xdisp.c 2011-03-28 03:29:18 +0000 @@ -754,7 +754,7 @@ static void mark_window_display_accurate_1 (struct window *, int); static int single_display_spec_string_p (Lisp_Object, Lisp_Object); static int display_prop_string_p (Lisp_Object, Lisp_Object); -static int cursor_row_p (struct window *, struct glyph_row *); +static int cursor_row_p (struct glyph_row *); static int redisplay_mode_lines (Lisp_Object, int); static char *decode_mode_spec_coding (Lisp_Object, char *, int); @@ -823,8 +823,7 @@ static int display_mode_line (struct window *, enum face_id, Lisp_Object); static int display_mode_element (struct it *, int, int, int, Lisp_Object, Lisp_Object, int); static int store_mode_line_string (const char *, Lisp_Object, int, int, int, Lisp_Object); -static const char *decode_mode_spec (struct window *, int, int, int, - Lisp_Object *); +static const char *decode_mode_spec (struct window *, int, int, Lisp_Object *); static void display_menu_bar (struct window *); static int display_count_lines (EMACS_INT, EMACS_INT, EMACS_INT, int, EMACS_INT *); @@ -4420,20 +4419,18 @@ return 0; } -/* Look for STRING in overlays and text properties in W's buffer, - between character positions FROM and TO (excluding TO). +/* Look for STRING in overlays and text properties in the current + buffer, between character positions FROM and TO (excluding TO). BACK_P non-zero means look back (in this case, TO is supposed to be less than FROM). Value is the first character position where STRING was found, or zero if it wasn't found before hitting TO. - W's buffer must be current. - This function may only use code that doesn't eval because it is called asynchronously from note_mouse_highlight. */ static EMACS_INT -string_buffer_position_lim (struct window *w, Lisp_Object string, +string_buffer_position_lim (Lisp_Object string, EMACS_INT from, EMACS_INT to, int back_p) { Lisp_Object limit, prop, pos; @@ -4471,27 +4468,25 @@ return found ? XINT (pos) : 0; } -/* Determine which buffer position in W's buffer STRING comes from. +/* Determine which buffer position in current buffer STRING comes from. AROUND_CHARPOS is an approximate position where it could come from. Value is the buffer position or 0 if it couldn't be determined. - W's buffer must be current. - This function is necessary because we don't record buffer positions in glyphs generated from strings (to keep struct glyph small). This function may only use code that doesn't eval because it is called asynchronously from note_mouse_highlight. */ -EMACS_INT -string_buffer_position (struct window *w, Lisp_Object string, EMACS_INT around_charpos) +static EMACS_INT +string_buffer_position (Lisp_Object string, EMACS_INT around_charpos) { const int MAX_DISTANCE = 1000; - EMACS_INT found = string_buffer_position_lim (w, string, around_charpos, + EMACS_INT found = string_buffer_position_lim (string, around_charpos, around_charpos + MAX_DISTANCE, 0); if (!found) - found = string_buffer_position_lim (w, string, around_charpos, + found = string_buffer_position_lim (string, around_charpos, around_charpos - MAX_DISTANCE, 1); return found; } @@ -12731,7 +12726,7 @@ EMACS_INT tem; str = glyph->object; - tem = string_buffer_position_lim (w, str, pos, pos_after, 0); + tem = string_buffer_position_lim (str, pos, pos_after, 0); if (tem == 0 /* from overlay */ || pos <= tem) { @@ -13457,7 +13452,7 @@ && row < w->current_matrix->rows + w->current_matrix->nrows - 1 && MATRIX_ROW_START_CHARPOS (row+1) == PT - && !cursor_row_p (w, row)) + && !cursor_row_p (row)) ++row; /* If within the scroll margin, scroll. Note that @@ -13509,7 +13504,7 @@ skip forward over overlay strings. */ while (MATRIX_ROW_BOTTOM_Y (row) < last_y && MATRIX_ROW_END_CHARPOS (row) == PT - && !cursor_row_p (w, row)) + && !cursor_row_p (row)) ++row; /* If within the scroll margin, scroll. */ @@ -13605,7 +13600,7 @@ { if (MATRIX_ROW_START_CHARPOS (row) <= PT && PT <= MATRIX_ROW_END_CHARPOS (row) - && cursor_row_p (w, row)) + && cursor_row_p (row)) rv |= set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0); /* As soon as we've found the first suitable row @@ -13644,7 +13639,7 @@ } while (MATRIX_ROW_BOTTOM_Y (row) < last_y && MATRIX_ROW_START_CHARPOS (row) == PT - && cursor_row_p (w, row)); + && cursor_row_p (row)); } } } @@ -16971,11 +16966,11 @@ } -/* Value is non-zero if glyph row ROW in window W should be +/* Value is non-zero if glyph row ROW should be used to hold the cursor. */ static int -cursor_row_p (struct window *w, struct glyph_row *row) +cursor_row_p (struct glyph_row *row) { int result = 1; @@ -17888,7 +17883,7 @@ && !MATRIX_ROW (it->w->desired_matrix, cvpos)->ends_at_zv_p)) && PT >= MATRIX_ROW_START_CHARPOS (row) && PT <= MATRIX_ROW_END_CHARPOS (row) - && cursor_row_p (it->w, row)) + && cursor_row_p (row)) set_cursor_from_row (it->w, row, it->w->desired_matrix, 0, 0, 0, 0); /* Highlight trailing whitespace. */ @@ -18540,7 +18535,7 @@ charpos = (STRING_MULTIBYTE (elt) ? string_byte_to_char (elt, bytepos) : bytepos); - spec = decode_mode_spec (it->w, c, field, prec, &string); + spec = decode_mode_spec (it->w, c, field, &string); multibyte = STRINGP (string) && STRING_MULTIBYTE (string); switch (mode_line_target) @@ -19211,9 +19206,8 @@ } /* Return a string for the output of a mode line %-spec for window W, - generated by character C. PRECISION >= 0 means don't return a - string longer than that value. FIELD_WIDTH > 0 means pad the - string returned with spaces to that value. Return a Lisp string in + generated by character C. FIELD_WIDTH > 0 means pad the string + returned with spaces to that value. Return a Lisp string in *STRING if the resulting string is taken from that Lisp string. Note we operate on the current buffer for most purposes, @@ -19223,7 +19217,7 @@ static const char * decode_mode_spec (struct window *w, register int c, int field_width, - int precision, Lisp_Object *string) + Lisp_Object *string) { Lisp_Object obj; struct frame *f = XFRAME (WINDOW_FRAME (w)); @@ -24324,7 +24318,7 @@ END_CHARPOS, or if they come from an overlay. */ if (EQ (glyph->object, before_string)) { - pos = string_buffer_position (w, before_string, + pos = string_buffer_position (before_string, start_charpos); /* If pos == 0, it means before_string came from an overlay, not from a buffer position. */ @@ -24333,7 +24327,7 @@ } else if (EQ (glyph->object, after_string)) { - pos = string_buffer_position (w, after_string, end_charpos); + pos = string_buffer_position (after_string, end_charpos); if (!pos || (pos >= start_charpos && pos < end_charpos)) break; } @@ -24375,7 +24369,7 @@ END_CHARPOS, or if they come from an overlay. */ if (EQ (glyph->object, before_string)) { - pos = string_buffer_position (w, before_string, start_charpos); + pos = string_buffer_position (before_string, start_charpos); /* If pos == 0, it means before_string came from an overlay, not from a buffer position. */ if (!pos || (pos >= start_charpos && pos < end_charpos)) @@ -24383,7 +24377,7 @@ } else if (EQ (glyph->object, after_string)) { - pos = string_buffer_position (w, after_string, end_charpos); + pos = string_buffer_position (after_string, end_charpos); if (!pos || (pos >= start_charpos && pos < end_charpos)) break; } @@ -24441,13 +24435,13 @@ END_CHARPOS, or if they come from an overlay. */ if (EQ (end->object, before_string)) { - pos = string_buffer_position (w, before_string, start_charpos); + pos = string_buffer_position (before_string, start_charpos); if (!pos || (pos >= start_charpos && pos < end_charpos)) break; } else if (EQ (end->object, after_string)) { - pos = string_buffer_position (w, after_string, end_charpos); + pos = string_buffer_position (after_string, end_charpos); if (!pos || (pos >= start_charpos && pos < end_charpos)) break; } @@ -24491,13 +24485,13 @@ END_CHARPOS, or if they come from an overlay. */ if (EQ (end->object, before_string)) { - pos = string_buffer_position (w, before_string, start_charpos); + pos = string_buffer_position (before_string, start_charpos); if (!pos || (pos >= start_charpos && pos < end_charpos)) break; } else if (EQ (end->object, after_string)) { - pos = string_buffer_position (w, after_string, end_charpos); + pos = string_buffer_position (after_string, end_charpos); if (!pos || (pos >= start_charpos && pos < end_charpos)) break; } @@ -25481,7 +25475,7 @@ check if the text under it has one. */ struct glyph_row *r = MATRIX_ROW (w->current_matrix, vpos); EMACS_INT start = MATRIX_ROW_START_CHARPOS (r); - pos = string_buffer_position (w, object, start); + pos = string_buffer_position (object, start); if (pos > 0) { mouse_face = get_char_property_and_overlay @@ -25591,7 +25585,7 @@ struct glyph_row *r = MATRIX_ROW (w->current_matrix, vpos); EMACS_INT start = MATRIX_ROW_START_CHARPOS (r); - EMACS_INT p = string_buffer_position (w, obj, start); + EMACS_INT p = string_buffer_position (obj, start); if (p > 0) { help = Fget_char_property (make_number (p), @@ -25647,7 +25641,7 @@ struct glyph_row *r = MATRIX_ROW (w->current_matrix, vpos); EMACS_INT start = MATRIX_ROW_START_CHARPOS (r); - EMACS_INT p = string_buffer_position (w, obj, start); + EMACS_INT p = string_buffer_position (obj, start); if (p > 0) pointer = Fget_char_property (make_number (p), Qpointer, w->buffer); ------------------------------------------------------------ revno: 103766 committer: Glenn Morris branch nick: trunk timestamp: Sun 2011-03-27 18:03:57 -0700 message: * autogen/update_autogen: Pass -f to autoreconf. diff: === modified file 'ChangeLog' --- ChangeLog 2011-03-28 00:48:39 +0000 +++ ChangeLog 2011-03-28 01:03:57 +0000 @@ -1,5 +1,7 @@ 2011-03-28 Glenn Morris + * autogen/update_autogen: Pass -f to autoreconf. + * autogen.sh (get_version): Discard "not found" lines. (check_version): Respect $AUTOCONF etc environment variables. === modified file 'autogen/update_autogen' --- autogen/update_autogen 2011-03-25 18:16:41 +0000 +++ autogen/update_autogen 2011-03-28 01:03:57 +0000 @@ -126,7 +126,7 @@ echo "Running autoreconf..." -autoreconf -i -I m4 2>| $tempfile +autoreconf -f -i -I m4 2>| $tempfile retval=$? ------------------------------------------------------------ revno: 103765 committer: Glenn Morris branch nick: trunk timestamp: Sun 2011-03-27 17:48:39 -0700 message: Make autogen.sh respect AUTOCONF etc. * autogen.sh (get_version): Discard "not found" lines. (check_version): Respect $AUTOCONF etc environment variables. diff: === modified file 'ChangeLog' --- ChangeLog 2011-03-27 02:27:11 +0000 +++ ChangeLog 2011-03-28 00:48:39 +0000 @@ -1,3 +1,8 @@ +2011-03-28 Glenn Morris + + * autogen.sh (get_version): Discard "not found" lines. + (check_version): Respect $AUTOCONF etc environment variables. + 2011-03-27 Glenn Morris * configure.in (AC_TYPE_SIGNAL): Remove obsolete macro. === modified file 'autogen.sh' --- autogen.sh 2011-03-25 07:14:31 +0000 +++ autogen.sh 2011-03-28 00:48:39 +0000 @@ -30,6 +30,7 @@ ### Code: ## Tools we need: +## Note that we respect the values of AUTOCONF etc, like autoreconf does. progs="autoconf automake" ## Minimum versions we need: @@ -46,7 +47,8 @@ ## Also note that we do not handle micro versions. get_version () { - $1 --version 2>&1 | sed -n '1 s/.* \([1-9][0-9\.]*\).*/\1/p' + ## Remove eg "./autogen.sh: line 50: autoconf: command not found". + $1 --version 2>&1 | sed -e '/not found/d' -n -e '1 s/.* \([1-9][0-9\.]*\).*/\1/p' } ## $1 = version string, eg "2.59" @@ -71,7 +73,14 @@ ## Return 3 for unexpected error (eg failed to parse version). check_version () { - have_version=`get_version $1` + ## Respect eg $AUTOMAKE if it is set, like autoreconf does. + uprog=`echo $1 | sed 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + + eval uprog=\$${uprog} + + [ x"$uprog" = x ] && uprog=$1 + + have_version=`get_version $uprog` [ x"$have_version" = x ] && return 1 ------------------------------------------------------------ revno: 103764 committer: Jan D. branch nick: trunk timestamp: Sun 2011-03-27 12:55:07 +0200 message: Format doc and add customize for ns-auto-hide-menu-bar. * lisp/cus-start.el (all): Add boolean ns-auto-hide-menu-bar. * src/nsterm.m (syms_of_nsterm): Use doc: for ns-auto-hide-menu-bar. diff: === modified file 'etc/NEWS' --- etc/NEWS 2011-03-21 16:34:16 +0000 +++ etc/NEWS 2011-03-27 10:55:07 +0000 @@ -162,6 +162,9 @@ ** On graphical displays, the mode-line no longer ends in dashes. +** On Nextstep/OSX, the menu bar can be hidden by customizing + ns-auto-hide-menu-bar. + ** Basic SELinux support has been added. This requires Emacs to be linked with libselinux at build time. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-03-27 01:56:35 +0000 +++ lisp/ChangeLog 2011-03-27 10:55:07 +0000 @@ -1,3 +1,7 @@ +2011-03-27 Jan Djärv + + * cus-start.el (all): Add boolean ns-auto-hide-menu-bar. + 2011-03-27 Leo Liu * ansi-color.el (ansi-color-names-vector): Allow cons cell value === modified file 'lisp/cus-start.el' --- lisp/cus-start.el 2011-03-08 04:34:31 +0000 +++ lisp/cus-start.el 2011-03-27 10:55:07 +0000 @@ -356,6 +356,7 @@ (const alt) (const hyper) (const super)) "23.1") (ns-antialias-text ns boolean "23.1") + (ns-auto-hide-menu-bar ns boolean "24.0") ;; process.c (delete-exited-processes processes-basics boolean) ;; syntax.c === modified file 'src/ChangeLog' --- src/ChangeLog 2011-03-27 10:36:44 +0000 +++ src/ChangeLog 2011-03-27 10:55:07 +0000 @@ -1,3 +1,7 @@ +2011-03-27 Jan Djärv + + * nsterm.m (syms_of_nsterm): Use doc: for ns-auto-hide-menu-bar. + 2011-03-27 Anders Lindgren * nsterm.m (ns_menu_bar_is_hidden): New variable. === modified file 'src/nsterm.m' --- src/nsterm.m 2011-03-27 10:36:44 +0000 +++ src/nsterm.m 2011-03-27 10:55:07 +0000 @@ -6486,7 +6486,8 @@ last_mouse_motion_frame = Qnil; DEFVAR_LISP ("ns-auto-hide-menu-bar", ns_auto_hide_menu_bar, - "Non-nil means that the menu bar is hidden, but appears when the mouse is near. Only works on OSX 10.6 or later."); + doc: /* Non-nil means that the menu bar is hidden, but appears when the mouse is near. +Only works on OSX 10.6 or later. */); ns_auto_hide_menu_bar = Qnil; /* TODO: move to common code */ ------------------------------------------------------------ revno: 103763 committer: Jan D. branch nick: trunk timestamp: Sun 2011-03-27 12:36:44 +0200 message: Introduce ns-auto-hide-menu-bar to hide menubar for Emacs frames. Code by Anders Lindgren. * nsterm.m (ns_menu_bar_is_hidden): New variable. (ns_constrain_all_frames, ns_menu_bar_should_be_hidden) (ns_update_auto_hide_menu_bar): New functions. (ns_update_begin): Call ns_update_auto_hide_menu_bar. (applicationDidBecomeActive): Call ns_update_auto_hide_menu_bar and ns_constrain_all_frames. (constrainFrameRect): Return at once if ns_menu_bar_should_be_hidden. (syms_of_nsterm): DEFVAR ns-auto-hide-menu-bar, init to Qnil. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-03-27 09:23:52 +0000 +++ src/ChangeLog 2011-03-27 10:36:44 +0000 @@ -1,3 +1,14 @@ +2011-03-27 Anders Lindgren + + * nsterm.m (ns_menu_bar_is_hidden): New variable. + (ns_constrain_all_frames, ns_menu_bar_should_be_hidden) + (ns_update_auto_hide_menu_bar): New functions. + (ns_update_begin): Call ns_update_auto_hide_menu_bar. + (applicationDidBecomeActive): Call ns_update_auto_hide_menu_bar and + ns_constrain_all_frames. + (constrainFrameRect): Return at once if ns_menu_bar_should_be_hidden. + (syms_of_nsterm): DEFVAR ns-auto-hide-menu-bar, init to Qnil. + 2011-03-27 Jan Djärv * nsmenu.m (runDialogAt): Remove argument to timer_check. === modified file 'src/nsterm.m' --- src/nsterm.m 2011-03-07 09:00:11 +0000 +++ src/nsterm.m 2011-03-27 10:36:44 +0000 @@ -170,6 +170,7 @@ static BOOL ns_fake_keydown = NO; int ns_tmp_flags; /* FIXME */ struct nsfont_info *ns_tmp_font; /* FIXME */ +static BOOL ns_menu_bar_is_hidden = NO; /*static int debug_lock = 0; */ /* event loop */ @@ -505,6 +506,118 @@ } +// +// Window constraining +// ------------------- +// +// To ensure that the windows are not placed under the menu bar, they +// are typically moved by the call-back constrainFrameRect. However, +// by overriding it, it's possible to inhibit this, leaving the window +// in it's original position. +// +// It's possible to hide the menu bar. However, technically, it's only +// possible to hide it when the application is active. To ensure that +// this work properly, the menu bar and window constraining are +// deferred until the application becomes active. +// +// Even though it's not possible to manually move a window above the +// top of the screen, it is allowed if it's done programmatically, +// when the menu is hidden. This allows the editable area to cover the +// full screen height. +// +// Test cases +// ---------- +// +// Use the following extra files: +// +// init.el: +// ;; Hide menu and place frame slightly above the top of the screen. +// (setq ns-auto-hide-menu-bar t) +// (set-frame-position (selected-frame) 0 -20) +// +// Test 1: +// +// emacs -Q -l init.el +// +// Result: No menu bar, and the title bar should be above the screen. +// +// Test 2: +// +// emacs -Q +// +// Result: Menu bar visible, frame placed immediately below the menu. +// + +static void +ns_constrain_all_frames (void) +{ + Lisp_Object tail, frame; + + FOR_EACH_FRAME (tail, frame) + { + struct frame *f = XFRAME (frame); + if (FRAME_NS_P (f)) + { + NSView *view = FRAME_NS_VIEW (f); + /* This no-op will trigger the default window placing + * constriant system. */ + f->output_data.ns->dont_constrain = 0; + [[view window] setFrameOrigin:[[view window] frame].origin]; + } + } +} + + +/* True, if the menu bar should be hidden. */ + +static BOOL +ns_menu_bar_should_be_hidden (void) +{ + return !NILP (ns_auto_hide_menu_bar) + && [NSApp respondsToSelector:@selector(setPresentationOptions:)]; +} + + +/* Show or hide the menu bar, based on user setting. */ + +static void +ns_update_auto_hide_menu_bar (void) +{ + BLOCK_INPUT; + + NSTRACE (ns_update_auto_hide_menu_bar); + + if (NSApp != nil + && [NSApp isActive] + && [NSApp respondsToSelector:@selector(setPresentationOptions:)]) + { + // Note, "setPresentationOptions" triggers an error unless the + // application is active. + BOOL menu_bar_should_be_hidden = ns_menu_bar_should_be_hidden (); + + if (menu_bar_should_be_hidden != ns_menu_bar_is_hidden) + { + NSApplicationPresentationOptions options + = NSApplicationPresentationAutoHideDock; + + if (menu_bar_should_be_hidden) + options |= NSApplicationPresentationAutoHideMenuBar; + + [NSApp setPresentationOptions: options]; + + ns_menu_bar_is_hidden = menu_bar_should_be_hidden; + + if (!ns_menu_bar_is_hidden) + { + ns_constrain_all_frames (); + } + } + } + + UNBLOCK_INPUT; +} + + static void ns_update_begin (struct frame *f) /* -------------------------------------------------------------------------- @@ -515,6 +628,8 @@ NSView *view = FRAME_NS_VIEW (f); NSTRACE (ns_update_begin); + ns_update_auto_hide_menu_bar (); + ns_updating_frame = f; [view lockFocus]; @@ -4205,7 +4320,13 @@ } - (void)applicationDidBecomeActive: (NSNotification *)notification { + NSTRACE (applicationDidBecomeActive); + //ns_app_active=YES; + + ns_update_auto_hide_menu_bar (); + // No constrining takes place when the application is not active. + ns_constrain_all_frames (); } - (void)applicationDidResignActive: (NSNotification *)notification { @@ -5689,7 +5810,10 @@ /* When making the frame visible for the first time, we want to constrain. Other times not. */ struct frame *f = ((EmacsView *)[self delegate])->emacsframe; - if (f->output_data.ns->dont_constrain) + NSTRACE (constrainFrameRect); + + if (f->output_data.ns->dont_constrain + || ns_menu_bar_should_be_hidden ()) return frameRect; f->output_data.ns->dont_constrain = 1; @@ -6361,6 +6485,10 @@ staticpro (&last_mouse_motion_frame); last_mouse_motion_frame = Qnil; + DEFVAR_LISP ("ns-auto-hide-menu-bar", ns_auto_hide_menu_bar, + "Non-nil means that the menu bar is hidden, but appears when the mouse is near. Only works on OSX 10.6 or later."); + ns_auto_hide_menu_bar = Qnil; + /* TODO: move to common code */ DEFVAR_LISP ("x-toolkit-scroll-bars", Vx_toolkit_scroll_bars, doc: /* If not nil, Emacs uses toolkit scroll bars. */); ------------------------------------------------------------ revno: 103762 committer: Jan D. branch nick: trunk timestamp: Sun 2011-03-27 11:23:52 +0200 message: * nsmenu.m (runDialogAt): Remove argument to timer_check. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-03-27 02:27:11 +0000 +++ src/ChangeLog 2011-03-27 09:23:52 +0000 @@ -1,3 +1,7 @@ +2011-03-27 Jan Djärv + + * nsmenu.m (runDialogAt): Remove argument to timer_check. + 2011-03-27 Glenn Morris * syssignal.h: Replace RETSIGTYPE with void. === modified file 'src/nsmenu.m' --- src/nsmenu.m 2011-01-25 04:08:28 +0000 +++ src/nsmenu.m 2011-03-27 09:23:52 +0000 @@ -1705,7 +1705,6 @@ - (Lisp_Object)runDialogAt: (NSPoint)p { NSInteger ret; - extern EMACS_TIME timer_check (int do_it_now); /* TODO: add to a header */ /* initiate a session that will be ended by pop_down_menu */ popupSession = [NSApp beginModalSessionForWindow: self]; @@ -1715,7 +1714,7 @@ { /* Run this for timers.el, indep of atimers; might not return. TODO: use return value to avoid calling every iteration. */ - timer_check (1); + timer_check (); [NSThread sleepUntilDate: [NSDate dateWithTimeIntervalSinceNow: 0.1]]; } ------------------------------------------------------------ revno: 103761 committer: Glenn Morris branch nick: trunk timestamp: Sat 2011-03-26 22:33:36 -0400 message: Auto-commit of generated files. diff: === modified file 'autogen/config.in' --- autogen/config.in 2011-03-25 19:28:35 +0000 +++ autogen/config.in 2011-03-27 02:33:36 +0000 @@ -999,9 +999,6 @@ slash */ #undef REPLACE_FUNC_STAT_FILE -/* Define as the return type of signal handlers (`int' or `void'). */ -#undef RETSIGTYPE - /* Define to l, ll, u, ul, ull, etc., as suitable for constants of type 'sig_atomic_t'. */ #undef SIG_ATOMIC_T_SUFFIX @@ -1274,11 +1271,6 @@ # define SYSTEM_PURESIZE_EXTRA 30000 #endif -/* SIGTYPE is the macro we actually use. */ -#ifndef SIGTYPE -#define SIGTYPE RETSIGTYPE -#endif - #ifdef emacs /* Don't do this for lib-src. */ /* Tell regex.c to use a type compatible with Emacs. */ #define RE_TRANSLATE_TYPE Lisp_Object === modified file 'autogen/configure' --- autogen/configure 2011-03-25 19:28:35 +0000 +++ autogen/configure 2011-03-27 02:33:36 +0000 @@ -7899,40 +7899,6 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5 -$as_echo_n "checking return type of signal handlers... " >&6; } -if test "${ac_cv_type_signal+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include - -int -main () -{ -return *(signal (0, 0)) (0) == 1; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_type_signal=int -else - ac_cv_type_signal=void -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5 -$as_echo "$ac_cv_type_signal" >&6; } - -cat >>confdefs.h <<_ACEOF -#define RETSIGTYPE $ac_cv_type_signal -_ACEOF - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for speed_t" >&5 $as_echo_n "checking for speed_t... " >&6; } if test "${emacs_cv_speed_t+set}" = set; then :