Merge from origin/emacs-24

[gnu-emacs] / src / intervals.h

diff --git a/src/intervals.h b/src/intervals.h
index 4e7a177140eb14b7f1e7d3352c68ae1fed34efc0..bd1f49dc383ea7d5f1ccde49a143003298930dac 100644 (file)
--- a/src/intervals.h
+++ b/src/intervals.h
@@ -197,6 +197,7 @@ set_interval_plist (INTERVAL i, Lisp_Object plist)
 /* Is this interval writable?  Replace later with cache access.  */
 #define INTERVAL_WRITABLE_P(i)                                 \
   (i && (NILP (textget ((i)->plist, Qread_only))               \
+         || !NILP (textget ((i)->plist, Qinhibit_read_only))   \
         || ((CONSP (Vinhibit_read_only)                        \
              ? !NILP (Fmemq (textget ((i)->plist, Qread_only), \
                              Vinhibit_read_only))              \