diff options
| author | Paul Eggert | 2011-04-15 00:48:51 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-15 00:48:51 -0700 |
| commit | 4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9 (patch) | |
| tree | e993b231bb5555c9c961f5d0b20d90ac76f77bbd /src/callint.c | |
| parent | 1963a2e0bb07cc8dee6d27f972f93d9cfd7c6b2d (diff) | |
| parent | 49093f601b69d91126aefd328ee8f6bfeb797407 (diff) | |
| download | emacs-4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9.tar.gz emacs-4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9.zip | |
Merge from mainline.
Diffstat (limited to 'src/callint.c')
| -rw-r--r-- | src/callint.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/callint.c b/src/callint.c index 047fbcdb467..e5ec3d7d931 100644 --- a/src/callint.c +++ b/src/callint.c | |||
| @@ -30,14 +30,15 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 30 | 30 | ||
| 31 | Lisp_Object Qminus, Qplus; | 31 | Lisp_Object Qminus, Qplus; |
| 32 | Lisp_Object Qcall_interactively; | 32 | Lisp_Object Qcall_interactively; |
| 33 | Lisp_Object Qcommand_debug_status; | 33 | static Lisp_Object Qcommand_debug_status; |
| 34 | Lisp_Object Qenable_recursive_minibuffers; | 34 | static Lisp_Object Qenable_recursive_minibuffers; |
| 35 | 35 | ||
| 36 | Lisp_Object Qhandle_shift_selection; | 36 | static Lisp_Object Qhandle_shift_selection; |
| 37 | 37 | ||
| 38 | Lisp_Object Qmouse_leave_buffer_hook; | 38 | Lisp_Object Qmouse_leave_buffer_hook; |
| 39 | 39 | ||
| 40 | Lisp_Object Qlist, Qlet, Qletx, Qsave_excursion, Qprogn, Qif, Qwhen; | 40 | static Lisp_Object Qlist, Qlet, Qletx, Qsave_excursion, Qprogn, Qif; |
| 41 | Lisp_Object Qwhen; | ||
| 41 | static Lisp_Object preserved_fns; | 42 | static Lisp_Object preserved_fns; |
| 42 | 43 | ||
| 43 | /* Marker used within call-interactively to refer to point. */ | 44 | /* Marker used within call-interactively to refer to point. */ |