Use eldoc-documentation-functions

[gnu-emacs] / src / intervals.h

diff --git a/src/intervals.h b/src/intervals.h
index b8cdcfdc0f5e9dbd7ae4aecf1c3d29a8a2fed8e2..9a38d849b88bd7be00df503c3f6a35164113eb41 100644 (file)
--- a/src/intervals.h
+++ b/src/intervals.h
@@ -197,12 +197,12 @@ 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))              \
-             : !NILP (Vinhibit_read_only)))))                  \
+  (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))                    \
+       : !NILP (Vinhibit_read_only))))
 
 /* Macros to tell whether insertions before or after this interval
    should stick to it.  Now we have Vtext_property_default_nonsticky,
@@ -285,7 +285,7 @@ extern void set_text_properties_1 (Lisp_Object, Lisp_Object,
 Lisp_Object text_property_list (Lisp_Object, Lisp_Object, Lisp_Object,
                                 Lisp_Object);
 void add_text_properties_from_list (Lisp_Object, Lisp_Object, Lisp_Object);
-Lisp_Object extend_property_ranges (Lisp_Object, Lisp_Object);
+Lisp_Object extend_property_ranges (Lisp_Object, Lisp_Object, Lisp_Object);
 Lisp_Object get_char_property_and_overlay (Lisp_Object, Lisp_Object,
                                            Lisp_Object, Lisp_Object*);
 extern int text_property_stickiness (Lisp_Object prop, Lisp_Object pos,