Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 100991. ------------------------------------------------------------ revno: 100991 committer: Dan Nicolaescu branch nick: trunk timestamp: Thu 2010-08-05 21:09:54 -0700 message: emacsclient.c cleanups. * lib-src/emacsclient.c: Move socket related #includes together with the rest of the #includes. Move a WINDOWSNT includes closer together. (HAVE_CONFIG_H): Remove. (NO_RETURN): Remove, defined in config.h. (main): Convert definition to standard C. diff: === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2010-07-29 02:42:53 +0000 +++ lib-src/ChangeLog 2010-08-06 04:09:54 +0000 @@ -1,3 +1,11 @@ +2010-08-06 Dan Nicolaescu + + * emacsclient.c: Move socket related #includes together with the + rest of the #includes. Move a WINDOWSNT includes closer together. + (HAVE_CONFIG_H): Remove. + (NO_RETURN): Remove, defined in config.h. + (main): Convert definition to standard C. + 2010-07-29 Juanma Barranquero * make-docfile.c (write_c_args): Warn for old-style empty arglist (). === modified file 'lib-src/emacsclient.c' --- lib-src/emacsclient.c 2010-07-25 03:36:54 +0000 +++ lib-src/emacsclient.c 2010-08-06 04:09:54 +0000 @@ -18,9 +18,7 @@ along with GNU Emacs. If not, see . */ -#ifdef HAVE_CONFIG_H #include -#endif #ifdef WINDOWSNT @@ -32,6 +30,8 @@ # include # include # include +# include +# include # define NO_SOCKETS_IN_FILE_SYSTEM @@ -45,8 +45,12 @@ # ifdef HAVE_INET_SOCKETS # include +# ifdef HAVE_SOCKETS +# include +# include +# include +# endif /* HAVE_SOCKETS */ # endif - # include # define INVALID_SOCKET -1 @@ -67,19 +71,15 @@ #include #include "getopt.h" #ifdef HAVE_UNISTD_H -#include +# include #endif -#ifdef WINDOWSNT -# include -#else /* not WINDOWSNT */ -# include -#endif /* not WINDOWSNT */ +#include #include - #include #include + char *getenv (const char *), *getwd (char *); #ifdef HAVE_GETCWD @@ -114,10 +114,6 @@ #define TRUE 1 #endif -#ifndef NO_RETURN -#define NO_RETURN -#endif - /* Additional space when allocating buffers for filenames, etc. */ #define EXTRA_SPACE 100 @@ -702,9 +698,7 @@ #if !defined (HAVE_SOCKETS) || !defined (HAVE_INET_SOCKETS) int -main (argc, argv) - int argc; - char **argv; +main (int argc, char **argv) { main_argv = argv; progname = argv[0]; @@ -716,14 +710,6 @@ #else /* HAVE_SOCKETS && HAVE_INET_SOCKETS */ -#ifdef WINDOWSNT -# include -#else -# include -# include -# include -#endif - #define AUTH_KEY_LENGTH 64 #define SEND_BUFFER_SIZE 4096 ------------------------------------------------------------ revno: 100990 committer: Dan Nicolaescu branch nick: trunk timestamp: Thu 2010-08-05 21:01:00 -0700 message: * lisp/vc/diff-mode.el (diff-mode-shared-map): Bind g to revert-buffer. diff: === modified file 'etc/NEWS' --- etc/NEWS 2010-08-01 13:57:07 +0000 +++ etc/NEWS 2010-08-06 04:01:00 +0000 @@ -258,6 +258,9 @@ **** vc-bzr handles Author:, Date: and Fixes: **** vc-mtn handles Author: and Date: +*** Pressing g in a *vc-diff* buffer reruns vc-diff, so it will +produce an up to date diff. + ** Directory local variables can apply to file-less buffers. For example, adding "(diff-mode . ((mode . whitespace)))" to your .dir-locals.el file, will turn on `whitespace-mode' for *vc-diff* buffers. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-08-05 17:11:32 +0000 +++ lisp/ChangeLog 2010-08-06 04:01:00 +0000 @@ -1,3 +1,7 @@ +2010-08-06 Dan Nicolaescu + + * vc/diff-mode.el (diff-mode-shared-map): Bind g to revert-buffer. + 2010-08-05 Eli Zaretskii * emacs-lisp/find-gc.el (find-gc-source-files): Rename === modified file 'lisp/vc/diff-mode.el' --- lisp/vc/diff-mode.el 2010-06-29 18:17:31 +0000 +++ lisp/vc/diff-mode.el 2010-08-06 04:01:00 +0000 @@ -141,6 +141,7 @@ ;; Standard M-r is useful, so don't change M-r or M-R. ;;("r" . diff-restrict-view) ;;("R" . diff-reverse-direction) + ("g" . revert-buffer) ("q" . quit-window)) "Basic keymap for `diff-mode', bound to various prefix keys.") ------------------------------------------------------------ revno: 100989 [merge] committer: Katsumi Yamaoka branch nick: trunk timestamp: Fri 2010-08-06 03:44:13 +0000 message: (rfc2047-encode): Use utf-8 charset as a last resort. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-08-01 23:49:32 +0000 +++ lisp/gnus/ChangeLog 2010-08-06 03:43:29 +0000 @@ -1,3 +1,8 @@ +2010-08-06 Katsumi Yamaoka + + * rfc2047.el (rfc2047-encode): Use utf-8 as a last resort if + determining charset of text fails. + 2010-08-01 Katsumi Yamaoka * nnmail.el (nnmail-get-new-mail-1): Revert. === modified file 'lisp/gnus/rfc2047.el' --- lisp/gnus/rfc2047.el 2010-05-25 02:11:08 +0000 +++ lisp/gnus/rfc2047.el 2010-08-06 03:43:29 +0000 @@ -655,6 +655,9 @@ Point moves to the end of the region." (let ((mime-charset (or (mm-find-mime-charset-region b e) (list 'us-ascii))) cs encoding tail crest eword) + ;; Use utf-8 as a last resort if determining charset of text fails. + (if (memq nil mime-charset) + (setq mime-charset (list 'utf-8))) (cond ((> (length mime-charset) 1) (error "Can't rfc2047-encode `%s'" (buffer-substring-no-properties b e))) ------------------------------------------------------------ revno: 100988 committer: Juanma Barranquero branch nick: trunk timestamp: Fri 2010-08-06 02:44:56 +0200 message: src/ChangeLog: Fix entry. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-08-06 00:36:12 +0000 +++ src/ChangeLog 2010-08-06 00:44:56 +0000 @@ -15,8 +15,7 @@ * menu.h (xmalloc_widget_value, digest_single_submenu): Declare. - * dired.c (compile_pattern): - * syssignal.h (signal_handler_t): Restore declarations. + * dired.c (compile_pattern): Restore declaration. 2010-08-05 Dan Nicolaescu ------------------------------------------------------------ revno: 100987 committer: Dan Nicolaescu branch nick: trunk timestamp: Thu 2010-08-05 17:36:12 -0700 message: Cleanup process.c. * src/process.c: Remove HAVE_SOCKETS #ifdefs inside #ifdef subprocesses, only MSDOS does not define HAVE_SOCKETS. (socket_options): Use const char* for name. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-08-06 00:16:24 +0000 +++ src/ChangeLog 2010-08-06 00:36:12 +0000 @@ -1,3 +1,9 @@ +2010-08-06 Dan Nicolaescu + + * process.c: Remove HAVE_SOCKETS #ifdefs inside #ifdef + subprocesses, only MSDOS does not define HAVE_SOCKETS. + (socket_options): Use const char* for name. + 2010-08-06 Juanma Barranquero Fix changes in revnos 100982..100984 for Windows build. === modified file 'src/process.c' --- src/process.c 2010-07-27 03:59:42 +0000 +++ src/process.c 2010-08-06 00:36:12 +0000 @@ -43,7 +43,6 @@ /* Only MS-DOS does not define `subprocesses'. */ #ifdef subprocesses -#ifdef HAVE_SOCKETS /* TCP connection support, if kernel can do it */ #include #include #include @@ -59,7 +58,6 @@ #include #endif #endif -#endif /* HAVE_SOCKETS */ #if defined(HAVE_SYS_IOCTL_H) #include @@ -73,7 +71,6 @@ #endif /* Can we use SIOCGIFCONF and/or SIOCGIFADDR */ -#ifdef HAVE_SOCKETS #if defined(HAVE_SYS_IOCTL_H) && defined(HAVE_NET_IF_H) /* sys/ioctl.h may have been included already */ #ifndef SIOCGIFADDR @@ -81,7 +78,6 @@ #endif #include #endif -#endif #ifdef HAVE_SYS_WAIT #include @@ -169,17 +165,10 @@ /* QCfilter is defined in keyboard.c. */ extern Lisp_Object QCfilter; -#ifdef HAVE_SOCKETS #define NETCONN_P(p) (EQ (XPROCESS (p)->type, Qnetwork)) #define NETCONN1_P(p) (EQ ((p)->type, Qnetwork)) #define SERIALCONN_P(p) (EQ (XPROCESS (p)->type, Qserial)) #define SERIALCONN1_P(p) (EQ ((p)->type, Qserial)) -#else -#define NETCONN_P(p) 0 -#define NETCONN1_P(p) 0 -#define SERIALCONN_P(p) 0 -#define SERIALCONN1_P(p) 0 -#endif /* HAVE_SOCKETS */ /* Define first descriptor number available for subprocesses. */ #define FIRST_PROC_DESC 3 @@ -225,7 +214,6 @@ #undef NON_BLOCKING_CONNECT #else #ifndef NON_BLOCKING_CONNECT -#ifdef HAVE_SOCKETS #ifdef HAVE_SELECT #if defined (HAVE_GETPEERNAME) || defined (GNU_LINUX) #if defined (O_NONBLOCK) || defined (O_NDELAY) @@ -235,7 +223,6 @@ #endif /* O_NONBLOCK || O_NDELAY */ #endif /* HAVE_GETPEERNAME || GNU_LINUX */ #endif /* HAVE_SELECT */ -#endif /* HAVE_SOCKETS */ #endif /* NON_BLOCKING_CONNECT */ #endif /* BROKEN_NON_BLOCKING_CONNECT */ @@ -248,13 +235,11 @@ #undef DATAGRAM_SOCKETS #else #ifndef DATAGRAM_SOCKETS -#ifdef HAVE_SOCKETS #if defined (HAVE_SELECT) || defined (FIONREAD) #if defined (HAVE_SENDTO) && defined (HAVE_RECVFROM) && defined (EMSGSIZE) #define DATAGRAM_SOCKETS #endif /* HAVE_SENDTO && HAVE_RECVFROM && EMSGSIZE */ #endif /* HAVE_SELECT || FIONREAD */ -#endif /* HAVE_SOCKETS */ #endif /* DATAGRAM_SOCKETS */ #endif /* BROKEN_DATAGRAM_SOCKETS */ @@ -1144,7 +1129,6 @@ return XPROCESS (proc)->type; } -#ifdef HAVE_SOCKETS DEFUN ("format-network-address", Fformat_network_address, Sformat_network_address, 1, 2, 0, doc: /* Convert network ADDRESS from internal format to a string. @@ -1218,7 +1202,6 @@ return Qnil; } -#endif static Lisp_Object list_processes_1 (Lisp_Object query_only) @@ -1723,25 +1706,6 @@ } -#if 0 /* This doesn't work; see the note before sigchld_handler. */ -#ifdef USG -#ifdef SIGCHLD -/* Mimic blocking of signals on system V, which doesn't really have it. */ - -/* Nonzero means we got a SIGCHLD when it was supposed to be blocked. */ -int sigchld_deferred; - -SIGTYPE -create_process_sigchld () -{ - signal (SIGCHLD, create_process_sigchld); - - sigchld_deferred = 1; -} -#endif -#endif -#endif - void create_process (Lisp_Object process, char **new_argv, Lisp_Object current_dir) { @@ -2211,8 +2175,6 @@ } -#ifdef HAVE_SOCKETS - /* Convert an internal struct sockaddr to a lisp object (vector or string). The address family of sa is not included in the result. */ @@ -2443,7 +2405,7 @@ static const struct socket_options { /* The name of this option. Should be lowercase version of option name without SO_ prefix. */ - char *name; + const char *name; /* Option level SOL_... */ int optlevel; /* Option number SO_... */ @@ -3766,10 +3728,9 @@ UNGCPRO; return proc; } -#endif /* HAVE_SOCKETS */ -#if defined(HAVE_SOCKETS) && defined(HAVE_NET_IF_H) && defined(HAVE_SYS_IOCTL_H) +#if defined(HAVE_NET_IF_H) && defined(HAVE_SYS_IOCTL_H) #ifdef SIOCGIFCONF DEFUN ("network-interface-list", Fnetwork_interface_list, Snetwork_interface_list, 0, 0, 0, @@ -4012,7 +3973,7 @@ return any ? res : Qnil; } #endif -#endif /* HAVE_SOCKETS */ +#endif /* defined(HAVE_NET_IF_H) && defined(HAVE_SYS_IOCTL_H) */ /* Turn off input and output for process PROC. */ @@ -6060,7 +6021,6 @@ traffic. */) (Lisp_Object process, Lisp_Object current_group) { -#ifdef HAVE_SOCKETS if (PROCESSP (process) && (NETCONN_P (process) || SERIALCONN_P (process))) { struct Lisp_Process *p; @@ -6075,7 +6035,6 @@ p->command = Qt; return process; } -#endif #ifndef SIGTSTP error ("No SIGTSTP support"); #else @@ -6091,7 +6050,6 @@ traffic. */) (Lisp_Object process, Lisp_Object current_group) { -#ifdef HAVE_SOCKETS if (PROCESSP (process) && (NETCONN_P (process) || SERIALCONN_P (process))) { struct Lisp_Process *p; @@ -6114,7 +6072,6 @@ p->command = Qnil; return process; } -#endif #ifdef SIGCONT process_send_signal (process, SIGCONT, current_group, 0); #else @@ -7426,7 +7383,6 @@ memset (datagram_address, 0, sizeof datagram_address); #endif -#ifdef HAVE_SOCKETS { Lisp_Object subfeatures = Qnil; const struct socket_options *sopt; @@ -7462,7 +7418,6 @@ Fprovide (intern_c_string ("make-network-process"), subfeatures); } -#endif /* HAVE_SOCKETS */ #if defined (DARWIN_OS) /* PTYs are broken on Darwin < 6, but are sometimes useful for interactive @@ -7721,19 +7676,17 @@ defsubr (&Sserial_process_configure); defsubr (&Smake_serial_process); #endif /* HAVE_SERIAL */ -#ifdef HAVE_SOCKETS defsubr (&Sset_network_process_option); defsubr (&Smake_network_process); defsubr (&Sformat_network_address); -#endif /* HAVE_SOCKETS */ -#if defined(HAVE_SOCKETS) && defined(HAVE_NET_IF_H) && defined(HAVE_SYS_IOCTL_H) +#if defined(HAVE_NET_IF_H) && defined(HAVE_SYS_IOCTL_H) #ifdef SIOCGIFCONF defsubr (&Snetwork_interface_list); #endif #if defined(SIOCGIFADDR) || defined(SIOCGIFHWADDR) || defined(SIOCGIFFLAGS) defsubr (&Snetwork_interface_info); #endif -#endif /* HAVE_SOCKETS ... */ +#endif /* defined(HAVE_NET_IF_H) && defined(HAVE_SYS_IOCTL_H) */ #ifdef DATAGRAM_SOCKETS defsubr (&Sprocess_datagram_address); defsubr (&Sset_process_datagram_address); ------------------------------------------------------------ revno: 100986 committer: Juanma Barranquero branch nick: trunk timestamp: Fri 2010-08-06 02:16:24 +0200 message: Fix changes in revnos 100982..100984 for Windows build. * dired.c (compile_pattern): * syssignal.h (signal_handler_t): Restore declarations. * w32font.c (Qlatin): Remove declaration. * menu.h (xmalloc_widget_value, digest_single_submenu): Declare. * xmenu.c [USE_X_TOOLKIT || USE_GTK]: Don't declare xmalloc_widget_value and digest_single_submenu. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-08-05 23:34:12 +0000 +++ src/ChangeLog 2010-08-06 00:16:24 +0000 @@ -1,3 +1,17 @@ +2010-08-06 Juanma Barranquero + + Fix changes in revnos 100982..100984 for Windows build. + + * xmenu.c [USE_X_TOOLKIT || USE_GTK]: + Don't declare xmalloc_widget_value and digest_single_submenu. + + * w32font.c (Qlatin): Remove declaration. + + * menu.h (xmalloc_widget_value, digest_single_submenu): Declare. + + * dired.c (compile_pattern): + * syssignal.h (signal_handler_t): Restore declarations. + 2010-08-05 Dan Nicolaescu Remove extern declarations in .c files, .h files have them. === modified file 'src/dired.c' --- src/dired.c 2010-08-05 23:34:12 +0000 +++ src/dired.c 2010-08-06 00:16:24 +0000 @@ -82,6 +82,11 @@ #include "regex.h" #include "blockinput.h" +/* Returns a search buffer, with a fastmap allocated and ready to go. */ +extern struct re_pattern_buffer *compile_pattern (Lisp_Object, + struct re_registers *, + Lisp_Object, int, int); + /* From filemode.c. Can't go in Lisp.h because of `stat'. */ extern void filemodestring (struct stat *, char *); === modified file 'src/menu.h' --- src/menu.h 2010-07-02 09:26:33 +0000 +++ src/menu.h 2010-08-06 00:16:24 +0000 @@ -32,6 +32,8 @@ extern void update_submenu_strings (widget_value *); extern void find_and_call_menu_selection (FRAME_PTR, int, Lisp_Object, void *); +extern widget_value *xmalloc_widget_value (void); +extern widget_value *digest_single_submenu (int, int, int); #endif #ifdef HAVE_X_WINDOWS === modified file 'src/w32font.c' --- src/w32font.c 2010-07-08 21:25:08 +0000 +++ src/w32font.c 2010-08-06 00:16:24 +0000 @@ -72,7 +72,7 @@ static Lisp_Object Qzh; /* scripts */ -static Lisp_Object Qlatin, Qgreek, Qcoptic, Qcyrillic, Qarmenian, Qhebrew; +static Lisp_Object Qgreek, Qcoptic, Qcyrillic, Qarmenian, Qhebrew; static Lisp_Object Qarabic, Qsyriac, Qnko, Qthaana, Qdevanagari, Qbengali; static Lisp_Object Qgurmukhi, Qgujarati, Qoriya, Qtamil, Qtelugu; static Lisp_Object Qkannada, Qmalayalam, Qsinhala, Qthai, Qlao; === modified file 'src/xmenu.c' --- src/xmenu.c 2010-08-05 23:34:12 +0000 +++ src/xmenu.c 2010-08-06 00:16:24 +0000 @@ -122,11 +122,6 @@ static int next_menubar_widget_id; -#if defined (USE_X_TOOLKIT) || defined (USE_GTK) -extern widget_value *xmalloc_widget_value (void); -extern widget_value *digest_single_submenu (int, int, int); -#endif - #ifdef USE_X_TOOLKIT ------------------------------------------------------------ revno: 100985 committer: Dan Nicolaescu branch nick: trunk timestamp: Thu 2010-08-05 17:07:36 -0700 message: * src/syssignal.h (signal_handler_t): Restore accidentally removed definition. diff: === modified file 'src/syssignal.h' --- src/syssignal.h 2010-08-05 23:22:18 +0000 +++ src/syssignal.h 2010-08-06 00:07:36 +0000 @@ -68,6 +68,10 @@ #undef signal #define signal(SIG,ACT) sys_signal(SIG,ACT) +/* Whether this is what all systems want or not, this is what + appears to be assumed in the source, for example data.c:arith_error. */ +typedef RETSIGTYPE (*signal_handler_t) (int); + signal_handler_t sys_signal (int signal_number, signal_handler_t action); sigset_t sys_sigblock (sigset_t new_mask); sigset_t sys_sigunblock (sigset_t new_mask); ------------------------------------------------------------ revno: 100984 committer: Dan Nicolaescu branch nick: trunk timestamp: Thu 2010-08-05 16:34:12 -0700 message: Remove extern declarations in .c files, .h files have them. * src/data.c: * src/dired.c: * src/editfns.c: * src/filelock.c: * src/fns.c: * src/font.c: * src/fontset.c: * src/frame.c: * src/fringe.c: * src/ftfont.c: * src/gtkutil.c: * src/indent.c: * src/keyboard.c: * src/keymap.c: * src/lread.c: * src/menu.c: * src/print.c: * src/search.c: * src/sound.c: * src/window.c: * src/xdisp.c: * src/xfaces.c: * src/xfns.c: * src/xfont.c: * src/xftfont.c: * src/xmenu.c: * src/xterm.c: Remove declarations. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-08-05 23:22:18 +0000 +++ src/ChangeLog 2010-08-05 23:34:12 +0000 @@ -1,5 +1,34 @@ 2010-08-05 Dan Nicolaescu + Remove extern declarations in .c files, .h files have them. + * data.c: + * dired.c: + * editfns.c: + * filelock.c: + * fns.c: + * font.c: + * fontset.c: + * frame.c: + * fringe.c: + * ftfont.c: + * gtkutil.c: + * indent.c: + * keyboard.c: + * keymap.c: + * lread.c: + * menu.c: + * print.c: + * search.c: + * sound.c: + * window.c: + * xdisp.c: + * xfaces.c: + * xfns.c: + * xfont.c: + * xftfont.c: + * xmenu.c: + * xterm.c: Remove declarations. + Cleanup syssignal.h. * syssignal.h (sighold, sigrelse, RETSIGTYPE): Remove, unused. (main_thread): Move down to remove #ifdef. === modified file 'src/data.c' --- src/data.c 2010-08-03 16:37:00 +0000 +++ src/data.c 2010-08-05 23:34:12 +0000 @@ -665,8 +665,6 @@ return definition; } -extern Lisp_Object Qfunction_documentation; - DEFUN ("defalias", Fdefalias, Sdefalias, 2, 3, 0, doc: /* Set SYMBOL's function definition to DEFINITION, and return DEFINITION. Associates the function with the current load file, if any. @@ -2503,8 +2501,6 @@ static Lisp_Object float_arith_driver (double, int, enum arithop, int, Lisp_Object *); -extern Lisp_Object fmod_float (Lisp_Object, Lisp_Object); - Lisp_Object arith_driver (enum arithop code, int nargs, register Lisp_Object *args) { === modified file 'src/dired.c' --- src/dired.c 2010-07-29 20:01:08 +0000 +++ src/dired.c 2010-08-05 23:34:12 +0000 @@ -82,9 +82,6 @@ #include "regex.h" #include "blockinput.h" -/* Returns a search buffer, with a fastmap allocated and ready to go. */ -extern struct re_pattern_buffer *compile_pattern (Lisp_Object, struct re_registers *, Lisp_Object, int, int); - /* From filemode.c. Can't go in Lisp.h because of `stat'. */ extern void filemodestring (struct stat *, char *); === modified file 'src/editfns.c' --- src/editfns.c 2010-08-02 06:42:03 +0000 +++ src/editfns.c 2010-08-05 23:34:12 +0000 @@ -3380,9 +3380,6 @@ return val; } } -#ifdef HAVE_MENUS -extern Lisp_Object last_nonmenu_event; -#endif DEFUN ("message-or-box", Fmessage_or_box, Smessage_or_box, 1, MANY, 0, doc: /* Display a message in a dialog box or in the echo area. === modified file 'src/filelock.c' --- src/filelock.c 2010-07-11 10:31:10 +0000 +++ src/filelock.c 2010-08-05 23:34:12 +0000 @@ -117,8 +117,6 @@ static time_t boot_time; static int boot_time_initialized; -extern Lisp_Object Vshell_file_name; - #ifdef BOOT_TIME static void get_boot_time_1 (char *, int); #endif === modified file 'src/fns.c' --- src/fns.c 2010-07-29 05:48:06 +0000 +++ src/fns.c 2010-08-05 23:34:12 +0000 @@ -61,18 +61,12 @@ questions asked by mouse commands. */ int use_file_dialog; -extern Lisp_Object minibuf_window; -extern Lisp_Object Vlocale_coding_system; -extern int load_in_progress; - Lisp_Object Qstring_lessp, Qprovide, Qrequire; Lisp_Object Qyes_or_no_p_history; Lisp_Object Qcursor_in_echo_area; Lisp_Object Qwidget_type; Lisp_Object Qcodeset, Qdays, Qmonths, Qpaper; -extern Lisp_Object Qinput_method_function; - static int internal_equal (Lisp_Object , Lisp_Object, int, int); extern long get_random (void); @@ -2706,7 +2700,6 @@ } Lisp_Object Vfeatures, Qsubfeatures; -extern Lisp_Object Vafter_load_alist; DEFUN ("featurep", Ffeaturep, Sfeaturep, 1, 2, 0, doc: /* Returns t if FEATURE is present in this Emacs. === modified file 'src/font.c' --- src/font.c 2010-07-27 03:52:35 +0000 +++ src/font.c 2010-08-05 23:34:12 +0000 @@ -48,10 +48,6 @@ #include "nsterm.h" #endif /* HAVE_NS */ -#ifdef HAVE_NS -extern Lisp_Object Qfontsize; -#endif - Lisp_Object Qopentype; /* Important character set strings. */ @@ -394,11 +390,6 @@ return (for_face ? AREF (elt, 1) : AREF (elt, (i & 0xF) + 1)); } -extern Lisp_Object Vface_alternative_font_family_alist; - -extern Lisp_Object find_font_encoding (Lisp_Object); - - /* Return ENCODING or a cons of ENCODING and REPERTORY of the font FONTNAME. ENCODING is a charset symbol that specifies the encoding of the font. REPERTORY is a charset symbol or nil. */ @@ -603,7 +594,7 @@ /* Structure of known font property keys and validater of the values. */ -struct +static const struct { /* Pointer to the key symbol. */ Lisp_Object *key; @@ -2138,9 +2129,6 @@ static Lisp_Object font_sort_entities (Lisp_Object, Lisp_Object, Lisp_Object, int); -/* Return a rescaling ratio of FONT_ENTITY. */ -extern Lisp_Object Vface_font_rescale_alist; - static double font_rescale_ratio (Lisp_Object font_entity) { @@ -2723,8 +2711,6 @@ (2) doesn't match with any regexps in Vface_ignored_fonts (if non-nil). */ -extern Lisp_Object Vface_ignored_fonts; - Lisp_Object font_delete_unmatched (Lisp_Object vec, Lisp_Object spec, int size) { @@ -5169,15 +5155,6 @@ ASET (Vfont_log_deferred, 2, result); } -extern void syms_of_ftfont (void); -extern void syms_of_xfont (void); -extern void syms_of_xftfont (void); -extern void syms_of_ftxfont (void); -extern void syms_of_bdffont (void); -extern void syms_of_w32font (void); -extern void syms_of_atmfont (void); -extern void syms_of_nsfont (void); - void syms_of_font (void) { === modified file 'src/fontset.c' --- src/fontset.c 2010-07-29 05:48:06 +0000 +++ src/fontset.c 2010-08-05 23:34:12 +0000 @@ -177,7 +177,6 @@ /********** VARIABLES and FUNCTION PROTOTYPES **********/ -extern Lisp_Object Qfont; static Lisp_Object Qfontset; static Lisp_Object Qfontset_info; static Lisp_Object Qprepend, Qappend; @@ -388,8 +387,6 @@ If PREFERRED_FAMILY is not nil, that family has the higher priority if the encoding charsets or languages in font-specs are the same. */ -extern Lisp_Object Fassoc_string (Lisp_Object, Lisp_Object, Lisp_Object); - static void reorder_font_vector (Lisp_Object font_group, struct font *font) { @@ -1395,7 +1392,6 @@ ASET (arg, 4, script_range_list); } -extern Lisp_Object QCfamily, QCregistry; static void update_auto_fontset_alist (Lisp_Object, Lisp_Object); === modified file 'src/frame.c' --- src/frame.c 2010-07-29 16:49:59 +0000 +++ src/frame.c 2010-08-05 23:34:12 +0000 @@ -198,13 +198,6 @@ Lisp_Object Vframe_list; -extern Lisp_Object Vminibuffer_list; -extern Lisp_Object get_minibuffer (int); -extern Lisp_Object Fhandle_switch_frame (Lisp_Object event); -extern Lisp_Object Fredirect_frame_focus (Lisp_Object frame, Lisp_Object focus_frame); -extern Lisp_Object x_get_focus_frame (struct frame *frame); -extern Lisp_Object QCname, Qfont_param; - DEFUN ("framep", Fframep, Sframep, 1, 1, 0, doc: /* Return non-nil if OBJECT is a frame. @@ -1281,8 +1274,6 @@ return 1; } -extern Lisp_Object Qrun_hook_with_args; - /* Delete FRAME. When FORCE equals Qnoelisp, delete FRAME unconditionally. x_connection_closed and delete_terminal use this. Any other value of FORCE implements the semantics @@ -2822,9 +2813,6 @@ #ifdef HAVE_WINDOW_SYSTEM -extern Lisp_Object Qbox; -extern Lisp_Object Qtop; - /* Calculate fullscreen size. Return in *TOP_POS and *LEFT_POS the wanted positions of the WM window (not Emacs window). Return in *WIDTH and *HEIGHT the wanted width and height of Emacs === modified file 'src/fringe.c' --- src/fringe.c 2010-07-20 20:21:03 +0000 +++ src/fringe.c 2010-08-05 23:34:12 +0000 @@ -32,10 +32,6 @@ #ifdef HAVE_WINDOW_SYSTEM -extern Lisp_Object Qfringe; -extern Lisp_Object Qtop, Qbottom, Qcenter; -extern Lisp_Object Qup, Qdown, Qleft, Qright; - /* Non-nil means that newline may flow into the right fringe. */ Lisp_Object Voverflow_newline_into_fringe; @@ -83,10 +79,8 @@ must specify physical bitmap symbols. */ -extern Lisp_Object Qunknown; Lisp_Object Qtruncation, Qcontinuation, Qoverlay_arrow; Lisp_Object Qempty_line, Qtop_bottom; -extern Lisp_Object Qbar, Qhbar, Qbox, Qhollow; Lisp_Object Qhollow_small; enum fringe_bitmap_align === modified file 'src/ftfont.c' --- src/ftfont.c 2010-07-12 17:47:17 +0000 +++ src/ftfont.c 2010-08-05 23:34:12 +0000 @@ -144,8 +144,6 @@ { NULL } }; -extern Lisp_Object Qc, Qm, Qp, Qd; - /* Dirty hack for handing ADSTYLE property. Fontconfig (actually the underlying FreeType) gives such ADSTYLE @@ -548,8 +546,6 @@ ftfont_filter_properties, /* filter_properties */ }; -extern Lisp_Object QCname; - static Lisp_Object ftfont_get_cache (FRAME_PTR f) { @@ -2333,8 +2329,6 @@ static int m17n_flt_initialized; -extern Lisp_Object QCfamily; - static Lisp_Object ftfont_shape_by_flt (Lisp_Object lgstring, struct font *font, FT_Face ft_face, OTF *otf, FT_Matrix *matrix) === modified file 'src/gtkutil.c' --- src/gtkutil.c 2010-08-02 12:46:33 +0000 +++ src/gtkutil.c 2010-08-05 23:34:12 +0000 @@ -4156,8 +4156,6 @@ /* Update the tool bar for frame F. Add new buttons and remove old. */ -extern Lisp_Object Qx_gtk_map_stock; - void update_frame_tool_bar (FRAME_PTR f) { === modified file 'src/indent.c' --- src/indent.c 2010-07-08 21:25:08 +0000 +++ src/indent.c 2010-08-05 23:34:12 +0000 @@ -469,7 +469,6 @@ return col; } -extern Lisp_Object Qspace, QCwidth, QCalign_to; /* Check the presence of a display property and compute its width. If a property was found and its width was found as well, return === modified file 'src/keyboard.c' --- src/keyboard.c 2010-07-29 05:48:06 +0000 +++ src/keyboard.c 2010-08-05 23:34:12 +0000 @@ -465,8 +465,6 @@ Lisp_Object Qselect_window; Lisp_Object Qhelp_echo; -extern Lisp_Object Qremap; - #if defined (HAVE_MOUSE) || defined (HAVE_GPM) Lisp_Object Qmouse_fixup_help_message; #endif @@ -513,9 +511,6 @@ Lisp_Object Qvertical_line; Lisp_Object Qvertical_scroll_bar; Lisp_Object Qmenu_bar; -extern Lisp_Object Qleft_margin, Qright_margin; -extern Lisp_Object Qleft_fringe, Qright_fringe; -extern Lisp_Object QCmap; Lisp_Object recursive_edit_unwind (Lisp_Object buffer), command_loop (void); Lisp_Object Fthis_command_keys (void); @@ -536,8 +531,6 @@ /* Incremented whenever a timer is run. */ int timers_run; -extern Lisp_Object Vprint_level, Vprint_length; - /* Address (if not 0) of EMACS_TIME to zero out if a SIGIO interrupt happens. */ EMACS_TIME *input_available_clear_time; @@ -644,7 +637,6 @@ to support it. */ static int cannot_suspend; -extern Lisp_Object Qidentity, Qonly; /* Install the string STR as the beginning of the string of echoing, so that it serves as a prompt for the next character. @@ -1835,8 +1827,6 @@ `composition', `display' and `invisible' properties. LAST_PT is the last position of point. */ -extern Lisp_Object get_pos_property (Lisp_Object, Lisp_Object, Lisp_Object); - static void adjust_point_for_property (int last_pt, int modified) { @@ -4363,8 +4353,6 @@ ...). Each element has the form (FUN . ARGS). */ Lisp_Object pending_funcalls; -extern Lisp_Object Qapply; - /* Check whether a timer has fired. To prevent larger problems we simply disregard elements that are not proper timers. Do not make a circular timer list for the time being. @@ -8007,9 +7995,8 @@ static int ntool_bar_items; -/* The symbols `tool-bar', `:image' and `:rtl'. */ +/* The symbols `:image' and `:rtl'. */ -extern Lisp_Object Qtool_bar; Lisp_Object QCimage; Lisp_Object Qrtl; @@ -10233,7 +10220,6 @@ register Lisp_Object final; register Lisp_Object tem; Lisp_Object prefixarg; - extern int debug_on_next_call; debug_on_next_call = 0; === modified file 'src/keymap.c' --- src/keymap.c 2010-08-01 00:14:14 +0000 +++ src/keymap.c 2010-08-05 23:34:12 +0000 @@ -103,11 +103,6 @@ /* Pre-allocated 2-element vector for Fcommand_remapping to use. */ static Lisp_Object command_remapping_vector; -/* A char with the CHAR_META bit set in a vector or the 0200 bit set - in a string key sequence is equivalent to prefixing with this - character. */ -extern Lisp_Object meta_prefix_char; - /* Hash table used to cache a reverse-map to speed up calls to where-is. */ static Lisp_Object where_is_cache; /* Which keymaps are reverse-stored in the cache. */ === modified file 'src/lread.c' --- src/lread.c 2010-07-26 00:43:58 +0000 +++ src/lread.c 2010-08-05 23:34:12 +0000 @@ -75,7 +75,6 @@ Lisp_Object Qweakness; Lisp_Object Qrehash_size; Lisp_Object Qrehash_threshold; -extern Lisp_Object QCtest, QCsize, QCrehash_size, QCrehash_threshold, QCweakness; Lisp_Object Qread_char, Qget_file_char, Qstandard_input, Qcurrent_load_list; Lisp_Object Qvariable_documentation, Vvalues, Vstandard_input, Vafter_load_alist; @@ -91,9 +90,6 @@ static Lisp_Object Qload_force_doc_strings; -extern Lisp_Object Qevent_symbol_element_mask; -extern Lisp_Object Qfile_exists_p; - /* non-zero if inside `load' */ int load_in_progress; static Lisp_Object Qload_in_progress; === modified file 'src/menu.c' --- src/menu.c 2010-07-23 10:32:02 +0000 +++ src/menu.c 2010-08-05 23:34:12 +0000 @@ -61,12 +61,6 @@ #define HAVE_BOXES 1 #endif -/* The timestamp of the last input event Emacs received from the X server. */ -/* Defined in keyboard.c. */ -extern unsigned long last_event_timestamp; - -extern Lisp_Object QCtoggle, QCradio; - Lisp_Object menu_items; /* If non-nil, means that the global vars defined here are already in use. === modified file 'src/print.c' --- src/print.c 2010-07-29 05:48:06 +0000 +++ src/print.c 2010-08-05 23:34:12 +0000 @@ -42,7 +42,6 @@ Lisp_Object Qtemp_buffer_setup_hook; /* These are used to print like we read. */ -extern Lisp_Object Qbackquote, Qcomma, Qcomma_at, Qcomma_dot, Qfunction; Lisp_Object Vfloat_output_format, Qfloat_output_format; @@ -161,11 +160,6 @@ #define PRINT_NUMBER_OBJECT(table,i) XVECTOR ((table))->contents[(i) * 2] #define PRINT_NUMBER_STATUS(table,i) XVECTOR ((table))->contents[(i) * 2 + 1] -/* Nonzero means print newline to stdout before next minibuffer message. - Defined in xdisp.c */ - -extern int noninteractive_need_newline; - void print_interval (INTERVAL interval, Lisp_Object printcharfun); /* GDB resets this to zero on W32 to disable OutputDebugString calls. */ @@ -1401,7 +1395,6 @@ /* A flag to control printing of `charset' text property. The default value is Qdefault. */ Lisp_Object Vprint_charset_text_property; -extern Lisp_Object Qdefault; static void print_check_string_charset_prop (INTERVAL interval, Lisp_Object string); === modified file 'src/search.c' --- src/search.c 2010-07-12 17:47:17 +0000 +++ src/search.c 2010-08-05 23:34:12 +0000 @@ -504,8 +504,6 @@ This does not clobber the match data. We assume that STRING contains single-byte characters. */ -extern Lisp_Object Vascii_downcase_table; - int fast_c_string_match_ignore_case (Lisp_Object regexp, const char *string) { === modified file 'src/sound.c' --- src/sound.c 2010-07-25 00:20:51 +0000 +++ src/sound.c 2010-08-05 23:34:12 +0000 @@ -99,7 +99,6 @@ /* Symbols. */ -extern Lisp_Object QCfile, QCdata; Lisp_Object QCvolume, QCdevice; Lisp_Object Qsound; Lisp_Object Qplay_sound_functions; === modified file 'src/window.c' --- src/window.c 2010-07-29 16:49:59 +0000 +++ src/window.c 2010-08-05 23:34:12 +0000 @@ -57,8 +57,6 @@ Lisp_Object Qscroll_up, Qscroll_down, Qscroll_command; Lisp_Object Qwindow_size_fixed; -extern Lisp_Object Qleft_margin, Qright_margin; - static int displayed_window_lines (struct window *); static struct window *decode_window (Lisp_Object); static int count_windows (struct window *); @@ -191,16 +189,11 @@ static int inhibit_frame_unsplittable; #endif /* 0 */ -extern EMACS_INT scroll_margin; - -extern Lisp_Object Qwindow_scroll_functions, Vwindow_scroll_functions; - /* If non-nil, then the `recenter' command with a nil argument the entire frame to be redrawn; the special value `tty' causes the frame to be redrawn only if it is a tty frame. */ static Lisp_Object Vrecenter_redisplay; -extern Lisp_Object Qtty; DEFUN ("windowp", Fwindowp, Swindowp, 1, 1, 0, === modified file 'src/xdisp.c' --- src/xdisp.c 2010-07-29 05:48:06 +0000 +++ src/xdisp.c 2010-08-05 23:34:12 +0000 @@ -239,6 +239,7 @@ #include "macros.h" #include "disptab.h" #include "termhooks.h" +#include "termopts.h" #include "intervals.h" #include "coding.h" #include "process.h" @@ -268,23 +269,6 @@ #define INFINITY 10000000 -#if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) \ - || defined(HAVE_NS) || defined (USE_GTK) -extern void set_frame_menubar (struct frame *f, int, int); -#endif - -extern int interrupt_input; -extern int command_loop_level; - -extern Lisp_Object Vminibuffer_list; - -extern Lisp_Object Qface; -extern Lisp_Object Qmode_line, Qmode_line_inactive, Qheader_line; - -extern Lisp_Object Qwhen; -extern Lisp_Object Qhelp_echo; -extern Lisp_Object Qbefore_string, Qafter_string; - Lisp_Object Qoverriding_local_map, Qoverriding_terminal_local_map; Lisp_Object Qwindow_scroll_functions, Vwindow_scroll_functions; Lisp_Object Qwindow_text_change_functions, Vwindow_text_change_functions; @@ -385,10 +369,6 @@ Lisp_Object Qcenter; Lisp_Object Qmargin, Qpointer; Lisp_Object Qline_height; -extern Lisp_Object Qheight; -extern Lisp_Object QCwidth, QCheight, QCascent; -extern Lisp_Object Qscroll_bar; -extern Lisp_Object Qcursor; /* Non-nil means highlight trailing whitespace. */ @@ -399,7 +379,6 @@ Lisp_Object Vnobreak_char_display; #ifdef HAVE_WINDOW_SYSTEM -extern Lisp_Object Voverflow_newline_into_fringe; /* Test if overflow newline into fringe. Called with iterator IT at or past right window margin, and with IT->current_x set. */ === modified file 'src/xfaces.c' --- src/xfaces.c 2010-07-29 05:48:06 +0000 +++ src/xfaces.c 2010-08-05 23:34:12 +0000 @@ -321,11 +321,6 @@ Lisp_Object QCoverline, QCstrike_through, QCbox, QCinherit; Lisp_Object QCfontset; -/* Keywords symbols used for font properties. */ -extern Lisp_Object QCfoundry, QCadstyle, QCregistry; -extern Lisp_Object QCspacing, QCsize, QCavgwidth; -extern Lisp_Object Qp; - /* Symbols used for attribute values. */ Lisp_Object Qnormal, Qbold, Qultra_light, Qextra_light, Qlight; @@ -351,7 +346,6 @@ Lisp_Object Qdefault, Qtool_bar, Qregion, Qfringe; Lisp_Object Qheader_line, Qscroll_bar, Qcursor, Qborder, Qmouse, Qmenu; Lisp_Object Qmode_line_inactive, Qvertical_border; -extern Lisp_Object Qmode_line; /* The symbol `face-alias'. A symbols having that property is an alias for another face. Value of the property is the name of @@ -359,8 +353,6 @@ Lisp_Object Qface_alias; -extern Lisp_Object Qcircular_list; - /* Default stipple pattern used on monochrome displays. This stipple pattern is used on monochrome displays instead of shades of gray for a face background color. See `set-face-stipple' for possible === modified file 'src/xfns.c' --- src/xfns.c 2010-08-01 13:57:07 +0000 +++ src/xfns.c 2010-08-05 23:34:12 +0000 @@ -202,19 +202,6 @@ Lisp_Object Qcompound_text, Qcancel_timer; Lisp_Object Qfont_param; -/* In dispnew.c */ - -extern Lisp_Object Vwindow_system_version; - -/* In editfns.c */ - -extern Lisp_Object Vsystem_name; - -/* The below are defined in frame.c. */ - -extern Lisp_Object Vmenu_bar_mode, Vtool_bar_mode; -extern Lisp_Object Qtooltip; - #if GLYPH_DEBUG int image_cache_refcount, dpyinfo_refcount; #endif === modified file 'src/xfont.c' --- src/xfont.c 2010-07-07 22:18:28 +0000 +++ src/xfont.c 2010-08-05 23:34:12 +0000 @@ -154,8 +154,6 @@ NULL, /* filter_properties */ }; -extern Lisp_Object QCname; - static Lisp_Object xfont_get_cache (FRAME_PTR f) { @@ -164,8 +162,6 @@ return (dpyinfo->name_list_element); } -extern Lisp_Object Vface_alternative_font_registry_alist; - static int compare_font_names (const void *name1, const void *name2) { @@ -289,8 +285,6 @@ /* Re-usable vector to store characteristic font properites. */ static Lisp_Object xfont_scratch_props; -extern Lisp_Object Qlatin; - /* Return a list of scripts supported by the font of FONTNAME whose characteristic properties are in PROPS and whose encoding charset is ENCODING. A caller must call BLOCK_INPUT in advance. */ @@ -339,8 +333,6 @@ return scripts; } -extern Lisp_Object Vscalable_fonts_allowed; - static Lisp_Object xfont_list_pattern (Display *display, char *pattern, Lisp_Object registry, Lisp_Object script) @@ -687,8 +679,6 @@ return list; } -extern Lisp_Object QCavgwidth; - static Lisp_Object xfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size) { === modified file 'src/xftfont.c' --- src/xftfont.c 2010-07-10 18:52:53 +0000 +++ src/xftfont.c 2010-08-05 23:34:12 +0000 @@ -171,10 +171,6 @@ return entity; } -extern Lisp_Object ftfont_font_format (FcPattern *, Lisp_Object); -extern FcCharSet *ftfont_get_fc_charset (Lisp_Object); -extern Lisp_Object QCantialias; - static FcChar8 ascii_printable[95]; static void @@ -552,8 +548,6 @@ } } -extern Lisp_Object Qja, Qko; - static int xftfont_has_char (Lisp_Object font, int c) { === modified file 'src/xmenu.c' --- src/xmenu.c 2010-07-29 05:48:06 +0000 +++ src/xmenu.c 2010-08-05 23:34:12 +0000 @@ -109,26 +109,7 @@ Lisp_Object Qdebug_on_next_call; -extern Lisp_Object Qmenu_bar; - -extern Lisp_Object QCtoggle, QCradio; - -extern Lisp_Object Qoverriding_local_map, Qoverriding_terminal_local_map; - -extern Lisp_Object Qmenu_bar_update_hook; - -#ifdef USE_X_TOOLKIT -extern void set_frame_menubar (FRAME_PTR, int, int); -extern XtAppContext Xt_app_con; - -static Lisp_Object xdialog_show (FRAME_PTR, int, Lisp_Object, Lisp_Object, - char **); -static void popup_get_selection (XEvent *, struct x_display_info *, - LWLIB_ID, int); -#endif /* USE_X_TOOLKIT */ - -#ifdef USE_GTK -extern void set_frame_menubar (FRAME_PTR, int, int); +#if defined (USE_X_TOOLKIT) || defined (USE_GTK) static Lisp_Object xdialog_show (FRAME_PTR, int, Lisp_Object, Lisp_Object, char **); #endif @@ -141,7 +122,6 @@ static int next_menubar_widget_id; -/* For NS and NTGUI, these prototypes are defined in keyboard.h. */ #if defined (USE_X_TOOLKIT) || defined (USE_GTK) extern widget_value *xmalloc_widget_value (void); extern widget_value *digest_single_submenu (int, int, int); === modified file 'src/xterm.c' --- src/xterm.c 2010-08-02 14:23:06 +0000 +++ src/xterm.c 2010-08-05 23:34:12 +0000 @@ -293,23 +293,6 @@ static int x_noop_count; -/* Initial values of argv and argc. */ - -extern char **initial_argv; -extern int initial_argc; - -extern Lisp_Object Vcommand_line_args, Vsystem_name; - -/* Tells if a window manager is present or not. */ - -extern Lisp_Object Vx_no_window_manager; - -extern Lisp_Object Qeql; - -/* A mask of extra modifier bits to put into every keyboard char. */ - -extern EMACS_INT extra_keyboard_modifiers; - /* The keysyms to use for the various modifiers. */ Lisp_Object Vx_alt_keysym, Vx_hyper_keysym, Vx_meta_keysym, Vx_super_keysym; @@ -329,8 +312,6 @@ /* Used in x_flush. */ -extern Lisp_Object Vinhibit_redisplay; - extern XrmDatabase x_load_resources (Display *, const char *, const char *, const char *); extern int x_bitmap_mask (FRAME_PTR, int); ------------------------------------------------------------ revno: 100983 committer: Dan Nicolaescu branch nick: trunk timestamp: Thu 2010-08-05 16:22:18 -0700 message: Cleanup syssignal.h. * src/syssignal.h (sighold, sigrelse, RETSIGTYPE): Remove, unused. (main_thread): Move down to remove #ifdef. (SIGMASKTYPE, SIGEMPTYMASK, SIGFULLMASK, sigmask, sigunblock): Remove conditional definition following unconditional ones. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-08-05 23:15:24 +0000 +++ src/ChangeLog 2010-08-05 23:22:18 +0000 @@ -1,5 +1,11 @@ 2010-08-05 Dan Nicolaescu + Cleanup syssignal.h. + * syssignal.h (sighold, sigrelse, RETSIGTYPE): Remove, unused. + (main_thread): Move down to remove #ifdef. + (SIGMASKTYPE, SIGEMPTYMASK, SIGFULLMASK, sigmask, sigunblock): + Remove conditional definition following unconditional ones. + * lisp.h: Remove HAVE_SHM code, unused. (QCmap, QCrehash_size, QCrehash_threshold, QCsize, QCtest) (QCweakness, Qabove_handle, Qbackquote, Qbar, Qbelow_handle) === modified file 'src/syssignal.h' --- src/syssignal.h 2010-07-25 00:20:51 +0000 +++ src/syssignal.h 2010-08-05 23:22:18 +0000 @@ -26,10 +26,6 @@ #define FORWARD_SIGNAL_TO_MAIN_THREAD #endif -#ifdef FORWARD_SIGNAL_TO_MAIN_THREAD -extern pthread_t main_thread; -#endif - /* Don't #include . That header should always be #included before "config.h", because some configuration files (like s/hpux.h) indicate that SIGIO doesn't work by #undef-ing SIGIO. If this file @@ -69,15 +65,9 @@ #ifndef sigsetmask #define sigsetmask(SIG) sys_sigsetmask (SIG) #endif -#define sighold(SIG) ONLY_USED_IN_BSD_4_1 -#define sigrelse(SIG) ONLY_USED_IN_BSD_4_1 #undef signal #define signal(SIG,ACT) sys_signal(SIG,ACT) -/* Whether this is what all systems want or not, this is what - appears to be assumed in the source, for example data.c:arith_error. */ -typedef RETSIGTYPE (*signal_handler_t) (int); - signal_handler_t sys_signal (int signal_number, signal_handler_t action); sigset_t sys_sigblock (sigset_t new_mask); sigset_t sys_sigunblock (sigset_t new_mask); @@ -85,27 +75,6 @@ #define sys_sigdel(MASK,SIG) sigdelset (&MASK,SIG) -#ifndef SIGMASKTYPE -#define SIGMASKTYPE int -#endif - -#ifndef SIGEMPTYMASK -#define SIGEMPTYMASK (0) -#endif - -#ifndef SIGFULLMASK -#define SIGFULLMASK (0xffffffff) -#endif - -#ifndef sigmask -#define sigmask(no) (1L << ((no) - 1)) -#endif - -#ifndef sigunblock -#define sigunblock(SIG) \ -{ SIGMASKTYPE omask = sigblock (SIGFULLMASK); sigsetmask (omask & ~SIG); } -#endif - #define sigfree() sigsetmask (SIGEMPTYMASK) #if defined (SIGINFO) && defined (BROKEN_SIGINFO) @@ -164,6 +133,7 @@ #endif #ifdef FORWARD_SIGNAL_TO_MAIN_THREAD +extern pthread_t main_thread; #define SIGNAL_THREAD_CHECK(signo) \ do { \ if (!pthread_equal (pthread_self (), main_thread)) \ ------------------------------------------------------------ revno: 100982 committer: Dan Nicolaescu branch nick: trunk timestamp: Thu 2010-08-05 16:15:24 -0700 message: Add declarations to header files. * src/keyboard.h (xmalloc_widget_value, digest_single_submenu): Remove declarations, menu.h has them. (QCbutton, QCtoggle, QCradio, QClabel, extra_keyboard_modifiers) (Vinput_method_function, Qinput_method_function) (Qevent_symbol_element_mask, last_event_timestamp): * src/dispextern.h (Voverflow_newline_into_fringe): * src/font.h (QCantialias, Qp, syms_of_ftfont, syms_of_xfns) (syms_of_ftxfont, syms_of_xftfont, syms_of_bdffont) (syms_of_w32font, syms_of_nsfont): * src/fontset.h (find_font_encoding, Qlatin): * src/frame.h (Qtooltip, Qrun_hook_with_args, Vmenu_bar_mode) (Vtool_bar_mode, set_frame_menubar): * src/ftfont.h (ftfont_font_format, ftfont_get_fc_charset): * src/xterm.h (Qx_gtk_map_stock): * src/keymap.h (meta_prefix_char): Add declarations. * src/lisp.h: Remove HAVE_SHM code, unused. (QCmap, QCrehash_size, QCrehash_threshold, QCsize, QCtest) (QCweakness, Qabove_handle, Qbackquote, Qbar, Qbelow_handle) (Qborder, Qbottom, Qbox, Qcircular_list, Qcomma, Qcomma_at) (Qcomma_dot, Qcursor, Qdefault, Qdown, Qend_scroll, Qeq, Qeql) (Qequal, Qfile_exists_p, Qfont_param, Qfringe, Qfunction) (Qfunction_documentation, Qhandle, Qhbar, Qheader_line, Qhollow) (Qidentity, Qleft_margin, Qmenu, Qmenu_bar_update_hook) (Qmode_line_inactive, Qmouse, Qoverriding_local_map) (Qoverriding_terminal_local_map, Qratio, Qregion, Qright_margin) (Qscroll_bar, Qtool_bar, Qtop, Qup, Qvertical_border, Qwhen) (Qwindow_scroll_functions, Vafter_load_alist) (Vauto_save_list_file_name, Vface_alternative_font_family_alist) (Vface_alternative_font_registry_alist, Vface_font_rescale_alist) (Vface_ignored_fonts, Vinhibit_redisplay, Vminibuffer_list) (Vprint_length, Vprint_level, Vscalable_fonts_allowed) (Vshell_file_name, Vsystem_name, Vwindow_scroll_functions) (Vwindow_system_version, Vx_no_window_manager, initial_argc) (initial_argv, last_nonmenu_event, load_in_progress) (noninteractive_need_newline, scroll_margin): Add declarations. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-08-05 22:23:53 +0000 +++ src/ChangeLog 2010-08-05 23:15:24 +0000 @@ -1,5 +1,42 @@ 2010-08-05 Dan Nicolaescu + * lisp.h: Remove HAVE_SHM code, unused. + (QCmap, QCrehash_size, QCrehash_threshold, QCsize, QCtest) + (QCweakness, Qabove_handle, Qbackquote, Qbar, Qbelow_handle) + (Qborder, Qbottom, Qbox, Qcircular_list, Qcomma, Qcomma_at) + (Qcomma_dot, Qcursor, Qdefault, Qdown, Qend_scroll, Qeq, Qeql) + (Qequal, Qfile_exists_p, Qfont_param, Qfringe, Qfunction) + (Qfunction_documentation, Qhandle, Qhbar, Qheader_line, Qhollow) + (Qidentity, Qleft_margin, Qmenu, Qmenu_bar_update_hook) + (Qmode_line_inactive, Qmouse, Qoverriding_local_map) + (Qoverriding_terminal_local_map, Qratio, Qregion, Qright_margin) + (Qscroll_bar, Qtool_bar, Qtop, Qup, Qvertical_border, Qwhen) + (Qwindow_scroll_functions, Vafter_load_alist) + (Vauto_save_list_file_name, Vface_alternative_font_family_alist) + (Vface_alternative_font_registry_alist, Vface_font_rescale_alist) + (Vface_ignored_fonts, Vinhibit_redisplay, Vminibuffer_list) + (Vprint_length, Vprint_level, Vscalable_fonts_allowed) + (Vshell_file_name, Vsystem_name, Vwindow_scroll_functions) + (Vwindow_system_version, Vx_no_window_manager, initial_argc) + (initial_argv, last_nonmenu_event, load_in_progress) + (noninteractive_need_newline, scroll_margin): Add declarations. + + * keyboard.h (xmalloc_widget_value, digest_single_submenu): Remove + declarations, menu.h has them. + (QCbutton, QCtoggle, QCradio, QClabel, extra_keyboard_modifiers) + (Vinput_method_function, Qinput_method_function) + (Qevent_symbol_element_mask, last_event_timestamp): + * dispextern.h (Voverflow_newline_into_fringe): + * font.h (QCantialias, Qp, syms_of_ftfont, syms_of_xfns) + (syms_of_ftxfont, syms_of_xftfont, syms_of_bdffont) + (syms_of_w32font, syms_of_nsfont): + * fontset.h (find_font_encoding, Qlatin): + * frame.h (Qtooltip, Qrun_hook_with_args, Vmenu_bar_mode) + (Vtool_bar_mode, set_frame_menubar): + * ftfont.h (ftfont_font_format, ftfont_get_fc_charset): + * xterm.h (Qx_gtk_map_stock): + * keymap.h (meta_prefix_char): Add declarations. + * term.c: Remove dead code. Fix emacs -Q -f server-start & emacsclient -t on GNU/Linux. === modified file 'src/dispextern.h' --- src/dispextern.h 2010-07-27 03:52:35 +0000 +++ src/dispextern.h 2010-08-05 23:15:24 +0000 @@ -3031,6 +3031,7 @@ /* Defined in fringe.c */ +extern Lisp_Object Voverflow_newline_into_fringe; int lookup_fringe_bitmap (Lisp_Object); void draw_fringe_bitmap (struct window *, struct glyph_row *, int); void draw_row_fringe_bitmaps (struct window *, struct glyph_row *); === modified file 'src/font.h' --- src/font.h 2010-07-08 08:09:35 +0000 +++ src/font.h 2010-08-05 23:15:24 +0000 @@ -239,7 +239,9 @@ ASET ((font), prop, make_number (font_style_to_value (prop, val, 1))) extern Lisp_Object QCspacing, QCdpi, QCscalable, QCotf, QClang, QCscript; -extern Lisp_Object QCavgwidth, QCfont_entity, QCfc_unknown_spec; +extern Lisp_Object QCavgwidth, QCantialias, QCfont_entity, QCfc_unknown_spec; +extern Lisp_Object Qp; + /* Important character set symbols. */ extern Lisp_Object Qascii_0; @@ -821,26 +823,38 @@ #ifdef HAVE_FREETYPE extern struct font_driver ftfont_driver; +extern void syms_of_ftfont (void); #endif /* HAVE_FREETYPE */ #ifdef HAVE_X_WINDOWS extern struct font_driver xfont_driver; extern struct font_driver ftxfont_driver; +extern void syms_of_xfont (void); +extern void syms_of_ftxfont (void); #ifdef HAVE_XFT extern struct font_driver xftfont_driver; +extern void syms_of_xftfont (void); #endif /* HAVE_XFT */ +#ifdef HAVE_BDFFONT +extern void syms_of_bdffont (void); +#endif /* HAVE_BDFFONT */ #endif /* HAVE_X_WINDOWS */ #ifdef WINDOWSNT extern struct font_driver w32font_driver; extern struct font_driver uniscribe_font_driver; +extern void syms_of_w32font (void); #endif /* WINDOWSNT */ #ifdef HAVE_NS +extern Lisp_Object Qfontsize; extern struct font_driver nsfont_driver; +extern void syms_of_nsfont (void); #endif /* HAVE_NS */ #ifndef FONT_DEBUG #define FONT_DEBUG #endif +extern Lisp_Object QCfoundry, QCadstyle, QCregistry; + extern Lisp_Object Vfont_log; extern void font_add_log (char *, Lisp_Object, Lisp_Object); extern void font_deferred_log (char *, Lisp_Object, Lisp_Object); === modified file 'src/fontset.h' --- src/fontset.h 2010-07-02 09:26:33 +0000 +++ src/fontset.h 2010-08-05 23:15:24 +0000 @@ -44,7 +44,9 @@ extern int fs_query_fontset (Lisp_Object, int); EXFUN (Fquery_fontset, 2); extern Lisp_Object list_fontsets (struct frame *, Lisp_Object, int); +extern Lisp_Object find_font_encoding (Lisp_Object); +extern Lisp_Object Qlatin; extern Lisp_Object Vuse_default_ascent; extern Lisp_Object Vignore_relative_composition; extern Lisp_Object Valternate_fontname_alist; === modified file 'src/frame.h' --- src/frame.h 2010-07-29 16:49:59 +0000 +++ src/frame.h 2010-08-05 23:15:24 +0000 @@ -1049,6 +1049,7 @@ extern Lisp_Object Qbackground_color, Qforeground_color; extern Lisp_Object Qicon, Qicon_name, Qicon_type, Qicon_left, Qicon_top; extern Lisp_Object Qinternal_border_width; +extern Lisp_Object Qtooltip; extern Lisp_Object Qmenu_bar_lines, Qtool_bar_lines; extern Lisp_Object Qmouse_color; extern Lisp_Object Qname, Qtitle; @@ -1078,6 +1079,8 @@ extern Lisp_Object Qleft, Qright, Qtop, Qbox, Qbottom; extern Lisp_Object Qdisplay; +extern Lisp_Object Qrun_hook_with_args; + #ifdef HAVE_WINDOW_SYSTEM /* The class of this X application. */ @@ -1095,6 +1098,7 @@ extern Lisp_Object Vx_resource_name; extern Lisp_Object Vx_resource_class; +extern Lisp_Object Vmenu_bar_mode, Vtool_bar_mode; extern Lisp_Object Qface_set_after_frame_default; @@ -1138,6 +1142,9 @@ Lisp_Object component, Lisp_Object subclass); +/* In xmenu.c */ +extern void set_frame_menubar (FRAME_PTR, int, int); + #endif /* HAVE_WINDOW_SYSTEM */ #endif /* not EMACS_FRAME_H */ === modified file 'src/ftfont.h' --- src/ftfont.h 2010-01-13 08:35:10 +0000 +++ src/ftfont.h 2010-08-05 23:15:24 +0000 @@ -36,6 +36,9 @@ #endif /* HAVE_M17N_FLT */ #endif /* HAVE_LIBOTF */ +extern Lisp_Object ftfont_font_format (FcPattern *, Lisp_Object); +extern FcCharSet *ftfont_get_fc_charset (Lisp_Object); + #endif /* EMACS_FTFONT_H */ /* arch-tag: cec13d1c-7156-4997-9ebd-e989040c3d78 === modified file 'src/keyboard.h' --- src/keyboard.h 2010-07-29 05:48:06 +0000 +++ src/keyboard.h 2010-08-05 23:15:24 +0000 @@ -366,8 +366,6 @@ struct _widget_value* next; } widget_value; -extern widget_value *xmalloc_widget_value (void); -extern widget_value *digest_single_submenu (int, int, int); #endif /* HAVE_NS || HAVE_NTGUI */ @@ -465,6 +463,28 @@ command is stored in this-original-command. It is nil otherwise. */ extern Lisp_Object Vthis_original_command; +/* Non-nil disable property on a command means + do not execute it; call disabled-command-function's value instead. */ +extern Lisp_Object QCbutton, QCtoggle, QCradio, QClabel; + +/* A mask of extra modifier bits to put into every keyboard char. */ +extern EMACS_INT extra_keyboard_modifiers; + +/* If non-nil, this implements the current input method. */ +extern Lisp_Object Vinput_method_function; +extern Lisp_Object Qinput_method_function; + +/* An event header symbol HEAD may have a property named + Qevent_symbol_element_mask, which is of the form (BASE MODIFIERS); + BASE is the base, unmodified version of HEAD, and MODIFIERS is the + mask of modifiers applied to it. If present, this is used to help + speed up parse_modifiers. */ +extern Lisp_Object Qevent_symbol_element_mask; + +/* The timestamp of the last input event we received from the X server. + X Windows wants this for selection ownership. */ +extern unsigned long last_event_timestamp; + extern int parse_menu_item (Lisp_Object, int); extern void echo_now (void); === modified file 'src/keymap.h' --- src/keymap.h 2010-07-29 05:48:06 +0000 +++ src/keymap.h 2010-08-05 23:15:24 +0000 @@ -24,6 +24,7 @@ extern Lisp_Object Qkeymap, Qmenu_bar; extern Lisp_Object Qremap; extern Lisp_Object Qmenu_item; +extern Lisp_Object meta_prefix_char; extern Lisp_Object Voverriding_local_map; extern Lisp_Object Voverriding_local_map_menu_flag; extern Lisp_Object current_global_map; === modified file 'src/lisp.h' --- src/lisp.h 2010-07-29 15:50:04 +0000 +++ src/lisp.h 2010-08-05 23:15:24 +0000 @@ -508,12 +508,6 @@ #define EQ(x, y) (XHASH (x) == XHASH (y)) #ifndef XPNTR -#ifdef HAVE_SHM -/* In this representation, data is found in two widely separated segments. */ -extern size_t pure_size; -#define XPNTR(a) \ - (XUINT (a) | (XUINT (a) > pure_size ? DATA_SEG_BITS : PURE_SEG_BITS)) -#else /* not HAVE_SHM */ #ifdef DATA_SEG_BITS /* This case is used for the rt-pc. In the diffs I was given, it checked for ptr = 0 @@ -528,7 +522,6 @@ size. */ #define XPNTR(a) ((EMACS_INT) XUINT (a)) #endif -#endif /* not HAVE_SHM */ #endif /* no XPNTR */ /* Largest and smallest representable fixnum values. These are the C @@ -2270,7 +2263,7 @@ extern Lisp_Object Qbeginning_of_buffer, Qend_of_buffer, Qbuffer_read_only; extern Lisp_Object Qtext_read_only; extern Lisp_Object Qinteractive_form; - +extern Lisp_Object Qcircular_list; extern Lisp_Object Qintegerp, Qnatnump, Qwholenump, Qsymbolp, Qlistp, Qconsp; extern Lisp_Object Qstringp, Qarrayp, Qsequencep, Qbufferp; extern Lisp_Object Qchar_or_string_p, Qmarkerp, Qinteger_or_marker_p, Qvectorp; @@ -2449,6 +2442,7 @@ extern void syms_of_syntax (void); /* Defined in fns.c */ +extern Lisp_Object QCrehash_size, QCrehash_threshold; extern int use_dialog_box; extern int use_file_dialog; extern int next_almost_prime (int); @@ -2457,7 +2451,7 @@ extern Lisp_Object Qcursor_in_echo_area; extern Lisp_Object Qstring_lessp; extern Lisp_Object Vfeatures; -extern Lisp_Object QCsize, QCtest, QCweakness, Qequal, Qeq; +extern Lisp_Object QCsize, QCtest, QCweakness, Qequal, Qeq, Qeql; unsigned sxhash (Lisp_Object, int); Lisp_Object make_hash_table (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, @@ -2622,6 +2616,7 @@ /* Defined in dispnew.c */ extern Lisp_Object selected_frame; +extern Lisp_Object Vwindow_system_version; extern EMACS_INT baud_rate; EXFUN (Fding, 1); EXFUN (Fredraw_frame, 1); @@ -2637,12 +2632,21 @@ extern Lisp_Object Qinhibit_redisplay, Qdisplay; extern Lisp_Object Qinhibit_eval_during_redisplay; extern Lisp_Object Qmessage_truncate_lines; +extern Lisp_Object Qmenu_bar_update_hook; +extern Lisp_Object Qwindow_scroll_functions, Vwindow_scroll_functions; +extern Lisp_Object Qoverriding_local_map, Qoverriding_terminal_local_map; extern Lisp_Object Qimage, Qtext, Qboth, Qboth_horiz, Qtext_image_horiz; extern Lisp_Object Qspace, Qcenter, QCalign_to; +extern Lisp_Object Qbar, Qhbar, Qbox, Qhollow; +extern Lisp_Object Qleft_margin, Qright_margin; extern Lisp_Object Vmessage_log_max; extern Lisp_Object QCdata, QCfile; +extern Lisp_Object QCmap; extern Lisp_Object Qrisky_local_variable; +extern Lisp_Object Vinhibit_redisplay; extern int message_enable_multibyte; +extern int noninteractive_need_newline; +extern EMACS_INT scroll_margin; extern Lisp_Object echo_area_buffer[2]; extern void add_to_log (const char *, Lisp_Object, Lisp_Object); extern void check_message_stack (void); @@ -2789,7 +2793,7 @@ /* Defined in print.c */ extern Lisp_Object Vprin1_to_string_buffer; -extern Lisp_Object Vprint_level; +extern Lisp_Object Vprint_level, Vprint_length; extern void debug_print (Lisp_Object); EXFUN (Fprin1, 2); EXFUN (Fprin1_to_string, 2); @@ -2815,9 +2819,12 @@ extern int doprnt (char *, int, const char *, const char *, va_list); /* Defined in lread.c */ +extern Lisp_Object Vafter_load_alist; extern Lisp_Object Qvariable_documentation, Qstandard_input; extern Lisp_Object Qfunction; +extern Lisp_Object Qbackquote, Qcomma, Qcomma_at, Qcomma_dot, Qfunction; extern Lisp_Object Vobarray, initial_obarray, Vstandard_input; +extern int load_in_progress; EXFUN (Fread, 1); EXFUN (Fread_from_string, 3); EXFUN (Fintern, 2); @@ -2939,8 +2946,10 @@ extern void syms_of_eval (void); /* Defined in editfns.c */ +extern Lisp_Object last_nonmenu_event; extern Lisp_Object Qfield; extern Lisp_Object Vinhibit_field_text_motion; +extern Lisp_Object Vsystem_name; extern Lisp_Object Vuser_login_name; EXFUN (Fpropertize, MANY); EXFUN (Fcurrent_message, 0); @@ -3061,8 +3070,10 @@ /* Defined in fileio.c */ extern Lisp_Object Qfile_error; +extern Lisp_Object Qfile_exists_p; extern Lisp_Object Qfile_directory_p; extern Lisp_Object Qinsert_file_contents; +extern Lisp_Object Vauto_save_list_file_name; EXFUN (Ffind_file_name_handler, 2); EXFUN (Ffile_name_as_directory, 1); EXFUN (Fmake_temp_name, 1); @@ -3126,6 +3137,7 @@ extern Lisp_Object Qcompletion_ignore_case; extern Lisp_Object Vcompletion_regexp_list; extern Lisp_Object Vhistory_length; +extern Lisp_Object Vminibuffer_list; extern Lisp_Object last_minibuf_string; extern int completion_ignore_case; extern int history_delete_duplicates; @@ -3148,6 +3160,7 @@ /* Defined in callint.c */ extern Lisp_Object Qminus, Qplus, Vcurrent_prefix_arg; +extern Lisp_Object Qwhen; extern Lisp_Object Vcommand_history; extern Lisp_Object Vmark_even_if_inactive; extern Lisp_Object Qcall_interactively, Qmouse_leave_buffer_hook; @@ -3157,6 +3170,7 @@ /* Defined in casefiddle.c */ +extern Lisp_Object Qidentity; EXFUN (Fdowncase, 1); EXFUN (Fupcase, 1); EXFUN (Fcapitalize, 1); @@ -3180,6 +3194,9 @@ extern struct kboard *echo_kboard; extern void cancel_echoing (void); extern Lisp_Object Qdisabled, QCfilter; +extern Lisp_Object Qabove_handle, Qhandle, Qbelow_handle; +extern Lisp_Object Qup, Qdown, Qbottom, Qend_scroll; +extern Lisp_Object Qtop, Qratio; extern Lisp_Object Vtty_erase_char, Vhelp_form, Vtop_level; extern Lisp_Object Vthrow_on_input; extern int input_pending; @@ -3271,6 +3288,8 @@ extern void syms_of_frame (void); /* Defined in emacs.c */ +extern char **initial_argv; +extern int initial_argc; #if defined(HAVE_X_WINDOWS) || defined(HAVE_NS) extern int display_arg; #endif @@ -3336,6 +3355,7 @@ extern Lisp_Object Vexec_path, Vexec_suffixes, Vexec_directory, Vdata_directory; extern Lisp_Object Vdoc_directory; +extern Lisp_Object Vshell_file_name; EXFUN (Fcall_process, MANY); extern int child_setup (int, int, int, char **, int, Lisp_Object); extern void init_callproc_1 (void); @@ -3344,6 +3364,7 @@ extern void syms_of_callproc (void); /* Defined in doc.c */ +extern Lisp_Object Qfunction_documentation; extern Lisp_Object Vdoc_file_name; EXFUN (Fsubstitute_command_keys, 1); EXFUN (Fdocumentation, 2); @@ -3504,16 +3525,26 @@ EXFUN (Fnew_fontset, 2); /* Defined in xfns.c, w32fns.c, or macfns.c */ +extern Lisp_Object Qfont_param; +extern Lisp_Object Vx_no_window_manager; EXFUN (Fxw_display_color_p, 1); EXFUN (Fx_file_dialog, 5); EXFUN (Fx_focus_frame, 1); #endif /* Defined in xfaces.c */ +extern Lisp_Object Qdefault, Qtool_bar, Qregion, Qfringe; +extern Lisp_Object Qheader_line, Qscroll_bar, Qcursor, Qborder, Qmouse, Qmenu; +extern Lisp_Object Qmode_line_inactive, Qvertical_border; extern Lisp_Object Qface; extern Lisp_Object Qnormal; extern Lisp_Object QCfamily, QCweight, QCslant, QCwidth; extern Lisp_Object QCheight, QCsize, QCname, QCwidth, QCforeground, QCbackground; +extern Lisp_Object Vface_alternative_font_family_alist; +extern Lisp_Object Vface_font_rescale_alist; +extern Lisp_Object Vface_ignored_fonts; +extern Lisp_Object Vface_alternative_font_registry_alist; +extern Lisp_Object Vscalable_fonts_allowed; EXFUN (Fclear_face_cache, 1); EXFUN (Fx_load_color_file, 1); extern void syms_of_xfaces (void); === modified file 'src/xterm.h' --- src/xterm.h 2010-08-02 12:50:03 +0000 +++ src/xterm.h 2010-08-05 23:15:24 +0000 @@ -1168,6 +1168,7 @@ /* Defined in xterm.c */ +extern Lisp_Object Qx_gtk_map_stock; extern void xembed_set_info (struct frame *f, enum xembed_info flags); extern void xembed_send_message (struct frame *f, Time time, enum xembed_message message, ------------------------------------------------------------ revno: 100981 committer: Dan Nicolaescu branch nick: trunk timestamp: Thu 2010-08-05 15:23:53 -0700 message: * src/term.c: Remove dead code. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-08-05 22:20:09 +0000 +++ src/ChangeLog 2010-08-05 22:23:53 +0000 @@ -1,5 +1,7 @@ 2010-08-05 Dan Nicolaescu + * term.c: Remove dead code. + Fix emacs -Q -f server-start & emacsclient -t on GNU/Linux. * term.c (dissociate_if_controlling_tty): Use USG5 instead of USG. This is equivalent to defined (USG) && !defined (BSD_PGRPS), === modified file 'src/term.c' --- src/term.c 2010-08-05 22:20:09 +0000 +++ src/term.c 2010-08-05 22:23:53 +0000 @@ -1119,7 +1119,6 @@ return cost; } -#ifndef old /* char_ins_del_cost[n] is cost of inserting N characters. char_ins_del_cost[-n] is cost of deleting N characters. The length of this vector is based on max_frame_cols. */ @@ -1127,7 +1126,6 @@ int *char_ins_del_vector; #define char_ins_del_cost(f) (&char_ins_del_vector[FRAME_COLS ((f))]) -#endif /* ARGSUSED */ static void @@ -1504,15 +1502,6 @@ /*********************************************************************** Character Display Information ***********************************************************************/ - -/* Avoid name clash with functions defined in xterm.c */ -#ifdef static -#define append_glyph append_glyph_term -#define produce_stretch_glyph produce_stretch_glyph_term -#define append_composite_glyph append_composite_glyph_term -#define produce_composite_glyph produce_composite_glyph_term -#endif - static void append_glyph (struct it *); static void produce_stretch_glyph (struct it *); static void append_composite_glyph (struct it *); ------------------------------------------------------------ revno: 100980 committer: Dan Nicolaescu branch nick: trunk timestamp: Thu 2010-08-05 15:20:09 -0700 message: Fix emacs -Q -f server-start & emacsclient -t on GNU/Linux. * src/term.c (dissociate_if_controlling_tty): Use USG5 instead of USG. This is equivalent to defined (USG) && !defined (BSD_PGRPS), which is what was there before BSD_PGRPS was removed. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-08-05 17:11:32 +0000 +++ src/ChangeLog 2010-08-05 22:20:09 +0000 @@ -1,3 +1,10 @@ +2010-08-05 Dan Nicolaescu + + Fix emacs -Q -f server-start & emacsclient -t on GNU/Linux. + * term.c (dissociate_if_controlling_tty): Use USG5 instead of + USG. This is equivalent to defined (USG) && !defined (BSD_PGRPS), + which is what was there before BSD_PGRPS was removed. + 2010-08-05 Eli Zaretskii * deps.mk (unexcoff.o): Rename unexec.[co] => unexcoff.[co]. === modified file 'src/term.c' --- src/term.c 2010-07-27 04:20:51 +0000 +++ src/term.c 2010-08-05 22:20:09 +0000 @@ -3343,7 +3343,7 @@ EMACS_GET_TTY_PGRP (fd, &pgid); /* If tcgetpgrp succeeds, fd is the ctty. */ if (pgid != -1) { -#if defined (USG) +#if defined (USG5) setpgrp (); no_controlling_tty = 1; #elif defined (CYGWIN) ------------------------------------------------------------ revno: 100979 committer: Dan Nicolaescu branch nick: trunk timestamp: Thu 2010-08-05 11:30:35 -0700 message: Regenerate configure. diff: === modified file 'configure' --- configure 2010-08-04 21:48:36 +0000 +++ configure 2010-08-05 18:30:35 +0000 @@ -5509,7 +5509,7 @@ UNEXEC_OBJ=unexelf.o case "$opsys" in - # MSDOS uses unexec.o + # MSDOS uses unexcoff.o # MSWindows uses unexw32.o aix4-2) UNEXEC_OBJ=unexaix.o ------------------------------------------------------------ revno: 100978 [merge] committer: Eli Zaretskii branch nick: trunk timestamp: Thu 2010-08-05 20:23:57 +0300 message: REALLY rename unexec.c => unexcoff.c in MAINTAINERS. admin/MAINTAINERS: Rename src/unexec.c => src/unexcoff.c. diff: === modified file 'admin/MAINTAINERS' --- admin/MAINTAINERS 2010-07-08 18:04:31 +0000 +++ admin/MAINTAINERS 2010-08-05 17:22:34 +0000 @@ -191,7 +191,7 @@ src/undo.c src/unexaix.c src/unexalpha.c -src/unexec.c +src/unexcoff.c src/unexelf.c src/unexhp9k800.c src/unexw32.c ------------------------------------------------------------ revno: 100977 [merge] committer: Eli Zaretskii branch nick: trunk timestamp: Thu 2010-08-05 20:16:27 +0300 message: Rename src/unexec.c => src/unexcoff.c. src/unexcoff.c: Renamed from unexec.c. src/deps.mk (unexcoff.o): Rename unexec.[co] => unexcoff.[co]. configure.in (UNEXEC_OBJ): Rename unexec.o => unexcoff.o. admin/MAINTAINERS: Rename src/unexec.c => src/unexcoff.c. etc/AUTHORS: Rename unexec.o => unexcoff.o. etc/PROBLEMS: Rename unexec.o => unex*.o. lisp/emacs-lisp/find-gc.el (find-gc-source-files): Rename unexec.c => unexcoff.c. lisp/emacs-lisp/authors.el (authors-fixed-entries): Rename unexec.c => unexcoff.c. msdos/sed1v2.inp (UNEXEC_OBJ): Edit to unexcoff.o, due to renaming of unexec.c => unexcoff.c. diff: === modified file 'ChangeLog' --- ChangeLog 2010-08-04 21:48:36 +0000 +++ ChangeLog 2010-08-05 17:11:32 +0000 @@ -1,3 +1,7 @@ +2010-08-05 Eli Zaretskii + + * configure.in (UNEXEC_OBJ): Rename unexec.o => unexcoff.o. + 2010-08-04 Andreas Schwab * configure.in: Restore accidentally removed use of === modified file 'admin/ChangeLog' --- admin/ChangeLog 2010-07-24 13:35:31 +0000 +++ admin/ChangeLog 2010-08-05 17:11:32 +0000 @@ -1,3 +1,7 @@ +2010-08-05 Eli Zaretskii + + * MAINTAINERS: Rename src/unexec.c => src/unexcoff.c. + 2010-07-24 Christoph Scholtes * admin.el: Write version number to nt/makefile.w32-in. === modified file 'configure.in' --- configure.in 2010-08-04 21:48:36 +0000 +++ configure.in 2010-08-05 17:11:32 +0000 @@ -883,7 +883,7 @@ UNEXEC_OBJ=unexelf.o case "$opsys" in - # MSDOS uses unexec.o + # MSDOS uses unexcoff.o # MSWindows uses unexw32.o aix4-2) UNEXEC_OBJ=unexaix.o === modified file 'etc/AUTHORS' --- etc/AUTHORS 2010-05-04 01:31:59 +0000 +++ etc/AUTHORS 2010-08-05 17:11:32 +0000 @@ -1042,7 +1042,7 @@ François-David Collin: changed message.el mm-decode.el -Fred Fish: changed linux.h unexec.c +Fred Fish: changed linux.h unexcoff.c Fred Oberhauser: changed nnmail.el @@ -1273,7 +1273,7 @@ Inoue Seiichiro: changed xterm.c xfns.c xterm.h International Business Machines: changed emacs.c fileio.c process.c - sysdep.c unexec.c + sysdep.c unexcoff.c Irie Tetsuya: changed gnus.texi message.texi @@ -1334,7 +1334,7 @@ James Troup: changed gnus-sum.el -James Van Artsdalen: changed unexec.c usg5-4.h +James Van Artsdalen: changed unexcoff.c usg5-4.h James Wright: changed em-unix.el @@ -2176,7 +2176,7 @@ simple.el vc.el configure.in dired.el and 50 other files Michael Ben-Gershon: changed acorn.h configure.in riscix1-1.h riscix1-2.h - unexec.c + unexcoff.c Michael D. Ernst: wrote reposition.el and changed dired-x.el uniquify.el ispell.el bibtex.el rmail.el dired.el @@ -2200,7 +2200,7 @@ Michael K. Johnson: changed configure.in emacs.c intel386.h linux.h mem-limits.h process.c sysdep.c syssignal.h systty.h template.h - unexec.c + unexcoff.c Michael Kifer: wrote ediff-diff.el ediff-help.el ediff-hook.el ediff-init.el ediff-merg.el ediff-mult.el ediff-ptch.el ediff-util.el @@ -2259,7 +2259,7 @@ Microelectronics and Computer Technology Corporation: changed emacsclient.c etags.c lisp.h movemail.c rmail.el rmailedit.el rmailkwd.el rmailmsc.el rmailout.el rmailsum.el scribe.el server.el - sysdep.c unexec.c xmenu.c + sysdep.c unexcoff.c xmenu.c Mikael Djurfeldt: changed xdisp.c @@ -2685,7 +2685,7 @@ Richard Mlynarik: wrote cl-indent.el ebuff-menu.el ehelp.el rfc822.el terminal.el yow.el and changed files.el sysdep.c rmail.el info.el keyboard.c bytecomp.el - fileio.c simple.el process.c startup.el window.c editfns.c unexec.c + fileio.c simple.el process.c startup.el window.c editfns.c unexcoff.c xfns.c keymap.c minibuf.c sendmail.el buffer.c dispnew.c emacs.c subr.el and 129 other files @@ -2921,7 +2921,7 @@ ls-lisp.el w32proc.c Spencer Thomas: changed dabbrev.el emacsclient.c gnus.texi server.el - unexec.c + unexcoff.c Sriram Karra: changed message.el === modified file 'etc/ChangeLog' --- etc/ChangeLog 2010-07-31 15:46:58 +0000 +++ etc/ChangeLog 2010-08-05 17:11:32 +0000 @@ -1,3 +1,8 @@ +2010-08-05 Eli Zaretskii + + * AUTHORS: Rename unexec.o => unexcoff.o. + * PROBLEMS: Rename unexec.o => unexcoff.o. + 2010-07-31 Eli Zaretskii * tutorials/TUTORIAL.he: New file. === modified file 'etc/PROBLEMS' --- etc/PROBLEMS 2010-07-20 18:32:42 +0000 +++ etc/PROBLEMS 2010-08-05 17:11:32 +0000 @@ -2740,7 +2740,7 @@ Two causes have been seen for such problems. 1) On a system where getpagesize is not a system call, it is defined -as a macro. If the definition (in both unexec.c and malloc.c) is wrong, +as a macro. If the definition (in both unex*.c and malloc.c) is wrong, it can cause problems like this. You might be able to find the correct value in the man page for a.out (5). === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-08-05 08:15:22 +0000 +++ lisp/ChangeLog 2010-08-05 17:11:32 +0000 @@ -1,3 +1,11 @@ +2010-08-05 Eli Zaretskii + + * emacs-lisp/find-gc.el (find-gc-source-files): Rename + unexec.c => unexcoff.c. + + * emacs-lisp/authors.el (authors-fixed-entries): Rename + unexec.c => unexcoff.c. + 2010-08-05 Michael Albinus * net/tramp.el (tramp-handle-dired-uncache): Flush directory === modified file 'lisp/emacs-lisp/authors.el' --- lisp/emacs-lisp/authors.el 2010-06-10 05:39:03 +0000 +++ lisp/emacs-lisp/authors.el 2010-08-05 17:11:32 +0000 @@ -354,7 +354,7 @@ ;; No longer distributed. ;;; ("Viktor Dukhovni" :wrote "unexsunos4.c") ("Paul Eggert" :wrote "rcs2log" "vcdiff") - ("Fred Fish" :changed "unexec.c") + ("Fred Fish" :changed "unexcoff.c") ;; No longer distributed. ;;; ("Tim Fleehart" :wrote "makefile.nt") ("Keith Gabryelski" :wrote "hexl.c") @@ -377,13 +377,13 @@ "indent.c" "search.c" "xdisp.c" "region-cache.c" "region-cache.h") ;; ibmrt.h, ibmrt-aix.h no longer distributed. ("International Business Machines" :changed "emacs.c" "fileio.c" - "process.c" "sysdep.c" "unexec.c") + "process.c" "sysdep.c" "unexcoff.c") ;; No longer distributed. ;;; ("Ishikawa Chiaki" :changed "aviion.h" "dgux.h") ;; ymakefile no longer distributed. ("Michael K. Johnson" :changed "configure.in" "emacs.c" "intel386.h" "mem-limits.h" "process.c" "template.h" "sysdep.c" "syssignal.h" - "systty.h" "unexec.c" "linux.h") + "systty.h" "unexcoff.c" "linux.h") ;; No longer distributed. ;;; ("Kyle Jones" :wrote "mldrag.el") ("Henry Kautz" :wrote "bib-mode.el") @@ -408,7 +408,7 @@ "rmail.el" "rmailedit.el" "rmailkwd.el" "rmailmsc.el" "rmailout.el" "rmailsum.el" "scribe.el" ;; It was :wrote for xmenu.c, but it has been rewritten since. - "server.el" "lisp.h" "sysdep.c" "unexec.c" "xmenu.c") + "server.el" "lisp.h" "sysdep.c" "unexcoff.c" "xmenu.c") ("Niall Mansfield" :changed "etags.c") ("Brian Marick" :cowrote "hideif.el") ("Marko Kohtala" :changed "info.el") @@ -463,9 +463,9 @@ ("Kayvan Sylvan" :changed "supercite.el") ;; No longer distributed: emacsserver.c, tcp.c. ("Spencer Thomas" :changed "emacsclient.c" "server.el" - "dabbrev.el" "unexec.c" "gnus.texi") + "dabbrev.el" "unexcoff.c" "gnus.texi") ("Jonathan Vail" :changed "vc.el") - ("James Van Artsdalen" :changed "usg5-4.h" "unexec.c") + ("James Van Artsdalen" :changed "usg5-4.h" "unexcoff.c") ;; No longer distributed: src/makefile.nt, lisp/makefile.nt ;; winnt.el renamed to w32-fns.el; nt.[ch] to w32.[ch]; ;; ntheap.[ch] to w32heap.[ch]; ntinevt.c to w32inevt.c; === modified file 'lisp/emacs-lisp/find-gc.el' --- lisp/emacs-lisp/find-gc.el 2010-01-13 08:35:10 +0000 +++ lisp/emacs-lisp/find-gc.el 2010-08-05 17:11:32 +0000 @@ -60,7 +60,7 @@ "indent.c" "search.c" "regex.c" "undo.c" "alloc.c" "data.c" "doc.c" "editfns.c" "callint.c" "eval.c" "fns.c" "print.c" "lread.c" - "abbrev.c" "syntax.c" "unexec.c" + "abbrev.c" "syntax.c" "unexcoff.c" "bytecode.c" "process.c" "callproc.c" "doprnt.c" "x11term.c" "x11fns.c")) === modified file 'msdos/ChangeLog' --- msdos/ChangeLog 2010-07-29 20:16:18 +0000 +++ msdos/ChangeLog 2010-08-05 17:11:32 +0000 @@ -1,3 +1,8 @@ +2010-08-05 Eli Zaretskii + + * sed1v2.inp (UNEXEC_OBJ): Edit to unexcoff.o, due to renaming of + unexec.c => unexcoff.c. + 2010-07-29 Chad Brown * sed2v2.inp (HAVE_DIRENT_H): Edit to 1. === modified file 'msdos/sed1v2.inp' --- msdos/sed1v2.inp 2010-07-12 18:23:00 +0000 +++ msdos/sed1v2.inp 2010-08-05 17:11:32 +0000 @@ -118,7 +118,7 @@ /^RALLOC_OBJ *=/s/@RALLOC_OBJ@/ralloc.o/ /^PRE_ALLOC_OBJ *=/s/@PRE_ALLOC_OBJ@/lastfile.o/ /^POST_ALLOC_OBJ *=/s/@POST_ALLOC_OBJ@/$(vmlimitobj)/ -/^UNEXEC_OBJ *=/s/@UNEXEC_OBJ@/unexec.o/ +/^UNEXEC_OBJ *=/s/@UNEXEC_OBJ@/unexcoff.o/ /^CANNOT_DUMP *=/s/@CANNOT_DUMP@/no/ /^DEPFLAGS *=/s/@DEPFLAGS@// /^MKDEPDIR *=/s/@MKDEPDIR@// === modified file 'src/ChangeLog' --- src/ChangeLog 2010-08-04 18:10:07 +0000 +++ src/ChangeLog 2010-08-05 17:11:32 +0000 @@ -1,3 +1,9 @@ +2010-08-05 Eli Zaretskii + + * deps.mk (unexcoff.o): Rename unexec.[co] => unexcoff.[co]. + + * unexcoff.c: Renamed from unexec.c. + 2010-08-04 Stefan Monnier * sysdep.c (child_setup_tty): Comment-out left-over non-ICANON code. === modified file 'src/deps.mk' --- src/deps.mk 2010-06-12 15:52:43 +0000 +++ src/deps.mk 2010-08-05 17:11:32 +0000 @@ -190,7 +190,7 @@ unexaix.o: unexaix.c lisp.h $(config_h) unexalpha.o: unexalpha.c $(config_h) unexcw.o: unexcw.c lisp.h $(config_h) -unexec.o: unexec.c lisp.h $(config_h) +unexcoff.o: unexcoff.c lisp.h $(config_h) unexelf.o: unexelf.c $(config_h) unexhp9k800.o: unexhp9k800.c $(config_h) unexmacosx.o: unexmacosx.c $(config_h) === renamed file 'src/unexec.c' => 'src/unexcoff.c' --- src/unexec.c 2010-07-29 03:25:08 +0000 +++ src/unexcoff.c 2010-08-05 17:11:32 +0000 @@ -18,12 +18,19 @@ /* - * unexec.c - Convert a running program into an a.out file. + * unexcoff.c - Convert a running program into an a.out or COFF file. + * + * ================================================================== + * Note: This file is currently used only by the MSDOS (a.k.a. DJGPP) + * build of Emacs. If you are not interested in the MSDOS build, you + * are looking at the wrong version of unexec! + * ================================================================== * * Author: Spencer W. Thomas * Computer Science Dept. * University of Utah * Date: Tue Mar 2 1982 + * Originally under the name unexec.c. * Modified heavily since then. * * Synopsis: ------------------------------------------------------------ revno: 100976 committer: Michael Albinus branch nick: trunk timestamp: Thu 2010-08-05 15:51:21 +0200 message: * tramp.texi (External packages): File attributes cache flushing for asynchronous processes. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2010-08-01 18:07:10 +0000 +++ doc/misc/ChangeLog 2010-08-05 13:51:21 +0000 @@ -1,3 +1,8 @@ +2010-08-05 Michael Albinus + + * tramp.texi (External packages): File attributes cache flushing + for asynchronous processes. + 2010-08-01 Alan Mackenzie Enhance the manual for the latest Java Mode. === modified file 'doc/misc/tramp.texi' --- doc/misc/tramp.texi 2010-07-28 10:25:38 +0000 +++ doc/misc/tramp.texi 2010-08-05 13:51:21 +0000 @@ -3471,7 +3471,7 @@ This is a performance degradation, because the lost file attributes must be recomputed, when needed again. In cases the caller of -@code{process-file} knows that there are file attribute changes, it +@code{process-file} knows that there are no file attribute changes, it shall let-bind the variable @code{process-file-side-effects} to @code{nil}. @value{tramp} wouldn't flush the file attributes cache then. @@ -3479,6 +3479,25 @@ (let (process-file-side-effects) ...) @end lisp + +For asynchronous processes, @value{tramp} flushes the file attributes +cache via a process sentinel. If the caller of +@code{start-file-process} knows that there are no file attribute +changes, it shall set the process sentinel to @code{nil}. In case the +caller defines an own process sentinel, @value{tramp}'s process +sentinel is overwritten. The caller can still flush the file +attributes cache in its process sentinel with this code: + +@lisp +(unless (memq (process-status proc) '(run open)) + (dired-uncache remote-directory)) +@end lisp + +@code{remote-directory} shall be the root directory, where file +attribute changes can happen during the process lifetime. +@value{tramp} traverses all subdirectories, starting at this +directory. Often, it is sufficient to use @code{default-directory} of +the process buffer as root directory. @end ifset ------------------------------------------------------------ revno: 100975 committer: Michael Albinus branch nick: trunk timestamp: Thu 2010-08-05 10:15:22 +0200 message: * net/tramp.el (tramp-handle-dired-uncache): Flush directory cache, not only file cache. (tramp-process-sentinel): New defun. (tramp-handle-start-file-process): Use it, in order to invalidate file caches. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-08-03 12:22:23 +0000 +++ lisp/ChangeLog 2010-08-05 08:15:22 +0000 @@ -1,3 +1,11 @@ +2010-08-05 Michael Albinus + + * net/tramp.el (tramp-handle-dired-uncache): Flush directory + cache, not only file cache. + (tramp-process-sentinel): New defun. + (tramp-handle-start-file-process): Use it, in order to invalidate + file caches. + 2010-08-03 Leo * server.el (server-start): Simplify loop. === modified file 'lisp/net/tramp.el' --- lisp/net/tramp.el 2010-07-29 13:13:11 +0000 +++ lisp/net/tramp.el 2010-08-05 08:15:22 +0000 @@ -4234,7 +4234,7 @@ ;; DIR-P is valid for XEmacs only. (with-parsed-tramp-file-name (if (or dir-p (file-directory-p dir)) dir (file-name-directory dir)) nil - (tramp-flush-file-property v localname))) + (tramp-flush-directory-property v localname))) ;; Pacify byte-compiler. The function is needed on XEmacs only. I'm ;; not sure at all that this is the right way to do it, but let's hope @@ -4503,6 +4503,14 @@ (with-parsed-tramp-file-name default-directory nil (tramp-find-executable v command (tramp-get-remote-path v) t))) +(defun tramp-process-sentinel (proc event) + "Flush file caches." + (unless (memq (process-status proc) '(run open)) + (with-current-buffer (process-buffer proc) + (with-parsed-tramp-file-name default-directory nil + (tramp-message v 5 "Sentinel called: `%s' `%s'" proc event) + (tramp-flush-directory-property v ""))))) + ;; We use BUFFER also as connection buffer during setup. Because of ;; this, its original contents must be saved, and restored once ;; connection has been setup. @@ -4546,11 +4554,12 @@ (unless (process-get (tramp-get-connection-process v) 'remote-tty) (tramp-error v 'file-error "pty association is not supported for `%s'" name))) - ;; Set query flag for this process. - (tramp-set-process-query-on-exit-flag - (tramp-get-connection-process v) t) - ;; Return process. - (tramp-get-connection-process v)) + (let ((p (tramp-get-connection-process v))) + ;; Set sentinel and query flag for this process. + (set-process-sentinel p 'tramp-process-sentinel) + (tramp-set-process-query-on-exit-flag p t) + ;; Return process. + p)) ;; Save exit. (with-current-buffer (tramp-get-connection-buffer v) (if (string-match tramp-temp-buffer-name (buffer-name)) ------------------------------------------------------------ revno: 100974 committer: Nick Roberts branch nick: trunk timestamp: Thu 2010-08-05 17:18:55 +1200 message: Fix compilation error. diff: === modified file 'src/sysdep.c' --- src/sysdep.c 2010-08-04 18:10:07 +0000 +++ src/sysdep.c 2010-08-05 05:18:55 +0000 @@ -522,7 +522,7 @@ s.main.c_lflag |= ICANON; /* Enable line editing and eof processing */ s.main.c_cc[VEOF] = 'D'&037; /* Control-D */ -#ifdef 0 /* These settins only apply to non-ICANON mode. */ +#if 0 /* These settings only apply to non-ICANON mode. */ s.main.c_cc[VMIN] = 1; s.main.c_cc[VTIME] = 0; #endif ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.