aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2001-10-31 21:57:45 +0000
committerRichard M. Stallman2001-10-31 21:57:45 +0000
commite61889649743a8e88fc5bddeacc597b2f47cfe9b (patch)
tree423b6c934773e868cebd03815eb6ca2af9b20b25
parenta54016d911911eef7cb0741eb24b63d9b4693673 (diff)
downloademacs-e61889649743a8e88fc5bddeacc597b2f47cfe9b.tar.gz
emacs-e61889649743a8e88fc5bddeacc597b2f47cfe9b.zip
(mode-line-frame-identification): Add doc string.
(mode-line-position, mode-line-modes): New variables. (mode-line-format): Use mode-line-position for the part that displays the position-in-buffer info. Use mode-line-modes for the part that displays major and minor modes.
-rw-r--r--lisp/ChangeLog8
-rw-r--r--lisp/bindings.el39
2 files changed, 35 insertions, 12 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 942bc059271..82e39f44754 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
12001-10-31 Richard M. Stallman <rms@gnu.org>
2
3 * bindings.el (mode-line-frame-identification): Add doc string.
4 (mode-line-position, mode-line-modes): New variables.
5 (mode-line-format): Use mode-line-position for the part
6 that displays the position-in-buffer info. Use
7 mode-line-modes for the part that displays major and minor modes.
8
12001-10-31 Sam Steingold <sds@gnu.org> 92001-10-31 Sam Steingold <sds@gnu.org>
2 10
3 * emacs-lisp/debug.el (debugger-make-xrefs): New function. 11 * emacs-lisp/debug.el (debugger-make-xrefs): New function.
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 331c9ab8f21..d52587fda02 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -183,7 +183,8 @@ Major modes that edit things other than ordinary files may change this
183 183
184(make-variable-buffer-local 'mode-line-buffer-identification) 184(make-variable-buffer-local 'mode-line-buffer-identification)
185 185
186(defvar mode-line-frame-identification '("-%F ")) 186(defvar mode-line-frame-identification '("-%F ")
187 "Mode-line control to describe the current frame.")
187 188
188(defvar mode-line-process nil "\ 189(defvar mode-line-process nil "\
189Mode-line control for displaying info on process status. 190Mode-line control for displaying info on process status.
@@ -219,15 +220,22 @@ Normally nil in most modes, since there is no process to display.")
219 220
220(make-variable-buffer-local 'mode-line-modified) 221(make-variable-buffer-local 'mode-line-modified)
221 222
222(setq-default mode-line-format 223;; Actual initialization is below.
223 (let* ((help-echo 224(defvar mode-line-position nil
224 ;; The multi-line message doesn't work terribly well on the 225 "Mode-line control for displaying line number, column number and fraction.")
225 ;; bottom mode line... Better ideas? 226
227(defvar mode-line-modes nil
228 "Mode-line control for displaying major and minor modes.")
229
230(let* ((help-echo
231 ;; The multi-line message doesn't work terribly well on the
232 ;; bottom mode line... Better ideas?
226;;; "\ 233;;; "\
227;;; mouse-1: select window, mouse-2: delete others, mouse-3: delete, 234;;; mouse-1: select window, mouse-2: delete others, mouse-3: delete,
228;;; drag-mouse-1: resize, C-mouse-2: split horizontally" 235;;; drag-mouse-1: resize, C-mouse-2: split horizontally"
229 "mouse-1: select window, mouse-2: delete others, mouse-3: delete ...") 236 "mouse-1: select (drag to resize), mouse-2: delete others, mouse-3: delete")
230 (dashes (propertize "--" 'help-echo help-echo))) 237 (dashes (propertize "--" 'help-echo help-echo)))
238 (setq-default mode-line-format
231 (list 239 (list
232 (propertize "-" 'help-echo help-echo) 240 (propertize "-" 'help-echo help-echo)
233 'mode-line-mule-info 241 'mode-line-mule-info
@@ -236,17 +244,24 @@ Normally nil in most modes, since there is no process to display.")
236 'mode-line-buffer-identification 244 'mode-line-buffer-identification
237 (propertize " " 'help-echo help-echo) 245 (propertize " " 'help-echo help-echo)
238 'global-mode-string 246 'global-mode-string
247 'mode-line-modes
248 `(which-func-mode ("" which-func-format ,dashes))
249 'mode-line-position
250 (propertize "-%-" 'help-echo help-echo)))
251
252 (setq-default mode-line-modes
253 (list
239 (propertize " %[(" 'help-echo help-echo) 254 (propertize " %[(" 'help-echo help-echo)
240 '(:eval (mode-line-mode-name)) 'mode-line-process 'minor-mode-alist 255 '(:eval (mode-line-mode-name)) 'mode-line-process 'minor-mode-alist
241 (propertize "%n" 'help-echo "mouse-2: widen" 256 (propertize "%n" 'help-echo "mouse-2: widen"
242 'local-map (make-mode-line-mouse-map 257 'local-map (make-mode-line-mouse-map
243 'mouse-2 #'mode-line-widen)) 258 'mouse-2 #'mode-line-widen))
244 (propertize ")%]--" 'help-echo help-echo) 259 (propertize ")%]--" 'help-echo help-echo)))
245 `(which-func-mode ("" which-func-format ,dashes)) 260
246 `(line-number-mode (,(propertize "L%l" 'help-echo help-echo) ,dashes)) 261 (setq-default mode-line-position
247 `(column-number-mode (,(propertize "C%c" 'help-echo help-echo) ,dashes)) 262 `((line-number-mode (,(propertize "L%l" 'help-echo help-echo) ,dashes))
248 `(-3 . ,(propertize "%p" 'help-echo help-echo)) 263 (column-number-mode (,(propertize "C%c" 'help-echo help-echo) ,dashes))
249 (propertize "-%-" 'help-echo help-echo)))) 264 (-3 . ,(propertize "%p" 'help-echo help-echo)))))
250 265
251(defvar mode-line-buffer-identification-keymap nil "\ 266(defvar mode-line-buffer-identification-keymap nil "\
252Keymap for what is displayed by `mode-line-buffer-identification'.") 267Keymap for what is displayed by `mode-line-buffer-identification'.")