Mercurial > hg > xemacs-beta

comparison src/macros.c @ 563:183866b06e0b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2001-05-24 07:50:48 by ben] Makefile.in.in, abbrev.c, alloc.c, buffer.c, bytecode.c, callint.c, callproc.c, casetab.c, chartab.c, cmdloop.c, cmds.c, console-msw.c, console-msw.h, console-stream.c, console-tty.c, console-x.c, console.c, data.c, database.c, debug.c, device-gtk.c, device-msw.c, device-tty.c, device-x.c, device.c, dialog-gtk.c, dialog-msw.c, dialog-x.c, dialog.c, dired-msw.c, dired.c, doc.c, doprnt.c, dragdrop.c, editfns.c, eldap.c, eldap.h, elhash.c, emacs-widget-accessors.c, emacs.c, emodules.c, esd.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, extents.c, faces.c, file-coding.c, fileio.c, filelock.c, floatfns.c, fns.c, font-lock.c, frame-gtk.c, frame-x.c, frame.c, general-slots.h, glade.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gpmevent.c, gui-gtk.c, gui-x.c, gui.c, gutter.c, hpplay.c, indent.c, input-method-xlib.c, insdel.c, intl.c, keymap.c, libsst.c, libsst.h, linuxplay.c, lisp.h, lread.c, lstream.c, lstream.h, macros.c, marker.c, md5.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, miscplay.c, miscplay.h, mule-ccl.c, mule-charset.c, mule-wnnfns.c, mule.c, nas.c, ntplay.c, ntproc.c, objects-gtk.c, objects-msw.c, objects-x.c, objects.c, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, ralloc.c, rangetab.c, redisplay.c, scrollbar.c, search.c, select-gtk.c, select-x.c, select.c, sgiplay.c, sheap.c, sound.c, specifier.c, sunplay.c, symbols.c, symeval.h, symsinit.h, syntax.c, sysdep.c, toolbar-msw.c, toolbar.c, tooltalk.c, ui-byhand.c, ui-gtk.c, undo.c, unexaix.c, unexapollo.c, unexconvex.c, unexec.c, widget.c, win32.c, window.c: -- defsymbol -> DEFSYMBOL. -- add an error type to all errors. -- eliminate the error functions in eval.c that let you just use Qerror as the type. -- redo the error API to be more consistent, sensibly named, and easier to use. -- redo the error hierarchy somewhat. create new errors: structure-formation-error, gui-error, invalid-constant, stack-overflow, out-of-memory, process-error, network-error, sound-error, printing-unreadable-object, base64-conversion- error; coding-system-error renamed to text-conversion error; some others. -- fix Mule problems in error strings in emodules.c, tooltalk.c. -- fix error handling in mswin open-network-stream. -- Mule-ize all sound files and clean up the headers. -- nativesound.h -> sound.h and used for all sound files. -- move some shared stuff into glyphs-shared.c: first attempt at eliminating some of the massive GTK code duplication. xemacs.mak: add glyphs-shared.c. xemacs-faq.texi: document how to debug X errors subr.el: fix doc string to reflect reality
author ben
date Thu, 24 May 2001 07:51:33 +0000
parents 576fb035e263
children 943eaba38521
comparison
equal deleted inserted replaced
562:c775bd016b32 563:183866b06e0b
60 (append)) 60 (append))
61 { 61 {
62 /* This function can GC */ 62 /* This function can GC */
63 struct console *con = XCONSOLE (Vselected_console); 63 struct console *con = XCONSOLE (Vselected_console);
64 if (!NILP (con->defining_kbd_macro)) 64 if (!NILP (con->defining_kbd_macro))
65 error ("Already defining kbd macro"); 65 invalid_operation ("Already defining kbd macro", Qunbound);
66 66
67 if (NILP (con->kbd_macro_builder)) 67 if (NILP (con->kbd_macro_builder))
68 con->kbd_macro_builder = make_vector (30, Qnil); 68 con->kbd_macro_builder = make_vector (30, Qnil);
69 69
70 zmacs_region_stays = 1; /* set this before calling Fexecute_kbd_macro() 70 zmacs_region_stays = 1; /* set this before calling Fexecute_kbd_macro()
103 /* This function can GC */ 103 /* This function can GC */
104 struct console *con = XCONSOLE (Vselected_console); 104 struct console *con = XCONSOLE (Vselected_console);
105 int repeat; 105 int repeat;
106 106
107 if (NILP (con->defining_kbd_macro)) 107 if (NILP (con->defining_kbd_macro))
108 error ("Not defining kbd macro"); 108 invalid_operation ("Not defining kbd macro", Qunbound);
109 109
110 if (NILP (arg)) 110 if (NILP (arg))
111 repeat = -1; 111 repeat = -1;
112 else 112 else
113 repeat = XINT (Fprefix_numeric_value (arg)); 113 repeat = XINT (Fprefix_numeric_value (arg));
191 return; 191 return;
192 } 192 }
193 } 193 }
194 else if (!EQ (Vexecuting_macro, Qt)) /* Some things replace the macro 194 else if (!EQ (Vexecuting_macro, Qt)) /* Some things replace the macro
195 with Qt to force an early exit. */ 195 with Qt to force an early exit. */
196 error ("junk in executing-macro"); 196 signal_error (Qinvalid_state, "junk in executing-macro", Qunbound);
197 197
198 Fthrow (Qexecute_kbd_macro, Qt); 198 Fthrow (Qexecute_kbd_macro, Qt);
199 } 199 }
200 200
201 201
232 { 232 {
233 /* This function can GC */ 233 /* This function can GC */
234 struct console *con = XCONSOLE (Vselected_console); 234 struct console *con = XCONSOLE (Vselected_console);
235 235
236 if (!NILP (con->defining_kbd_macro)) 236 if (!NILP (con->defining_kbd_macro))
237 error ("Can't execute anonymous macro while defining one"); 237 invalid_operation ("Can't execute anonymous macro while defining one", Qunbound);
238 else if (NILP (con->last_kbd_macro)) 238 else if (NILP (con->last_kbd_macro))
239 error ("No kbd macro has been defined"); 239 invalid_operation ("No kbd macro has been defined", Qunbound);
240 else 240 else
241 Fexecute_kbd_macro (con->last_kbd_macro, prefix); 241 Fexecute_kbd_macro (con->last_kbd_macro, prefix);
242 return Qnil; 242 return Qnil;
243 } 243 }
244 244
273 repeat = XINT (count); 273 repeat = XINT (count);
274 } 274 }
275 275
276 final = indirect_function (macro, 1); 276 final = indirect_function (macro, 1);
277 if (!STRINGP (final) && !VECTORP (final)) 277 if (!STRINGP (final) && !VECTORP (final))
278 error ("Keyboard macros must be strings or vectors"); 278 invalid_argument ("Keyboard macros must be strings or vectors", Qunbound);
279 279
280 tem = Fcons (Vexecuting_macro, make_int (executing_macro_index)); 280 tem = Fcons (Vexecuting_macro, make_int (executing_macro_index));
281 record_unwind_protect (pop_kbd_macro, tem); 281 record_unwind_protect (pop_kbd_macro, tem);
282 282
283 GCPRO1 (final); 283 GCPRO1 (final);
305 DEFSUBR (Fend_kbd_macro); 305 DEFSUBR (Fend_kbd_macro);
306 DEFSUBR (Fzap_last_kbd_macro_event); 306 DEFSUBR (Fzap_last_kbd_macro_event);
307 DEFSUBR (Fcall_last_kbd_macro); 307 DEFSUBR (Fcall_last_kbd_macro);
308 DEFSUBR (Fexecute_kbd_macro); 308 DEFSUBR (Fexecute_kbd_macro);
309 DEFSUBR (Fcancel_kbd_macro_events); 309 DEFSUBR (Fcancel_kbd_macro_events);
310 defsymbol (&Qexecute_kbd_macro, "execute-kbd-macro"); 310 DEFSYMBOL (Qexecute_kbd_macro);
311 } 311 }
312 312
313 void 313 void
314 vars_of_macros (void) 314 vars_of_macros (void)
315 { 315 {