diff options
| author | Glenn Morris <rgm@gnu.org> | 2010-10-28 20:29:29 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2010-10-28 20:29:29 -0700 |
| commit | 9d7940260552d9ad5f331443aae200094ae2847c (patch) | |
| tree | f7c3cf42cbf6a057ba2918f03b91e15da25c8b19 /lisp/composite.el | |
| parent | dcc029e017acab959291f9d938234240ac3cea32 (diff) | |
| download | emacs-9d7940260552d9ad5f331443aae200094ae2847c.tar.gz | |
Remove duplicate Lisp definitions of define-minor-mode variables defined in C.
* lisp/abbrev.el (abbrev-mode):
* lisp/composite.el (auto-composition-mode):
* lisp/menu-bar.el (menu-bar-mode):
* lisp/simple.el (transient-mark-mode):
* lisp/tool-bar.el (tool-bar-mode): Adjust the define-minor-mode calls so
that they do not define the associated variables twice.
* lisp/simple.el (transient-mark-mode): Remove defvar.
* lisp/composite.el (auto-composition-mode): Make variable auto-buffer-local.
* lisp/cus-start.el: Add transient-mark-mode, menu-bar-mode, tool-bar-mode.
Handle multiple groups, and also custom-delayed-init-variables.
* lisp/emacs-lisp/easy-mmode.el (define-minor-mode): Doc fix.
* src/buffer.c (syms_of_buffer) <abbrev-mode, transient-mark-mode>:
* src/frame.c (syms_of_frame) <tool-bar-mode>: Move docs here from Lisp.
Diffstat (limited to 'lisp/composite.el')
| -rw-r--r-- | lisp/composite.el | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/composite.el b/lisp/composite.el index 02c78580fff..da7705cf9eb 100644 --- a/lisp/composite.el +++ b/lisp/composite.el @@ -743,7 +743,11 @@ When Auto Composition is enabled, text characters are automatically composed by functions registered in `composition-function-table' (which see). You can use `global-auto-composition-mode' to turn on -Auto Composition mode in all buffers (this is the default).") +Auto Composition mode in all buffers (this is the default)." + ;; It's defined in C, this stops the d-m-m macro defining it again. + :variable auto-composition-mode) +;; It's not defined with DEFVAR_PER_BUFFER though. +(make-variable-buffer-local 'auto-composition-mode) ;;;###autoload (define-minor-mode global-auto-composition-mode @@ -757,5 +761,4 @@ See `auto-composition-mode' for more information on Auto-Composition mode." -;; arch-tag: ee703d77-1723-45d4-a31f-e9f0f867aa33 ;;; composite.el ends here |