Mercurial > emacs
comparison src/emacs.c @ 83450:c69d44922688
Merged from miles@gnu.org--gnu-2005 (patch 682)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-682
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-490
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Tue, 03 Jan 2006 02:15:28 +0000 |
| parents | c82829d08b89 ebf8e8b846e6 |
| children | 55e22205ba88 |
comparison
equal
deleted
inserted
replaced
| 83449:ff74a86c2b16 | 83450:c69d44922688 |
|---|---|
| 111 #else | 111 #else |
| 112 EMACS_INT gdb_data_seg_bits = 0; | 112 EMACS_INT gdb_data_seg_bits = 0; |
| 113 #endif | 113 #endif |
| 114 EMACS_INT PVEC_FLAG = PSEUDOVECTOR_FLAG; | 114 EMACS_INT PVEC_FLAG = PSEUDOVECTOR_FLAG; |
| 115 EMACS_INT gdb_array_mark_flag = ARRAY_MARK_FLAG; | 115 EMACS_INT gdb_array_mark_flag = ARRAY_MARK_FLAG; |
| 116 /* GDB might say "No enum type named pvec_type" if we don't have at | |
| 117 least one symbol with that type, and then xbacktrace could fail. */ | |
| 118 enum pvec_type gdb_pvec_type = PVEC_TYPE_MASK; | |
| 116 | 119 |
| 117 /* Command line args from shell, as list of strings. */ | 120 /* Command line args from shell, as list of strings. */ |
| 118 Lisp_Object Vcommand_line_args; | 121 Lisp_Object Vcommand_line_args; |
| 119 | 122 |
| 120 /* The name under which Emacs was invoked, with any leading directory | 123 /* The name under which Emacs was invoked, with any leading directory |