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

[Richard M . Stallman]

Index: emacs/lisp/cus-edit.el
diff -c emacs/lisp/cus-edit.el:1.220 emacs/lisp/cus-edit.el:1.221
*** emacs/lisp/cus-edit.el:1.220        Mon Apr 11 19:24:59 2005
--- emacs/lisp/cus-edit.el      Tue May 10 09:09:58 2005
***************
*** 3835,3854 ****
  
  (defun custom-file ()
    "Return the file name for saving customizations."
!   (or custom-file
!       (let ((user-init-file user-init-file)
!           (default-init-file
!             (if (eq system-type 'ms-dos) "~/_emacs" "~/.emacs")))
!       (when (null user-init-file)
!         (if (or (file-exists-p default-init-file)
!                 (and (eq system-type 'windows-nt)
!                      (file-exists-p "~/_emacs")))
!             ;; Started with -q, i.e. the file containing
!             ;; Custom settings hasn't been read.  Saving
!             ;; settings there would overwrite other settings.
!             (error "Saving settings from \"emacs -q\" would overwrite 
existing customizations"))
!         (setq user-init-file default-init-file))
!       user-init-file)))
  
  (defun custom-save-delete (symbol)
    "Visit `custom-file' and delete all calls to SYMBOL from it.
--- 3835,3855 ----
  
  (defun custom-file ()
    "Return the file name for saving customizations."
!   (file-chase-links
!    (or custom-file
!        (let ((user-init-file user-init-file)
!            (default-init-file
!              (if (eq system-type 'ms-dos) "~/_emacs" "~/.emacs")))
!        (when (null user-init-file)
!          (if (or (file-exists-p default-init-file)
!                  (and (eq system-type 'windows-nt)
!                       (file-exists-p "~/_emacs")))
!              ;; Started with -q, i.e. the file containing
!              ;; Custom settings hasn't been read.  Saving
!              ;; settings there would overwrite other settings.
!              (error "Saving settings from \"emacs -q\" would overwrite 
existing customizations"))
!          (setq user-init-file default-init-file))
!        user-init-file))))
  
  (defun custom-save-delete (symbol)
    "Visit `custom-file' and delete all calls to SYMBOL from it.