# HG changeset patch # User Karl Heuer # Date 935853217 0 # Node ID 68c51b1a537f80580081751ac9e9904acec6730a # Parent 479691c42edf1a647bc3d6a4d83945bf55342614 (easy-mmode-define-minor-mode): On repeated call, override previous values put into minor-mode-map-alist and minor-mode-alist. diff -r 479691c42edf -r 68c51b1a537f lisp/emacs-lisp/easy-mmode.el --- a/lisp/emacs-lisp/easy-mmode.el Sat Aug 28 06:23:04 1999 +0000 +++ b/lisp/emacs-lisp/easy-mmode.el Sat Aug 28 15:13:37 1999 +0000 @@ -137,11 +137,11 @@ (keymap-name (concat mode-name "-map")) (keymap-doc (format "Keymap for %s mode." mode-name))) `(progn - ;; define the switch + ;; Define the variable to enable or disable the mode. (defvar ,mode ,init-value ,mode-doc) (make-variable-buffer-local ',mode) - ;; define the minor-mode keymap + ;; Define the minor-mode keymap. (defvar ,(intern keymap-name) (cond ((and ,keymap (keymapp ,keymap)) ,keymap) @@ -150,18 +150,21 @@ (t (error "Invalid keymap %S" ,keymap))) ,keymap-doc) - ;; define the toggle and the hooks - ,(macroexpand `(easy-mmode-define-toggle ,mode ,doc)) ; toggle and hooks + ;; Define the toggle and the hooks. + ,(macroexpand `(easy-mmode-define-toggle ,mode ,doc)) - ;; update the mode-bar + ;; Update the mode line. (or (assq ',mode minor-mode-alist) (setq minor-mode-alist - (cons (list ',mode ,lighter) minor-mode-alist))) + (cons (list ',mode nil) minor-mode-alist))) + (setcar (cdr (assq ',mode minor-mode-alist)) ,lighter) - ;; update the minor-mode-map + ;; Update the minor mode map. (or (assq ',mode minor-mode-map-alist) (setq minor-mode-map-alist - (cons (cons ',mode ,(intern keymap-name)) minor-mode-map-alist)))) )) + (cons (cons ',mode ,(intern keymap-name)) minor-mode-map-alist))) + (setcdr (assq ',mode minor-mode-map-alist) + ,(intern keymap-name))) )) (provide 'easy-mmode)