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

[Miles Bader]

Index: emacs/lisp/cus-dep.el
diff -c emacs/lisp/cus-dep.el:1.29 emacs/lisp/cus-dep.el:1.30
*** emacs/lisp/cus-dep.el:1.29  Mon Jan 13 19:21:30 2003
--- emacs/lisp/cus-dep.el       Tue Feb  4 06:05:23 2003
***************
*** 92,98 ****
                (when members
                  ;; So x and no-x builds won't differ.
                  (setq members
!                       (sort (copy-sequence members) 
                              (lambda (x y) (string< (car x) (car y)))))
                  (while members
                    (setq item (car (car members))
--- 92,98 ----
                (when members
                  ;; So x and no-x builds won't differ.
                  (setq members
!                       (sort (copy-sequence members)
                              (lambda (x y) (string< (car x) (car y)))))
                  (while members
                    (setq item (car (car members))
***************
*** 102,108 ****
                                (member where found))
                      (if found
                          (insert " ")
!                       (insert "(put '" (symbol-name symbol) 
                                " 'custom-loads '("))
                      (prin1 where (current-buffer))
                      (push where found)))
--- 102,108 ----
                                (member where found))
                      (if found
                          (insert " ")
!                       (insert "(put '" (symbol-name symbol)
                                " 'custom-loads '("))
                      (prin1 where (current-buffer))
                      (push where found)))
***************
*** 110,116 ****
                    (insert "))\n"))))))
    (insert "\
  ;;; These are for handling :version.  We need to have a minimum of
! ;;; information so `customize-changed-options' could do its job.  
  
  ;;; For groups we set `custom-version', `group-documentation' and
  ;;; `custom-tag' (which are shown in the customize buffer), so we
--- 110,116 ----
                    (insert "))\n"))))))
    (insert "\
  ;;; These are for handling :version.  We need to have a minimum of
! ;;; information so `customize-changed-options' could do its job.
  
  ;;; For groups we set `custom-version', `group-documentation' and
  ;;; `custom-tag' (which are shown in the customize buffer), so we
***************
*** 136,142 ****
      (mapatoms (lambda (symbol)
                (let ((version (get symbol 'custom-version))
                      where)
!                 (when version 
                    (setq where (get symbol 'custom-where))
                    (when where
                      (if (or (custom-variable-p symbol)
--- 136,142 ----
      (mapatoms (lambda (symbol)
                (let ((version (get symbol 'custom-version))
                      where)
!                 (when version
                    (setq where (get symbol 'custom-where))
                    (when where
                      (if (or (custom-variable-p symbol)
***************
*** 144,156 ****
                          ;; This means it's a variable or a face.
                          (progn
                            (if (assoc version version-alist)
!                               (unless 
!                                   (member where 
                                            (cdr (assoc version version-alist)))
                                  (push where (cdr (assoc version 
version-alist))))
                              (push (cons version (list where)) version-alist)))
                        ;; This is a group
!                       (insert "(custom-put-if-not '" (symbol-name symbol) 
                                " 'custom-version ")
                        (prin1 version (current-buffer))
                        (insert ")\n")
--- 144,156 ----
                          ;; This means it's a variable or a face.
                          (progn
                            (if (assoc version version-alist)
!                               (unless
!                                   (member where
                                            (cdr (assoc version version-alist)))
                                  (push where (cdr (assoc version 
version-alist))))
                              (push (cons version (list where)) version-alist)))
                        ;; This is a group
!                       (insert "(custom-put-if-not '" (symbol-name symbol)
                                " 'custom-version ")
                        (prin1 version (current-buffer))
                        (insert ")\n")
***************
*** 169,175 ****
            (if version-alist "'" ""))
      (prin1 version-alist (current-buffer))
      (insert "\n \"For internal use by custom.\")\n"))
!     
    (insert "\
  
  \(provide '" (file-name-sans-extension
--- 169,175 ----
            (if version-alist "'" ""))
      (prin1 version-alist (current-buffer))
      (insert "\n \"For internal use by custom.\")\n"))
! 
    (insert "\
  
  \(provide '" (file-name-sans-extension