diff options
| author | Tom Tromey <tromey@redhat.com> | 2012-12-17 07:56:22 -0700 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2012-12-17 07:56:22 -0700 |
| commit | 3d6eced1ae51ffd0a782130e7c334052277e2724 (patch) | |
| tree | 5d1d2ad7cd3374f922886c4a72062511a035c168 /src/macros.c | |
| parent | bf69f522a9e135f9aa483cedd53e71e915f2bf75 (diff) | |
| parent | 7c3d167f48d6262ee4e5512aa50a07ee96bc1509 (diff) | |
| download | emacs-3d6eced1ae51ffd0a782130e7c334052277e2724.tar.gz | |
merge from trunk
Diffstat (limited to 'src/macros.c')
| -rw-r--r-- | src/macros.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/macros.c b/src/macros.c index e81068181b9..632c851ee8c 100644 --- a/src/macros.c +++ b/src/macros.c @@ -19,7 +19,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include <config.h> -#include <setjmp.h> + #include "lisp.h" #include "macros.h" #include "commands.h" @@ -84,7 +84,7 @@ macro before appending to it. */) { ptrdiff_t i; EMACS_INT len; - int cvt; + bool cvt; /* Check the type of last-kbd-macro in case Lisp code changed it. */ CHECK_VECTOR_OR_STRING (KVAR (current_kboard, Vlast_kbd_macro)); |
