diff options
| author | Joakim Verona | 2015-01-11 18:40:21 +0100 |
|---|---|---|
| committer | Joakim Verona | 2015-01-11 18:40:21 +0100 |
| commit | cc7cb20d6abc0f862e5513b24831bba0eaecaa5f (patch) | |
| tree | afc2fc05401504aa0c28699dc3bc155c5b0d7f58 /src/intervals.h | |
| parent | d972b504f30ff4300ba368940751e8736dddf0b4 (diff) | |
| parent | 9a57bda31569294ecaf8138a06e5edda9c0d87e3 (diff) | |
| download | emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.tar.gz emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.zip | |
merge master, fix conflicts
Diffstat (limited to 'src/intervals.h')
| -rw-r--r-- | src/intervals.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/intervals.h b/src/intervals.h index 8f0f3482ea5..b2260d002e6 100644 --- a/src/intervals.h +++ b/src/intervals.h | |||
| @@ -271,21 +271,7 @@ extern INTERVAL interval_of (ptrdiff_t, Lisp_Object); | |||
| 271 | /* Defined in xdisp.c. */ | 271 | /* Defined in xdisp.c. */ |
| 272 | extern int invisible_p (Lisp_Object, Lisp_Object); | 272 | extern int invisible_p (Lisp_Object, Lisp_Object); |
| 273 | 273 | ||
| 274 | /* Declared in textprop.c. */ | 274 | /* Defined in textprop.c. */ |
| 275 | |||
| 276 | /* Types of hooks. */ | ||
| 277 | extern Lisp_Object Qpoint_left; | ||
| 278 | extern Lisp_Object Qpoint_entered; | ||
| 279 | extern Lisp_Object Qmodification_hooks; | ||
| 280 | extern Lisp_Object Qcategory; | ||
| 281 | extern Lisp_Object Qlocal_map; | ||
| 282 | |||
| 283 | /* Visual properties text (including strings) may have. */ | ||
| 284 | extern Lisp_Object Qinvisible, Qintangible; | ||
| 285 | |||
| 286 | /* Sticky properties. */ | ||
| 287 | extern Lisp_Object Qfront_sticky, Qrear_nonsticky; | ||
| 288 | |||
| 289 | extern Lisp_Object copy_text_properties (Lisp_Object, Lisp_Object, | 275 | extern Lisp_Object copy_text_properties (Lisp_Object, Lisp_Object, |
| 290 | Lisp_Object, Lisp_Object, | 276 | Lisp_Object, Lisp_Object, |
| 291 | Lisp_Object, Lisp_Object); | 277 | Lisp_Object, Lisp_Object); |