(savehist-load): Revert to checking XEmacs.

1 files changed, 3 insertions, 1 deletions

diff --git a/lisp/savehist.el b/lisp/savehist.el
index 75a2e61e320..de0f1504ff8 100644
--- a/lisp/savehist.el
+++ b/lisp/savehist.el
@@ -173,7 +173,7 @@ other time."
     ;; executes in under 5 ms on my system.
     (unless savehist-timer
       (setq savehist-timer
-            (if (fboundp 'start-itimer)
+            (if (featurep 'xemacs)
                 (start-itimer
                  "savehist" 'savehist-autosave savehist-autosave-interval
                  savehist-autosave-interval)
@@ -234,8 +234,10 @@ If AUTO-SAVE is non-nil, compare the saved contents to the one last saved,
   (cond
    ((listp value)
     (when (and savehist-length (> (length value) savehist-length))
+      ;; This should be: (setq value (subseq value 0 savehist-length))
       (setq value (copy-sequence value))
       (setcdr (nthcdr savehist-length value) nil))
+    ;; And this should be (remove-if-not #'savehist-printable value)
     (delq nil (mapcar (lambda (x) (if (savehist-printable x) x)) value)))
    ((savehist-printable value) value)
    (t nil)))