From: Richard M. Stallman <rms@gnu.org>
Date: Tue, 26 Dec 1995 04:38:27 +0000 (+0000)
Subject: When turning on default settings,
X-Git-Tag: emacs-19.34~1995
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=31d87daa5baa0fdecdb1c15d844e3cb2a8c01a37;p=emacs.git

When turning on default settings,
preserve iso-accents-enable if it's already set.
---

diff --git a/lisp/international/iso-acc.el b/lisp/international/iso-acc.el
index 0febc122ec5..ae8aace6344 100644
--- a/lisp/international/iso-acc.el
+++ b/lisp/international/iso-acc.el
@@ -327,7 +327,11 @@ Noninteractively, this operates on text from START to END."
 		(insert (car (cdr (car entry)))))
 	    (forward-char 1)))))))
 
-(iso-accents-customize "default")
+;; Set up the default settings, but don't override
+;; iso-accents-enable if the user has already set it.
+(let ((old iso-accents-enable))
+  (iso-accents-customize "default")
+  (if old
+      (setq iso-accents-enable old)))
 
 ;;; iso-acc.el ends here
-