diff options
| author | Tom Tromey | 2013-03-17 05:17:24 -0600 |
|---|---|---|
| committer | Tom Tromey | 2013-03-17 05:17:24 -0600 |
| commit | 6bd488cd8d05aa3983ca55f70ee384732d8c0085 (patch) | |
| tree | 5645fc7b882638d6c0eb3f61fd55bde1a63fc190 /src/thread.h | |
| parent | 71f91792e3013b397996905224f387da5cc539a9 (diff) | |
| parent | 9c44569ea2a18099307e0571d523d8637000a153 (diff) | |
| download | emacs-6bd488cd8d05aa3983ca55f70ee384732d8c0085.tar.gz emacs-6bd488cd8d05aa3983ca55f70ee384732d8c0085.zip | |
merge from trunk
Diffstat (limited to 'src/thread.h')
| -rw-r--r-- | src/thread.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/thread.h b/src/thread.h index 989acec6afb..97bdb2c805c 100644 --- a/src/thread.h +++ b/src/thread.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* Thread definitions | 1 | /* Thread definitions |
| 2 | Copyright (C) 2012 Free Software Foundation, Inc. | 2 | Copyright (C) 2012, 2013 Free Software Foundation, Inc. |
| 3 | 3 | ||
| 4 | This file is part of GNU Emacs. | 4 | This file is part of GNU Emacs. |
| 5 | 5 | ||
| @@ -138,7 +138,7 @@ struct thread_state | |||
| 138 | 138 | ||
| 139 | /* If non-zero the match data have been saved in saved_search_regs | 139 | /* If non-zero the match data have been saved in saved_search_regs |
| 140 | during the execution of a sentinel or filter. */ | 140 | during the execution of a sentinel or filter. */ |
| 141 | int m_search_regs_saved; | 141 | bool m_search_regs_saved; |
| 142 | #define search_regs_saved (current_thread->m_search_regs_saved) | 142 | #define search_regs_saved (current_thread->m_search_regs_saved) |
| 143 | 143 | ||
| 144 | struct re_registers m_saved_search_regs; | 144 | struct re_registers m_saved_search_regs; |