annotate tests/tooltalk/emacs-eval.c @ 4539:061e030e3270

Fix some bugs in load-history construction, built-in symbol file names. lib-src/ChangeLog addition: 2008-12-27 Aidan Kehoe <kehoea@parhasard.net> * make-docfile.c (main): Allow more than one -d argument, followed by a directory to change to. (put_filename): Don't strip directory information; with previous change, allows retrieval of Lisp function and variable origin files from #'built-in-symbol-file relative to lisp-directory. (scan_lisp_file): Don't add an extraneous newline after the file name, put_filename has added the newline already. lisp/ChangeLog addition: 2008-12-27 Aidan Kehoe <kehoea@parhasard.net> * loadup.el (load-history): Add the contents of current-load-list to load-history before clearing it. Move the variable declarations earlier in the file to a format understood by make-docfile.c. * custom.el (custom-declare-variable): Add the variable's symbol to the current file's load history entry correctly, don't use a cons. Eliminate a comment that we don't need to worry about, we don't need to check the `initialized' C variable in Lisp. * bytecomp.el (byte-compile-output-file-form): Merge Andreas Schwab's pre-GPLv3 GNU change of 19970831 here; treat #'custom-declare-variable correctly, generating the docstrings in a format understood by make-docfile.c. * loadhist.el (symbol-file): Correct behaviour for checking autoloaded macros and functions when supplied with a TYPE argument. Accept fully-qualified paths from #'built-in-symbol-file; if a path is not fully-qualified, return it relative to lisp-directory if the filename corresponds to a Lisp file, and relative to (concat source-directory "/src/") otherwise. * make-docfile.el (preloaded-file-list): Rationalise some let bindings a little. Use the "-d" argument to make-docfile.c to supply Lisp paths relative to lisp-directory, not absolutely. Add in loadup.el explicitly to the list of files to be processed by make-docfile.c--it doesn't make sense to add it to preloaded-file-list, since that is used for purposes of byte-compilation too. src/ChangeLog addition: 2008-12-27 Aidan Kehoe <kehoea@parhasard.net> * doc.c (Fbuilt_in_symbol_file): Return a subr's filename immediately if we've found it. Check for compiled function and compiled macro docstrings in DOC too, and return them if they exist. The branch of the if statement focused on functions may have executed, but we may still want to check variable bindings; an else clause isn't appropriate.
author Aidan Kehoe <kehoea@parhasard.net>
date Sat, 27 Dec 2008 14:05:50 +0000
parents 131b0175ea99
children 9fc91aa3a927
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1 /* emacs-eval.c - send an s-expression to XEmacs for evaluation via ToolTalk */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
2
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
3 /* See `tooltalk-eval-handler' in the file lisp/tooltalk/tooltalk-init.el for
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
4 the receiver side. */
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
5
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
6 #include <desktop/tt_c.h>
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
7 #include <stdio.h>
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
8 #include <stdlib.h>
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
9 #include <sys/wait.h>
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
10
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
11 Tt_status tter;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
12
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
13 #define exit_err_ptr(ptr) \
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
14 if ((tter = tt_ptr_error(ptr)) != TT_OK) \
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
15 { fprintf(stderr, "%d:%s\n", __LINE__, tt_status_message(tter)); exit(1); }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
16
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
17 #define exit_err(stat) \
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
18 if ((tter = stat) != TT_OK) \
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
19 { fprintf(stderr, "%d:%s\n", __LINE__, tt_status_message(tter)); exit(1); }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
20
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
21 Tt_callback_action callback_fn(Tt_message msg, Tt_pattern pat);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
22 static Tt_message create_new_message(char *s_expression);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
23 static int initialize_tooltalk(void);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
24 static void usage(void);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
25
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
26 static char* tt_procid;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
27
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
28 Tt_callback_action
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
29 callback_fn(Tt_message msg, Tt_pattern pat)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
30 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
31 tt_message_destroy(msg);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
32 return TT_CALLBACK_PROCESSED;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
33 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
34
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
35 static Tt_message
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
36 create_new_message(char *s_expression)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
37 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
38 Tt_message msg;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
39
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
40 msg = tt_message_create();
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
41 exit_err_ptr(msg);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
42
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
43 exit_err(tt_message_address_set (msg, TT_PROCEDURE));
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
44 exit_err(tt_message_class_set (msg, TT_REQUEST));
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
45 exit_err(tt_message_scope_set (msg, TT_SESSION));
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
46 exit_err(tt_message_op_set (msg, "emacs-eval"));
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
47 exit_err(tt_message_arg_add (msg, TT_IN, "string", s_expression));
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
48 exit_err(tt_message_callback_add(msg, callback_fn));
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
49
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
50 return msg;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
51 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
52
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
53 static int
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
54 initialize_tooltalk(void) {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
55 int rcode;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
56
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
57 tt_procid = tt_open();
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
58 if ((rcode = tt_ptr_error(tt_procid)) != TT_OK) {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
59 return rcode;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
60 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
61
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
62 if ((rcode = tt_session_join(tt_default_session())) != TT_OK) {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
63 return (rcode);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
64 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
65 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
66
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
67
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
68 static void
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
69 usage(void)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
70 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
71 fprintf(stderr,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
72 "Usage: emacs-eval \"<s-expression>\"\n\n");
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
73 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
74
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
75 void
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
76 main(argc, argv)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
77 int argc;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
78 char *argv[];
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
79 {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
80
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
81 Tt_message msg;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
82
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
83 if (argc != 2) {
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
84 usage();
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
85 exit(0);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
86 }
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
87
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
88 exit_err(initialize_tooltalk());
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
89
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
90 msg = create_new_message(argv[1]);
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
91
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
92 exit_err(tt_message_send(msg));
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
93
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
94 return;
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
95 }