From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Richard Stallman Newsgroups: gmane.emacs.devel Subject: Re: Customize buttons that change user's customfileshouldaskforconfirmation Date: Wed, 09 Feb 2005 03:11:07 -0500 Message-ID: References: <004a01c50ce6$4a5ce320$0200a8c0@sedrcw11488> Reply-To: rms@gnu.org NNTP-Posting-Host: main.gmane.org X-Trace: sea.gmane.org 1107940140 5951 80.91.229.2 (9 Feb 2005 09:09:00 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Wed, 9 Feb 2005 09:09:00 +0000 (UTC) Cc: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Feb 09 10:08:59 2005 Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1CynpK-0004Sk-1M for ged-emacs-devel@m.gmane.org; Wed, 09 Feb 2005 10:08:02 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Cyo3o-0007uK-02 for ged-emacs-devel@m.gmane.org; Wed, 09 Feb 2005 04:23:00 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1CynhQ-0003sl-8z for emacs-devel@gnu.org; Wed, 09 Feb 2005 03:59:52 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1CynhO-0003sR-QP for emacs-devel@gnu.org; Wed, 09 Feb 2005 03:59:51 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1CynbN-0002rA-1J for emacs-devel@gnu.org; Wed, 09 Feb 2005 03:53:37 -0500 Original-Received: from [199.232.76.164] (helo=fencepost.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.34) id 1Cymzi-0007pa-RJ for emacs-devel@gnu.org; Wed, 09 Feb 2005 03:14:42 -0500 Original-Received: from rms by fencepost.gnu.org with local (Exim 4.34) id 1CymwF-0005Vj-PF; Wed, 09 Feb 2005 03:11:08 -0500 Original-To: bob@rattlesnake.com In-reply-to: (bob@rattlesnake.com) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org X-MailScanner-To: ged-emacs-devel@m.gmane.org Xref: main.gmane.org gmane.emacs.devel:33120 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:33120 Do these changes fix the two problems? *** cus-edit.el 30 Jan 2005 06:05:44 -0500 1.209 --- cus-edit.el 09 Feb 2005 02:59:47 -0500 *************** *************** *** 1299,1305 **** (widget-create 'push-button :tag "Save for Future Sessions" :help-echo "\ ! Make your editing in this buffer take effect for future Emacs sessions." :action (lambda (widget &optional event) (Custom-save))) (if custom-reset-button-menu --- 1396,1403 ---- (widget-create 'push-button :tag "Save for Future Sessions" :help-echo "\ ! Make your editing in this buffer take effect for future Emacs sessions. ! This updates your Emacs initialization file or creates a new one one." :action (lambda (widget &optional event) (Custom-save))) (if custom-reset-button-menu *************** *** 3720,3738 **** (defun custom-file () "Return the file name for saving customizations." (or custom-file ! (let ((user-init-file user-init-file) ! (default-init-file ! (if (eq system-type 'ms-dos) "~/_emacs" "~/.emacs"))) ! (when (null user-init-file) ! (if (or (file-exists-p default-init-file) ! (and (eq system-type 'windows-nt) ! (file-exists-p "~/_emacs"))) ! ;; Started with -q, i.e. the file containing ! ;; Custom settings hasn't been read. Saving ! ;; settings there would overwrite other settings. ! (error "Saving settings from \"emacs -q\" would overwrite existing customizations")) ! (setq user-init-file default-init-file)) ! user-init-file))) (defun custom-save-delete (symbol) "Visit `custom-file' and delete all calls to SYMBOL from it. --- 3801,3811 ---- (defun custom-file () "Return the file name for saving customizations." (or custom-file ! user-init-file ! ;; Started with -q, i.e. the file containing ! ;; Custom settings hasn't been read. Saving ! ;; settings there would overwrite other settings. ! (error "Saving settings is not allowed in \"emacs -q\""))) (defun custom-save-delete (symbol) "Visit `custom-file' and delete all calls to SYMBOL from it.