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

recentf-exclude.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 47494b59ef9afb068b3cc63620d593e53bd97a2b..33a52985550af72a0e4bce1a8f6cb3475f32f2fb 100644 (file)
--- 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 ce429a40823a7c30b889f95cc93cce30f5cd6c42..c49328ac40d463cae443d34529deacd092fae83e 100644 (file)
--- 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)))