From mboxrd@z Thu Jan 1 00:00:00 1970 Path: quimby.gnus.org!not-for-mail From: Per Abrahamsen Newsgroups: gmane.emacs.devel Subject: Re: [PATCH] Re: Save Options vs. default-input-method Date: Tue, 12 Feb 2002 10:56:04 +0100 Organization: The Church of Emacs Message-ID: References: <200201302237.g0UMb1d24844@aztec.santafe.edu> <200202040927.g149RUF02434@aztec.santafe.edu> <200202051248.g15CmDb02207@aztec.santafe.edu> <200202071457.g17EvBK04629@aztec.santafe.edu> <200202100517.g1A5Hoe06105@aztec.santafe.edu> <200202110209.g1B29mh06648@aztec.santafe.edu> NNTP-Posting-Host: quimby2.netfonds.no Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: quimby2.netfonds.no 1013508510 29842 195.204.10.66 (12 Feb 2002 10:08:30 GMT) X-Complaints-To: usenet@quimby2.netfonds.no NNTP-Posting-Date: 12 Feb 2002 10:08:30 GMT Original-Received: from fencepost.gnu.org ([199.232.76.164]) by quimby2.netfonds.no with esmtp (Exim 3.12 #1 (Debian)) id 16aZrR-0007lE-00 for ; Tue, 12 Feb 2002 11:08:29 +0100 Original-Received: from localhost ([127.0.0.1] helo=fencepost.gnu.org) by fencepost.gnu.org with esmtp (Exim 3.33 #1 (Debian)) id 16aZgq-0002to-00; Tue, 12 Feb 2002 04:57:32 -0500 Original-Received: from sheridan.dina.kvl.dk ([130.225.40.227]) by fencepost.gnu.org with esmtp (Exim 3.33 #1 (Debian)) id 16aZfV-0002qT-00 for ; Tue, 12 Feb 2002 04:56:09 -0500 Original-Received: from ssv2.dina.kvl.dk (ssv2.dina.kvl.dk [130.225.40.226]) by sheridan.dina.kvl.dk (8.9.3/8.9.3/Debian 8.9.3-21) with ESMTP id KAA07956; Tue, 12 Feb 2002 10:56:04 +0100 Original-Received: from abraham by ssv2.dina.kvl.dk with local (Exim 3.12 #1 (Debian)) id 16aZfQ-0004no-00; Tue, 12 Feb 2002 10:56:04 +0100 Original-To: emacs-devel@gnu.org X-Face: +kRV2]2q}lixHkE{U)mY#+6]{AH=yN~S9@IFiOa@X6?GM|8MBp/ In-Reply-To: (Per Abrahamsen's message of "Mon, 11 Feb 2002 18:15:15 +0100") Original-Lines: 133 User-Agent: Gnus/5.090006 (Oort Gnus v0.06) Emacs/21.1 (i686-pc-linux-gnu) Errors-To: emacs-devel-admin@gnu.org X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.0.5 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Emacs development discussions. List-Unsubscribe: , List-Archive: Xref: quimby.gnus.org gmane.emacs.devel:1025 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:1025 Per Abrahamsen writes: > Ok, I commited a patch below. It makes all the non-mule options use > customize-set-variable or equivalent, and makes 'Save options' only > save those options modified by customize-set-variable or equivalent. I fixed the MULE options as well. Now none of the options get saved, unless you have changed them interactively. Index: lisp/ChangeLog =================================================================== RCS file: /cvsroot/emacs//emacs/lisp/ChangeLog,v retrieving revision 1.3436 diff -c -r1.3436 ChangeLog *** lisp/ChangeLog 12 Feb 2002 04:50:04 -0000 1.3436 --- lisp/ChangeLog 12 Feb 2002 09:45:23 -0000 *************** *** 1,3 **** --- 1,16 ---- + 2002-02-12 Per Abrahamsen + + * menu-bar.el (menu-bar-options-save): Only save + `current-language-environment' and `default-input-method' when + marked as customized. + + * international/mule-cmds.el + (setup-specified-language-environment): Mark + `current-language-environment' as customized. + (set-input-method): Mark + `default-input-method' as customized when called interactively. + (toggle-input-method): Ditto. + 2002-02-11 Colin Walters * ibuffer.el (ibuffer-switch-format): Supply required argument for Index: lisp/menu-bar.el =================================================================== RCS file: /cvsroot/emacs//emacs/lisp/menu-bar.el,v retrieving revision 1.198 diff -c -r1.198 menu-bar.el *** lisp/menu-bar.el 11 Feb 2002 16:47:55 -0000 1.198 --- lisp/menu-bar.el 12 Feb 2002 09:45:23 -0000 *************** *** 569,574 **** --- 569,575 ---- case-fold-search truncate-lines show-paren-mode transient-mark-mode global-font-lock-mode display-time-mode auto-compression-mode + current-language-environment default-input-method ;; Saving `text-mode-hook' is somewhat questionable, ;; as we might get more than we bargain for, if ;; other code may has added hooks as well. *************** *** 579,588 **** (and (get elt 'customized-value) (customize-mark-to-save elt) (setq need-save t))) - ;; These are set with other functions. - (dolist (elt '(current-language-environment default-input-method)) - (when (customize-mark-to-save elt) - (setq need-save t))) ;; Save if we changed anything. (when need-save (custom-save-all)))) --- 580,585 ---- Index: lisp/international/mule-cmds.el =================================================================== RCS file: /cvsroot/emacs//emacs/lisp/international/mule-cmds.el,v retrieving revision 1.183 diff -c -r1.183 mule-cmds.el *** lisp/international/mule-cmds.el 8 Feb 2002 11:59:42 -0000 1.183 --- lisp/international/mule-cmds.el 12 Feb 2002 09:45:23 -0000 *************** *** 1103,1109 **** (if default "Select input method (default %s): " "Select input method: ") default t)))) (activate-input-method input-method) ! (setq default-input-method input-method)) (defun toggle-input-method (&optional arg) "Enable or disable multilingual text input method for the current buffer. --- 1103,1112 ---- (if default "Select input method (default %s): " "Select input method: ") default t)))) (activate-input-method input-method) ! (setq default-input-method input-method) ! (when (interactive-p) ! (customize-mark-as-set 'default-input-method)) ! default-input-method) (defun toggle-input-method (&optional arg) "Enable or disable multilingual text input method for the current buffer. *************** *** 1134,1141 **** (if default "Input method (default %s): " "Input method: " ) default t)) default)) ! (or default-input-method ! (setq default-input-method current-input-method))))) (defun describe-input-method (input-method) "Describe input method INPUT-METHOD." --- 1137,1147 ---- (if default "Input method (default %s): " "Input method: " ) default t)) default)) ! (unless default-input-method ! (prog1 ! (setq default-input-method current-input-method) ! (when (interactive-p) ! (customize-mark-as-set 'default-input-method))))))) (defun describe-input-method (input-method) "Describe input method INPUT-METHOD." *************** *** 1297,1303 **** (or (not (eq last-command-event 'Default)) (setq last-command-event 'English)) (setq language-name (symbol-name last-command-event))) ! (set-language-environment language-name) (error "Bogus calling sequence")))) (defcustom current-language-environment "English" --- 1303,1311 ---- (or (not (eq last-command-event 'Default)) (setq last-command-event 'English)) (setq language-name (symbol-name last-command-event))) ! (prog1 ! (set-language-environment language-name) ! (customize-mark-as-set 'current-language-environment)) (error "Bogus calling sequence")))) (defcustom current-language-environment "English" _______________________________________________ Emacs-devel mailing list Emacs-devel@gnu.org http://mail.gnu.org/mailman/listinfo/emacs-devel