diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-02-01 12:09:25 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-02-01 12:09:25 -0500 |
| commit | 8f1d2ef658f95549eb33fe5265f8f11c5129bece (patch) | |
| tree | b7cd852a1adb423384532cfe22c31547160b22bc /src/bytecode.c | |
| parent | 590130fb19e1f433965c421d98fedeb2d7c33310 (diff) | |
| parent | 1dc4075fa8809805aed5092e93e225e889725c94 (diff) | |
| download | emacs-8f1d2ef658f95549eb33fe5265f8f11c5129bece.tar.gz | |
Merge from trunk
Diffstat (limited to 'src/bytecode.c')
| -rw-r--r-- | src/bytecode.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/bytecode.c b/src/bytecode.c index eb12b9c4963..96d2aa273f2 100644 --- a/src/bytecode.c +++ b/src/bytecode.c @@ -1,6 +1,5 @@ /* Execution of byte code produced by bytecomp.el. - Copyright (C) 1985, 1986, 1987, 1988, 1993, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1985-1988, 1993, 2000-2011 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -58,9 +57,7 @@ by Hallvard: #ifdef BYTE_CODE_METER -Lisp_Object Vbyte_code_meter, Qbyte_code_meter; -int byte_metering_on; - +Lisp_Object Qbyte_code_meter; #define METER_2(code1, code2) \ XFASTINT (XVECTOR (XVECTOR (Vbyte_code_meter)->contents[(code1)]) \ ->contents[(code2)]) @@ -938,7 +935,7 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth, case Btemp_output_buffer_setup: BEFORE_POTENTIAL_GC (); CHECK_STRING (TOP); - temp_output_buffer_setup (SDATA (TOP)); + temp_output_buffer_setup (SSDATA (TOP)); AFTER_POTENTIAL_GC (); TOP = Vstandard_output; break; @@ -1799,7 +1796,7 @@ syms_of_bytecode (void) #ifdef BYTE_CODE_METER - DEFVAR_LISP ("byte-code-meter", &Vbyte_code_meter, + DEFVAR_LISP ("byte-code-meter", Vbyte_code_meter, doc: /* A vector of vectors which holds a histogram of byte-code usage. \(aref (aref byte-code-meter 0) CODE) indicates how many times the byte opcode CODE has been executed. @@ -1807,7 +1804,7 @@ opcode CODE has been executed. indicates how many times the byte opcodes CODE1 and CODE2 have been executed in succession. */); - DEFVAR_BOOL ("byte-metering-on", &byte_metering_on, + DEFVAR_BOOL ("byte-metering-on", byte_metering_on, doc: /* If non-nil, keep profiling information on byte code usage. The variable byte-code-meter indicates how often each byte opcode is used. If a symbol has a property named `byte-code-meter' whose value is an @@ -1825,6 +1822,3 @@ integer, it is incremented each time that symbol's function is called. */); } #endif } - -/* arch-tag: b9803b6f-1ed6-4190-8adf-33fd3a9d10e9 - (do not change this comment) */ |