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

[Eli Zaretskii]

Index: emacs/lisp/cus-edit.el
diff -c emacs/lisp/cus-edit.el:1.229 emacs/lisp/cus-edit.el:1.230
*** emacs/lisp/cus-edit.el:1.229        Sat Aug  6 22:13:42 2005
--- emacs/lisp/cus-edit.el      Fri Aug 12 11:17:57 2005
***************
*** 141,147 ****
  (require 'cus-face)
  (require 'wid-edit)
  (eval-when-compile
!   (defvar custom-versions-load-alist))        ; from cus-load
  
  (condition-case nil
      (require 'cus-load)
--- 141,148 ----
  (require 'cus-face)
  (require 'wid-edit)
  (eval-when-compile
!   (defvar custom-versions-load-alist) ; from cus-load
!   (defvar recentf-exclude))           ; from recentf.el
  
  (condition-case nil
      (require 'cus-load)
***************
*** 3901,3907 ****
    "Visit `custom-file' and delete all calls to SYMBOL from it.
  Leave point at the old location of the first such call,
  or (if there were none) at the end of the buffer."
!   (let ((default-major-mode 'emacs-lisp-mode))
      (set-buffer (find-file-noselect (custom-file))))
    (goto-char (point-min))
    ;; Skip all whitespace and comments.
--- 3902,3913 ----
    "Visit `custom-file' and delete all calls to SYMBOL from it.
  Leave point at the old location of the first such call,
  or (if there were none) at the end of the buffer."
!   (let ((default-major-mode 'emacs-lisp-mode)
!       (recentf-exclude (if recentf-mode
!                            (cons (concat "\\`"
!                                          (regexp-quote (custom-file))
!                                          "\\'")
!                                  recentf-exclude))))
      (set-buffer (find-file-noselect (custom-file))))
    (goto-char (point-min))
    ;; Skip all whitespace and comments.
***************
*** 4130,4136 ****
      (custom-save-variables)
      (custom-save-faces)
      (save-excursion
!       (let ((default-major-mode nil))
        (set-buffer (find-file-noselect (custom-file))))
        (let ((file-precious-flag t))
        (save-buffer)))))
--- 4136,4147 ----
      (custom-save-variables)
      (custom-save-faces)
      (save-excursion
!       (let ((default-major-mode nil)
!           (recentf-exclude (if recentf-mode
!                                (cons (concat "\\`"
!                                              (regexp-quote (custom-file))
!                                              "\\'")
!                                      recentf-exclude))))
        (set-buffer (find-file-noselect (custom-file))))
        (let ((file-precious-flag t))
        (save-buffer)))))