[Emacs-diffs] Changes to emacs/src/fns.c

[Kim F . Storm]

Index: emacs/src/fns.c
diff -c emacs/src/fns.c:1.387 emacs/src/fns.c:1.388
*** emacs/src/fns.c:1.387       Wed Apr 20 07:50:43 2005
--- emacs/src/fns.c     Thu Apr 21 23:44:59 2005
***************
*** 186,193 ****
    return val;
  }
  
! /* This does not check for quits.  That is safe
!    since it must terminate.  */
  
  DEFUN ("safe-length", Fsafe_length, Ssafe_length, 1, 1, 0,
         doc: /* Return the length of a list, but avoid error or infinite loop.
--- 186,192 ----
    return val;
  }
  
! /* This does not check for quits.  That is safe since it must terminate.  */
  
  DEFUN ("safe-length", Fsafe_length, Ssafe_length, 1, 1, 0,
         doc: /* Return the length of a list, but avoid error or infinite loop.
***************
*** 1981,1986 ****
--- 1980,1986 ----
  }
  
  
+ #if 0 /* Unsafe version.  */
  DEFUN ("plist-get", Fplist_get, Splist_get, 2, 2, 0,
         doc: /* Extract a value from a property list.
  PLIST is a property list, which is a list of the form
***************
*** 2011,2024 ****
  
    return Qnil;
  }
  
! DEFUN ("safe-plist-get", Fsafe_plist_get, Ssafe_plist_get, 2, 2, 0,
         doc: /* Extract a value from a property list.
  PLIST is a property list, which is a list of the form
  \(PROP1 VALUE1 PROP2 VALUE2...).  This function returns the value
! corresponding to the given PROP, or nil if PROP is not
! one of the properties on the list.
! This function never signals an error.  */)
       (plist, prop)
       Lisp_Object plist;
       Lisp_Object prop;
--- 2011,2026 ----
  
    return Qnil;
  }
+ #endif
+ 
+ /* This does not check for quits.  That is safe since it must terminate.  */
  
! DEFUN ("plist-get", Fplist_get, Splist_get, 2, 2, 0,
         doc: /* Extract a value from a property list.
  PLIST is a property list, which is a list of the form
  \(PROP1 VALUE1 PROP2 VALUE2...).  This function returns the value
! corresponding to the given PROP, or nil if PROP is not one of the
! properties on the list.  This function never signals an error.  */)
       (plist, prop)
       Lisp_Object plist;
       Lisp_Object prop;
***************
*** 2051,2068 ****
    return Fplist_get (XSYMBOL (symbol)->plist, propname);
  }
  
- DEFUN ("safe-get", Fsafe_get, Ssafe_get, 2, 2, 0,
-        doc: /* Return the value of SYMBOL's PROPNAME property.
- This is the last value stored with `(put SYMBOL PROPNAME VALUE)'.
- This function never signals an error.  */)
-      (symbol, propname)
-      Lisp_Object symbol, propname;
- {
-   if (!SYMBOLP (symbol))
-     return Qnil;
-   return Fsafe_plist_get (XSYMBOL (symbol)->plist, propname);
- }
- 
  DEFUN ("plist-put", Fplist_put, Splist_put, 3, 3, 0,
         doc: /* Change value in PLIST of PROP to VAL.
  PLIST is a property list, which is a list of the form
--- 2053,2058 ----
***************
*** 5811,5819 ****
    defsubr (&Sreverse);
    defsubr (&Ssort);
    defsubr (&Splist_get);
-   defsubr (&Ssafe_plist_get);
    defsubr (&Sget);
-   defsubr (&Ssafe_get);
    defsubr (&Splist_put);
    defsubr (&Sput);
    defsubr (&Slax_plist_get);
--- 5801,5807 ----