Mercurial > emacs
diff lisp/cus-edit.el @ 90224:2d92f5c9d6ae
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-78
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 514-518)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 104-105)
- Update from CVS
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Fri, 26 Aug 2005 09:51:52 +0000 |
| parents | 187d6a1f84f7 94a635fcc582 |
| children | a3716f7538f2 |
line wrap: on
line diff
--- a/lisp/cus-edit.el Fri Aug 05 10:57:36 2005 +0000 +++ b/lisp/cus-edit.el Fri Aug 26 09:51:52 2005 +0000 @@ -1,7 +1,7 @@ ;;; cus-edit.el --- tools for customizing Emacs and Lisp packages ;; -;; Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; ;; Author: Per Abrahamsen <abraham@dina.kvl.dk> ;; Maintainer: FSF @@ -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 @@ "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 @@ (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)))))