[Emacs-diffs] Changes to emacs/lisp/subr.el

[Kim F . Storm]

Index: emacs/lisp/subr.el
diff -c emacs/lisp/subr.el:1.465 emacs/lisp/subr.el:1.466
*** emacs/lisp/subr.el:1.465    Wed Jun 15 20:58:20 2005
--- emacs/lisp/subr.el  Mon Jun 20 21:41:34 2005
***************
*** 960,971 ****
  
  (defun add-to-ordered-list (list-var element &optional order)
    "Add to the value of LIST-VAR the element ELEMENT if it isn't there yet.
! The test for presence of ELEMENT is done with `equal'.
  
  The resulting list is reordered so that the elements are in the
! order given by each element's numeric list order.
! Elements without a numeric list order are placed at the end of
! the list.
  
  If the third optional argument ORDER is non-nil, set the
  element's list order to the given value.
--- 960,970 ----
  
  (defun add-to-ordered-list (list-var element &optional order)
    "Add to the value of LIST-VAR the element ELEMENT if it isn't there yet.
! The test for presence of ELEMENT is done with `eq'.
  
  The resulting list is reordered so that the elements are in the
! order given by each element's numeric list order.  Elements
! without a numeric list order are placed at the end of the list.
  
  If the third optional argument ORDER is non-nil, set the
  element's list order to the given value.
***************
*** 979,994 ****
        (put list-var 'list-order
             (setq ordering (make-hash-table :weakness 'key :test 'eq))))
      (when order
!       (puthash element order ordering))
!     (add-to-list list-var element)
      (set list-var (sort (symbol-value list-var)
                        (lambda (a b)
                          (let ((oa (gethash a ordering))
                                (ob (gethash b ordering)))
!                           (cond
!                            ((not oa) nil)
!                            ((not ob) t)
!                            (t (< oa ob)))))))))
  
  
  ;;; Load history
--- 978,993 ----
        (put list-var 'list-order
             (setq ordering (make-hash-table :weakness 'key :test 'eq))))
      (when order
!       (puthash element (and (numberp order) order) ordering))
!     (unless (memq element (symbol-value list-var))
!       (set list-var (cons element (symbol-value list-var))))
      (set list-var (sort (symbol-value list-var)
                        (lambda (a b)
                          (let ((oa (gethash a ordering))
                                (ob (gethash b ordering)))
!                           (if (and oa ob)
!                               (< oa ob)
!                             oa)))))))
  
  
  ;;; Load history