diff options
| author | Richard M. Stallman <rms@gnu.org> | 1993-06-07 05:28:42 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1993-06-07 05:28:42 +0000 |
| commit | a46bcac0d8b1037d8d7268c41be600ba0cd582fe (patch) | |
| tree | 9982fa1e4e5f9e62bb302045fcdd393b7947a78b /src/intervals.h | |
| parent | 904aa46bacfae8458afbe0226ecdb9bb73096a0f (diff) | |
| download | emacs-a46bcac0d8b1037d8d7268c41be600ba0cd582fe.tar.gz | |
(INTERVAL_VISIBLE_P): Use textget.
(INTERVAL_WRITABLE_P): Use textget.
Check Vinhibit_read_only.
Diffstat (limited to 'src/intervals.h')
| -rw-r--r-- | src/intervals.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/intervals.h b/src/intervals.h index e7ebb8f5cd6..c724f31ede3 100644 --- a/src/intervals.h +++ b/src/intervals.h @@ -137,11 +137,15 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* Is this interval visible? Replace later with cache access */ #define INTERVAL_VISIBLE_P(i) \ - (! NULL_INTERVAL_P (i) && NILP (Fmemq (Qinvisible, (i)->plist))) + (! NULL_INTERVAL_P (i) && NILP (textget ((i)->plist, Qinvisible))) /* Is this interval writable? Replace later with cache access */ #define INTERVAL_WRITABLE_P(i) \ - (! NULL_INTERVAL_P (i) && NILP (Fmemq (Qread_only, (i)->plist))) + (! NULL_INTERVAL_P (i) && NILP (textget ((i)->plist, Qread_only)) \ + && (NILP (Vinhibit_read_only) \ + || (CONSP (Vinhibit_read_only) \ + && !NILP (Fmemq (textget ((i)->plist, Qread_only), \ + Vinhibit_read_only))))) /* Macros to tell whether insertions before or after this interval should stick to it. */ |