diff options
| author | Boris Goldowsky | 1995-03-06 15:43:56 +0000 |
|---|---|---|
| committer | Boris Goldowsky | 1995-03-06 15:43:56 +0000 |
| commit | 70743ff1170222cecf36bb5533853ace0526635e (patch) | |
| tree | ca7123e65da6fb330585323b7d51d655df68c53f /src | |
| parent | 883b5fa1751703a3724b92d0ea609ce66b0e8023 (diff) | |
| download | emacs-70743ff1170222cecf36bb5533853ace0526635e.tar.gz emacs-70743ff1170222cecf36bb5533853ace0526635e.zip | |
(textget): Check default_properties vbl too.
Diffstat (limited to 'src')
| -rw-r--r-- | src/intervals.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/intervals.c b/src/intervals.c index 6e88be19cc7..d444cc11a59 100644 --- a/src/intervals.c +++ b/src/intervals.c | |||
| @@ -1543,7 +1543,8 @@ graft_intervals_into_buffer (source, position, length, buffer, inherit) | |||
| 1543 | 1543 | ||
| 1544 | /* Get the value of property PROP from PLIST, | 1544 | /* Get the value of property PROP from PLIST, |
| 1545 | which is the plist of an interval. | 1545 | which is the plist of an interval. |
| 1546 | We check for direct properties and for categories with property PROP. */ | 1546 | We check for direct properties, for categories with property PROP, |
| 1547 | and for PROP appearing on the default-properties list. */ | ||
| 1547 | 1548 | ||
| 1548 | Lisp_Object | 1549 | Lisp_Object |
| 1549 | textget (plist, prop) | 1550 | textget (plist, prop) |
| @@ -1567,7 +1568,11 @@ textget (plist, prop) | |||
| 1567 | } | 1568 | } |
| 1568 | } | 1569 | } |
| 1569 | 1570 | ||
| 1570 | return fallback; | 1571 | if (! NILP (fallback)) |
| 1572 | return fallback; | ||
| 1573 | if (CONSP (Vdefault_properties)) | ||
| 1574 | return textget_direct (Vdefault_properties, prop); | ||
| 1575 | return Qnil; | ||
| 1571 | } | 1576 | } |
| 1572 | 1577 | ||
| 1573 | /* Get the value of property PROP from PLIST, | 1578 | /* Get the value of property PROP from PLIST, |