From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 12 Aug 2005 11:18:43 +0000 (+0000)
Subject: (custom-save-all, custom-save-delete): Bind recentf-exclude to exclude
X-Git-Tag: emacs-pretest-22.0.90~7617
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5cabd50e116e31dce2db5900fa47f39bf6a7cfb4;p=emacs.git

(custom-save-all, custom-save-delete): Bind recentf-exclude to exclude
custom-file.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 205c0ef298d..9e28fc16bb6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-12  Eli Zaretskii  <eliz@gnu.org>
+
+	* cus-edit.el (custom-save-all, custom-save-delete): Bind
+	recentf-exclude to exclude custom-file.
+
 2005-08-12  Ehud Karni  <ehud@unix.mvs.co.il>
 
 	* mail/rmailsum.el (rmail-summary-end-of-message): New command
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 832e320c523..c0e54b4add3 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -141,7 +141,8 @@
 (require 'cus-face)
 (require 'wid-edit)
 (eval-when-compile
-  (defvar custom-versions-load-alist))	; from cus-load
+  (defvar custom-versions-load-alist)	; from cus-load
+  (defvar recentf-exclude))		; from recentf.el
 
 (condition-case nil
     (require 'cus-load)
@@ -3901,7 +3902,12 @@ if only the first line of the docstring is shown."))
   "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))
+  (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,7 +4136,12 @@ or (if there were none) at the end of the buffer."
     (custom-save-variables)
     (custom-save-faces)
     (save-excursion
-      (let ((default-major-mode nil))
+      (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)))))