diff options
| author | Glenn Morris | 2014-11-09 23:39:35 -0800 |
|---|---|---|
| committer | Glenn Morris | 2014-11-09 23:39:35 -0800 |
| commit | c832df2ec2f6528bc35f69f9fd9a4b2e470d2ebe (patch) | |
| tree | 98a77f1acdac589d1be95dea128af1af7e8dc286 /src/nsterm.h | |
| parent | eca1ea96559e04e18a62a61208d501c557dd4cab (diff) | |
| parent | edfdb22f674312389ccf5d5e37efa4d3f1516994 (diff) | |
| download | emacs-c832df2ec2f6528bc35f69f9fd9a4b2e470d2ebe.tar.gz emacs-c832df2ec2f6528bc35f69f9fd9a4b2e470d2ebe.zip | |
Merge from emacs-24; up to 117698
Diffstat (limited to 'src/nsterm.h')
| -rw-r--r-- | src/nsterm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nsterm.h b/src/nsterm.h index 7997072dcac..b33e6b2ee08 100644 --- a/src/nsterm.h +++ b/src/nsterm.h | |||
| @@ -396,7 +396,7 @@ typedef float EmacsCGFloat; | |||
| 396 | - repeatScroll: (NSTimer *)sender; | 396 | - repeatScroll: (NSTimer *)sender; |
| 397 | - condemn; | 397 | - condemn; |
| 398 | - reprieve; | 398 | - reprieve; |
| 399 | - judge; | 399 | - (bool)judge; |
| 400 | @end | 400 | @end |
| 401 | 401 | ||
| 402 | 402 | ||