diff options
author | Masatake YAMATO <[email protected]> | 2005-05-23 11:19:17 +0000 |
---|---|---|
committer | Masatake YAMATO <[email protected]> | 2005-05-23 11:19:17 +0000 |
commit | 359e4563cad1b8add855a43ef77b7bb5cb3f9f1d (patch) | |
tree | 2267264238ad326625994c395e647b70328d8a8b /lisp | |
parent | a4632380faae651c8cbf322dc90d81aab1e01688 (diff) |
Supprot mouse-face on mode-line.
2005-05-23 Masatake YAMATO <[email protected]>
* xdisp.c (note_mode_line_or_margin_highlight): Added code
for mouse-face. Change the type of the first argument from `window'
to `List_Object'.
(note_mouse_highlight): Call note_mode_line_or_margin_highlight with
window instead of w.
2005-05-23 Masatake YAMATO <[email protected]>
* bindings.el (mode-line-major-mode-keymap): Bind
[mode-line down-mouse-1] to `mouse-major-mode-menu'.
* faces.el (mode-line-highlight): New face.
* ruler-mode.el (ruler-mode-ruler): Use mode-line-highlight
as mouse-face.
* bindings.el (top-level, help-echo, mode-line-modified)
(mode-line-mule-info, mode-line-eol-desc): Use mode-line-highlight
as mouse-face.
Diffstat (limited to 'lisp')
-rw-r--r-- | lisp/ChangeLog | 14 | ||||
-rw-r--r-- | lisp/bindings.el | 20 | ||||
-rw-r--r-- | lisp/ruler-mode.el | 9 |
3 files changed, 38 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9eefd8afc2..da684c69ed 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,17 @@ +2005-05-23 Masatake YAMATO <[email protected]> + + * bindings.el (mode-line-major-mode-keymap): Bind + [mode-line down-mouse-1] to `mouse-major-mode-menu'. + + * faces.el (mode-line-highlight): New face. + + * ruler-mode.el (ruler-mode-ruler): Use mode-line-highlight + as mouse-face. + + * bindings.el (top-level, help-echo, mode-line-modified) + (mode-line-mule-info, mode-line-eol-desc): Use mode-line-highlight + as mouse-face. + 2005-05-23 Juanma Barranquero <[email protected]> * progmodes/cc-engine.el (c-guess-basic-syntax): diff --git a/lisp/bindings.el b/lisp/bindings.el index 396e1e4921..4781f8dfa5 100644 --- a/lisp/bindings.el +++ b/lisp/bindings.el @@ -165,7 +165,8 @@ corresponding to the mode line clicked." (eval-when-compile (let ((map (make-sparse-keymap))) (define-key map [mode-line mouse-3] 'mode-line-change-eol) - map)))) + map)) + 'mouse-face 'mode-line-highlight)) (push (cons eol (cons mnemonic desc)) mode-line-eol-desc-cache) desc))) @@ -177,7 +178,8 @@ corresponding to the mode line clicked." "Input method: " current-input-method ". mouse-2: disable, mouse-3: describe") - local-map ,mode-line-input-method-map)) + local-map ,mode-line-input-method-map + mouse-face mode-line-highlight)) ,(propertize "%z" 'help-echo @@ -191,6 +193,7 @@ corresponding to the mode line clicked." " buffer; mouse-3: describe coding system") (concat "Unibyte " (symbol-name buffer-file-coding-system) " buffer"))))) + 'mouse-face 'mode-line-highlight 'local-map mode-line-coding-system-map) (:eval (mode-line-eol-desc))) "Mode-line control for displaying information of multilingual environment. @@ -235,7 +238,8 @@ Normally nil in most modes, since there is no process to display.") "Not r"))))) 'local-map (purecopy (make-mode-line-mouse-map 'mouse-3 - #'mode-line-toggle-read-only))) + #'mode-line-toggle-read-only)) + 'mouse-face 'mode-line-highlight) (propertize "%1+" 'help-echo (purecopy (lambda (window object point) @@ -246,7 +250,8 @@ Normally nil in most modes, since there is no process to display.") "M" "Not m"))))) 'local-map (purecopy (make-mode-line-mouse-map - 'mouse-3 #'mode-line-toggle-modified)))) + 'mouse-3 #'mode-line-toggle-modified)) + 'mouse-face 'mode-line-highlight)) "Mode-line control for displaying whether current buffer is modified.") (make-variable-buffer-local 'mode-line-modified) @@ -262,6 +267,7 @@ buffer size, the line number and the column number.") (defvar mode-line-major-mode-keymap (let ((map (make-sparse-keymap))) + (define-key map [mode-line down-mouse-1] 'mouse-major-mode-menu) (define-key map [mode-line mouse-2] 'describe-mode) (define-key map [mode-line down-mouse-3] 'mode-line-mode-menu-1) map) "\ @@ -303,13 +309,16 @@ Keymap to display on minor modes.") (list (propertize "%[(" 'help-echo help-echo) `(:propertize ("" mode-name) - help-echo "mouse-2: help for current major mode" + help-echo "mouse-1: major-mode-menu mouse-2: help for current major mode" + mouse-face mode-line-highlight local-map ,mode-line-major-mode-keymap) '("" mode-line-process) `(:propertize ("" minor-mode-alist) + mouse-face mode-line-highlight help-echo "mouse-2: help for minor modes, mouse-3: minor mode menu" local-map ,mode-line-minor-mode-keymap) (propertize "%n" 'help-echo "mouse-2: widen" + 'mouse-face 'mode-line-highlight 'local-map (make-mode-line-mouse-map 'mouse-2 #'mode-line-widen)) (propertize ")%]--" 'help-echo help-echo))) @@ -465,6 +474,7 @@ text properties for face, help-echo, and local-map to it." 'face 'Buffer-menu-buffer-face 'help-echo (purecopy "mouse-1: previous buffer, mouse-3: next buffer") + 'mouse-face 'mode-line-highlight 'local-map mode-line-buffer-identification-keymap))) (setq-default mode-line-buffer-identification diff --git a/lisp/ruler-mode.el b/lisp/ruler-mode.el index 928b5baabe..46a28ce506 100644 --- a/lisp/ruler-mode.el +++ b/lisp/ruler-mode.el @@ -697,6 +697,9 @@ Optional argument PROPS specifies other text properties to apply." (put-text-property i (1+ i) 'face 'ruler-mode-goal-column-face ruler) + (put-text-property + i (1+ i) 'mouse-face 'mode-line-highlight + ruler) (put-text-property i (1+ i) 'help-echo ruler-mode-goal-column-help-echo ruler)) @@ -706,6 +709,9 @@ Optional argument PROPS specifies other text properties to apply." (put-text-property i (1+ i) 'face 'ruler-mode-comment-column-face ruler) + (put-text-property + i (1+ i) 'mouse-face 'mode-line-highlight + ruler) (put-text-property i (1+ i) 'help-echo ruler-mode-comment-column-help-echo ruler)) @@ -715,6 +721,9 @@ Optional argument PROPS specifies other text properties to apply." (put-text-property i (1+ i) 'face 'ruler-mode-fill-column-face ruler) + (put-text-property + i (1+ i) 'mouse-face 'mode-line-highlight + ruler) (put-text-property i (1+ i) 'help-echo ruler-mode-fill-column-help-echo ruler)) |