From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 23 Feb 2007 19:13:40 +0000 (+0000)
Subject: (custom-save-all): Canonicalize custom-file before storing it in
X-Git-Tag: emacs-pretest-22.0.95~150
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c34a8a87401584b5501580890def8a2133973951;p=emacs.git

(custom-save-all): Canonicalize custom-file before storing it in
recentf-exclude.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 47494b59ef9..33a52985550 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-23  David Reitter <david.reitter@gmail.com>
+
+	* cus-edit.el (custom-save-all): Canonicalize custom-file before
+	storing it in recentf-exclude.
+
 2007-02-23  Chong Yidong  <cyd@stupidchicken.com>
 
 	* startup.el (fancy-splash-screens): Make cursor-type buffer-local
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index ce429a40823..c49328ac40d 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -4192,11 +4192,13 @@ if only the first line of the docstring is shown."))
   (when (and (null custom-file) init-file-had-error)
     (error "Cannot save customizations; init file was not fully loaded"))
   (let* ((filename (custom-file))
-	 (recentf-exclude (if recentf-mode
-			      (cons (concat "\\`"
-					    (regexp-quote (custom-file))
-					    "\\'")
-				    recentf-exclude)))
+	 (recentf-exclude
+	  (if recentf-mode
+	      (cons (concat "\\`"
+			    (regexp-quote
+			     (recentf-expand-file-name (custom-file)))
+			    "\\'")
+		    recentf-exclude)))
 	 (old-buffer (find-buffer-visiting filename)))
     (with-current-buffer (let ((find-file-visit-truename t))
 			   (or old-buffer (find-file-noselect filename)))