2 files changed, 10 insertions, 3 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 1e3a1b670c9..5a915bb5aed 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-27  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * shr.el (shr-expand-newlines, shr-previous-newline-padding-width):
+        Use plist-get instead of the cl function getf.
+
 2011-01-27  Glenn Morris  <rgm@gnu.org>
 
         * gnus-util.el (float-time): Get rid of compiler warning, again.
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index 4568f45dbb5..f3c75ccd6a3 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -649,8 +649,9 @@ ones, in case fg and bg are nil."
                          (concat
                           (mapconcat
                            (lambda (overlay)
-                             (let ((string (getf (overlay-properties overlay)
-                                                 'before-string)))
+                             (let ((string (plist-get
+                                            (overlay-properties overlay)
+                                            'before-string)))
                                (if (not string)
                                    ""
                                  (overlay-put overlay 'before-string "")
@@ -669,7 +670,8 @@ ones, in case fg and bg are nil."
       (dolist (overlay overlays)
         (setq previous-width
               (+ previous-width
-                 (length (getf (overlay-properties overlay) 'before-string)))))
+                 (length (plist-get (overlay-properties overlay)
+                                    'before-string)))))
       (+ width previous-width))))
 
 (defun shr-put-color-1 (start end type color)