shr.el (shr-expand-newlines, shr-previous-newline-padding-width): Use plist-get inste...

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1e7b83b..dd00120 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/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/shr.el b/lisp/shr.el
index 4568f45..f3c75cc 100644 (file)
--- a/lisp/shr.el
+++ b/lisp/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)