[slime-cvs] CVS slime

[heller]

Update of /project/slime/cvsroot/slime
In directory clnet:/tmp/cvs-serv21212

Modified Files:
	slime.el 
Log Message:
(slime-repl-merge-histories): Use (setf (gethash ...)
instead of puthash, for Emacs 20.


--- /project/slime/cvsroot/slime/slime.el	2007/01/06 12:59:09	1.735
+++ /project/slime/cvsroot/slime/slime.el	2007/01/09 20:19:56	1.736
@@ -4189,15 +4189,12 @@
   "Merge entries from OLD-HIST and NEW-HIST."
   ;; Newer items in each list are at the beginning.
   (let* ((ht (make-hash-table :test #'equal))
-         (delete-tester #'(lambda (entry)
-                            (if (gethash entry ht)
-                                t
-                                (progn
-                                  (puthash entry t ht)
-                                  nil)))))
-    (append
-     (remove-if delete-tester new-hist)
-     (remove-if delete-tester old-hist))))
+         (test (lambda (entry)
+                 (or (gethash entry ht)
+                     (progn (setf (gethash entry ht) t)
+                            nil)))))
+    (append (remove-if test new-hist)
+            (remove-if test old-hist))))
 
 (defun slime-repl-load-history (&optional filename)
   "Set the current SLIME REPL history.