(iso-accents-mode): Variable renamed from iso-accents-minor-mode.

diff --git a/lisp/international/iso-acc.el b/lisp/international/iso-acc.el
index d60d7b4f297bda4f929e900bc651fae4650f52fe..537a9b22c27855ac1a348d686c7ce105e46ba817 100644 (file)
--- a/lisp/international/iso-acc.el
+++ b/lisp/international/iso-acc.el
@@ -24,13 +24,12 @@
 
 ;;; Commentary:
 
-;; Function `iso-accents-mode' activates a minor mode
-;; (`iso-accents-minor-mode') in which typewriter "dead keys" are
-;; emulated.  The purpose of this emulation is to provide a simple
-;; means for inserting accented characters according to the ISO-8859-1
-;; character set.
+;; Function `iso-accents-mode' activates a minor mode in which
+;; typewriter "dead keys" are emulated.  The purpose of this emulation
+;; is to provide a simple means for inserting accented characters
+;; according to the ISO-8859-1 character set.
 ;;
-;; In `iso-accents-minor-mode', pseudo accent characters are used to
+;; In `iso-accents-mode', pseudo accent characters are used to
 ;; introduce accented keys.  The pseudo-accent characterss are:
 ;;
 ;;   '  (minute)    -> grave accent
@@ -141,16 +140,16 @@
     )
   "Association list for ISO accent combinations.")
 
-(defvar iso-accents-minor-mode nil
+(defvar iso-accents-mode nil
   "*Non-nil enables ISO Accents mode.
 Setting this variable makes it local to the current buffer.
-See `iso-accents-mode'.")
-(make-variable-buffer-local 'iso-accents-minor-mode)
+See function `iso-accents-mode'.")
+(make-variable-buffer-local 'iso-accents-mode)
 
 (defun iso-accents-accent-key (prompt)
   "Modify the following character by adding an accent to it."
   ;; Pick up the accent character.
-  (if iso-accents-minor-mode
+  (if iso-accents-mode
       (iso-accents-compose prompt)
     (char-to-string last-input-char)))
 
@@ -196,7 +195,7 @@ those characters that are not actually used.")
 
 (or key-translation-map (setq key-translation-map (make-sparse-keymap)))
 ;; For sequences starting with an accent character,
-;; use a function that tests iso-accents-minor-mode.
+;; use a function that tests iso-accents-mode.
 (if (memq ?' iso-accents-enable)
     (define-key key-translation-map "'"  'iso-accents-accent-key))
 (if (memq ?` iso-accents-enable)
@@ -213,10 +212,10 @@ those characters that are not actually used.")
 ;; It is a matter of taste if you want the minor mode indicated
 ;; in the mode line...
 ;; If so, uncomment the next four lines.
-;; (or (assq 'iso-accents-minor-mode minor-mode-map-alist)
+;; (or (assq 'iso-accents-mode minor-mode-map-alist)
 ;;     (setq minor-mode-alist
 ;;       (append minor-mode-alist
-;;               '((iso-accents-minor-mode " ISO-Acc")))))
+;;               '((iso-accents-mode " ISO-Acc")))))
 
 ;;;###autoload
 (defun iso-accents-mode (&optional arg)
@@ -246,10 +245,10 @@ and a negative argument disables it."
          ;; Negative arg means switch it off.
          (<= (prefix-numeric-value arg) 0)
        ;; No arg means toggle.
-       iso-accents-minor-mode)
-      (setq iso-accents-minor-mode nil)
+       iso-accents-mode)
+      (setq iso-accents-mode nil)
 
     ;; Enable electric accents.
-    (setq iso-accents-minor-mode t)))
+    (setq iso-accents-mode t)))
 
 ;;; iso-acc.el ends here