(Foverlay_get): Handle `category' property on overlay.

1 files changed, 11 insertions, 2 deletions

diff --git a/src/buffer.c b/src/buffer.c
index 929d7ce47c4..0e0ca213907 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -2159,19 +2159,28 @@ DEFUN ("overlay-get", Foverlay_get, Soverlay_get, 2, 2, 0,
   (overlay, prop)
      Lisp_Object overlay, prop;
 {
-  Lisp_Object plist;
+  Lisp_Object plist, fallback;
 
   CHECK_OVERLAY (overlay, 0);
 
+  fallback = Qnil;
+
   for (plist = Fcdr_safe (XCONS (overlay)->cdr);
        CONSP (plist) && CONSP (XCONS (plist)->cdr);
        plist = XCONS (XCONS (plist)->cdr)->cdr)
     {
       if (EQ (XCONS (plist)->car, prop))
         return XCONS (XCONS (plist)->cdr)->car;
+      else if (EQ (XCONS (plist)->car, Qcategory))
+        {
+          Lisp_Object tem;
+          tem = Fcar (Fcdr (plist));
+          if (SYMBOLP (tem))
+            fallback = Fget (tem, prop);
+        }
     }
 
-  return Qnil;
+  return fallback;
 }
 
 DEFUN ("overlay-put", Foverlay_put, Soverlay_put, 3, 3, 0,