aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2006-08-06 00:32:33 +0000
committerChong Yidong2006-08-06 00:32:33 +0000
commit044c2978976821d4d799ac55ed7c7bdf23bacd22 (patch)
tree9cd643dad3faef5e193bd807b478ce2b7a6d9795
parent0a3297f7bbfced678d4cd242d5c5eeb59fa57878 (diff)
downloademacs-044c2978976821d4d799ac55ed7c7bdf23bacd22.tar.gz
emacs-044c2978976821d4d799ac55ed7c7bdf23bacd22.zip
* bindings.el: Give mode-line-format, mode-line-modes, and
mode-line-position `standard-value' properties.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/bindings.el102
2 files changed, 61 insertions, 46 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 719ce5d4cac..09c891c29c2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12006-08-05 Chong Yidong <cyd@stupidchicken.com>
2
3 * bindings.el: Give mode-line-format, mode-line-modes, and
4 mode-line-position `standard-value' properties.
5
12006-08-05 Eli Zaretskii <eliz@gnu.org> 62006-08-05 Eli Zaretskii <eliz@gnu.org>
2 7
3 * buff-menu.el (list-buffers-noselect): For Info buffers, use 8 * buff-menu.el (list-buffers-noselect): For Info buffers, use
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 699a05203af..65ff8b0f916 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -280,52 +280,62 @@ Keymap to display on minor modes.")
280 ;; mouse-1: select window, mouse-2: delete others, mouse-3: delete, 280 ;; mouse-1: select window, mouse-2: delete others, mouse-3: delete,
281 ;; drag-mouse-1: resize, C-mouse-2: split horizontally" 281 ;; drag-mouse-1: resize, C-mouse-2: split horizontally"
282 "mouse-1: select (drag to resize), mouse-2: delete others, mouse-3: delete this") 282 "mouse-1: select (drag to resize), mouse-2: delete others, mouse-3: delete this")
283 (dashes (propertize "--" 'help-echo help-echo))) 283 (dashes (propertize "--" 'help-echo help-echo))
284 (setq-default mode-line-format 284 (standard-mode-line-format
285 (list 285 (list
286 "%e" 286 "%e"
287 (propertize "-" 'help-echo help-echo) 287 (propertize "-" 'help-echo help-echo)
288 'mode-line-mule-info 288 'mode-line-mule-info
289 'mode-line-modified 289 'mode-line-modified
290 'mode-line-frame-identification 290 'mode-line-frame-identification
291 'mode-line-buffer-identification 291 'mode-line-buffer-identification
292 (propertize " " 'help-echo help-echo) 292 (propertize " " 'help-echo help-echo)
293 'mode-line-position 293 'mode-line-position
294 '(vc-mode vc-mode) 294 '(vc-mode vc-mode)
295 (propertize " " 'help-echo help-echo) 295 (propertize " " 'help-echo help-echo)
296 'mode-line-modes 296 'mode-line-modes
297 `(which-func-mode ("" which-func-format ,dashes)) 297 `(which-func-mode ("" which-func-format ,dashes))
298 `(global-mode-string (,dashes global-mode-string)) 298 `(global-mode-string (,dashes global-mode-string))
299 (propertize "-%-" 'help-echo help-echo))) 299 (propertize "-%-" 'help-echo help-echo)))
300 300 (standard-mode-line-modes
301 (setq-default mode-line-modes 301 (list
302 (list 302 (propertize "%[(" 'help-echo help-echo)
303 (propertize "%[(" 'help-echo help-echo) 303 `(:propertize ("" mode-name)
304 `(:propertize ("" mode-name) 304 help-echo "mouse-1: major mode, mouse-2: major mode help, mouse-3: toggle minor modes"
305 help-echo "mouse-1: major mode, mouse-2: major mode help, mouse-3: toggle minor modes" 305 mouse-face mode-line-highlight
306 mouse-face mode-line-highlight 306 local-map ,mode-line-major-mode-keymap)
307 local-map ,mode-line-major-mode-keymap) 307 '("" mode-line-process)
308 '("" mode-line-process) 308 `(:propertize ("" minor-mode-alist)
309 `(:propertize ("" minor-mode-alist) 309 mouse-face mode-line-highlight
310 mouse-face mode-line-highlight 310 help-echo "mouse-2: minor mode help, mouse-3: toggle minor modes"
311 help-echo "mouse-2: minor mode help, mouse-3: toggle minor modes" 311 local-map ,mode-line-minor-mode-keymap)
312 local-map ,mode-line-minor-mode-keymap) 312 (propertize "%n" 'help-echo "mouse-2: widen"
313 (propertize "%n" 'help-echo "mouse-2: widen" 313 'mouse-face 'mode-line-highlight
314 'mouse-face 'mode-line-highlight 314 'local-map (make-mode-line-mouse-map
315 'local-map (make-mode-line-mouse-map 315 'mouse-2 #'mode-line-widen))
316 'mouse-2 #'mode-line-widen)) 316 (propertize ")%]--" 'help-echo help-echo)))
317 (propertize ")%]--" 'help-echo help-echo))) 317 (standard-mode-line-position
318 318 `((-3 ,(propertize "%p" 'help-echo help-echo))
319 (setq-default mode-line-position 319 (size-indication-mode
320 `((-3 ,(propertize "%p" 'help-echo help-echo)) 320 (8 ,(propertize " of %I" 'help-echo help-echo)))
321 (size-indication-mode 321 (line-number-mode
322 (8 ,(propertize " of %I" 'help-echo help-echo))) 322 ((column-number-mode
323 (line-number-mode 323 (10 ,(propertize " (%l,%c)" 'help-echo help-echo))
324 ((column-number-mode 324 (6 ,(propertize " L%l" 'help-echo help-echo))))
325 (10 ,(propertize " (%l,%c)" 'help-echo help-echo)) 325 ((column-number-mode
326 (6 ,(propertize " L%l" 'help-echo help-echo)))) 326 (5 ,(propertize " C%c" 'help-echo help-echo))))))))
327 ((column-number-mode 327
328 (5 ,(propertize " C%c" 'help-echo help-echo)))))))) 328 (setq-default mode-line-format standard-mode-line-format)
329 (put 'mode-line-format 'standard-value
330 (list `(quote ,standard-mode-line-format)))
331
332 (setq-default mode-line-modes standard-mode-line-modes)
333 (put 'mode-line-modes 'standard-value
334 (list `(quote ,standard-mode-line-modes)))
335
336 (setq-default mode-line-position standard-mode-line-position)
337 (put 'mode-line-position 'standard-value
338 (list `(quote ,standard-mode-line-position))))
329 339
330(defvar mode-line-buffer-identification-keymap nil "\ 340(defvar mode-line-buffer-identification-keymap nil "\
331Keymap for what is displayed by `mode-line-buffer-identification'.") 341Keymap for what is displayed by `mode-line-buffer-identification'.")