diff options
| author | Glenn Morris | 2010-10-28 20:29:29 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-10-28 20:29:29 -0700 |
| commit | 9d7940260552d9ad5f331443aae200094ae2847c (patch) | |
| tree | f7c3cf42cbf6a057ba2918f03b91e15da25c8b19 /src/buffer.c | |
| parent | dcc029e017acab959291f9d938234240ac3cea32 (diff) | |
| download | emacs-9d7940260552d9ad5f331443aae200094ae2847c.tar.gz emacs-9d7940260552d9ad5f331443aae200094ae2847c.zip | |
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 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/src/buffer.c b/src/buffer.c index 5a6bfcba060..67192b4843b 100644 --- a/src/buffer.c +++ b/src/buffer.c | |||
| @@ -5600,7 +5600,8 @@ Format with `format-mode-line' to produce a string value. */); | |||
| 5600 | doc: /* Local (mode-specific) abbrev table of current buffer. */); | 5600 | doc: /* Local (mode-specific) abbrev table of current buffer. */); |
| 5601 | 5601 | ||
| 5602 | DEFVAR_PER_BUFFER ("abbrev-mode", ¤t_buffer->abbrev_mode, Qnil, | 5602 | DEFVAR_PER_BUFFER ("abbrev-mode", ¤t_buffer->abbrev_mode, Qnil, |
| 5603 | doc: /* Non-nil turns on automatic expansion of abbrevs as they are inserted. */); | 5603 | doc: /* Non-nil if Abbrev mode is enabled. |
| 5604 | Use the command `abbrev-mode' to change this variable. */); | ||
| 5604 | 5605 | ||
| 5605 | DEFVAR_PER_BUFFER ("case-fold-search", ¤t_buffer->case_fold_search, | 5606 | DEFVAR_PER_BUFFER ("case-fold-search", ¤t_buffer->case_fold_search, |
| 5606 | Qnil, | 5607 | Qnil, |
| @@ -6098,11 +6099,23 @@ to the value obtained by calling `current-time'. | |||
| 6098 | If the buffer has never been shown in a window, the value is nil. */); | 6099 | If the buffer has never been shown in a window, the value is nil. */); |
| 6099 | 6100 | ||
| 6100 | DEFVAR_LISP ("transient-mark-mode", &Vtransient_mark_mode, | 6101 | DEFVAR_LISP ("transient-mark-mode", &Vtransient_mark_mode, |
| 6101 | doc: /* */); | 6102 | doc: /* Non-nil if Transient Mark mode is enabled. |
| 6103 | See the command `transient-mark-mode' for a description of this minor mode. | ||
| 6104 | |||
| 6105 | Non-nil also enables highlighting of the region whenever the mark is active. | ||
| 6106 | The variable `highlight-nonselected-windows' controls whether to highlight | ||
| 6107 | all windows or just the selected window. | ||
| 6108 | |||
| 6109 | If the value is `lambda', that enables Transient Mark mode temporarily. | ||
| 6110 | After any subsequent action that would normally deactivate the mark | ||
| 6111 | \(such as buffer modification), Transient Mark mode is turned off. | ||
| 6112 | |||
| 6113 | If the value is (only . OLDVAL), that enables Transient Mark mode | ||
| 6114 | temporarily. After any subsequent point motion command that is not | ||
| 6115 | shift-translated, or any other action that would normally deactivate | ||
| 6116 | the mark (such as buffer modification), the value of | ||
| 6117 | `transient-mark-mode' is set to OLDVAL. */); | ||
| 6102 | Vtransient_mark_mode = Qnil; | 6118 | Vtransient_mark_mode = Qnil; |
| 6103 | /* The docstring is in simple.el. If we put it here, it would be | ||
| 6104 | overwritten when transient-mark-mode is defined using | ||
| 6105 | define-minor-mode. */ | ||
| 6106 | 6119 | ||
| 6107 | DEFVAR_LISP ("inhibit-read-only", &Vinhibit_read_only, | 6120 | DEFVAR_LISP ("inhibit-read-only", &Vinhibit_read_only, |
| 6108 | doc: /* *Non-nil means disregard read-only status of buffers or characters. | 6121 | doc: /* *Non-nil means disregard read-only status of buffers or characters. |