[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/ruler-mode.el
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/ruler-mode.el |
Date: |
Fri, 10 Jun 2005 04:20:47 -0400 |
Index: emacs/lisp/ruler-mode.el
diff -c emacs/lisp/ruler-mode.el:1.22 emacs/lisp/ruler-mode.el:1.23
*** emacs/lisp/ruler-mode.el:1.22 Mon May 23 11:19:17 2005
--- emacs/lisp/ruler-mode.el Fri Jun 10 08:20:44 2005
***************
*** 1,6 ****
;;; ruler-mode.el --- display a ruler in the header line
! ;; Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
;; Author: David Ponce <address@hidden>
;; Maintainer: David Ponce <address@hidden>
--- 1,6 ----
;;; ruler-mode.el --- display a ruler in the header line
! ;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
;; Author: David Ponce <address@hidden>
;; Maintainer: David Ponce <address@hidden>
***************
*** 70,95 ****
;;
;; The following faces are customizable:
;;
! ;; - `ruler-mode-default-face' the ruler default face.
! ;; - `ruler-mode-fill-column-face' the face used to highlight the
;; `fill-column' character.
! ;; - `ruler-mode-comment-column-face' the face used to highlight the
;; `comment-column' character.
! ;; - `ruler-mode-goal-column-face' the face used to highlight the
;; `goal-column' character.
! ;; - `ruler-mode-current-column-face' the face used to highlight the
;; `current-column' character.
! ;; - `ruler-mode-tab-stop-face' the face used to highlight tab stop
;; characters.
! ;; - `ruler-mode-margins-face' the face used to highlight graduations
;; in the `window-margins' areas.
! ;; - `ruler-mode-fringes-face' the face used to highlight graduations
;; in the `window-fringes' areas.
! ;; - `ruler-mode-column-number-face' the face used to highlight the
;; numbered graduations.
;;
! ;; `ruler-mode-default-face' inherits from the built-in `default' face.
! ;; All `ruler-mode' faces inherit from `ruler-mode-default-face'.
;;
;; WARNING: To keep ruler graduations aligned on text columns it is
;; important to use the same font family and size for ruler and text
--- 70,95 ----
;;
;; The following faces are customizable:
;;
! ;; - `ruler-mode-default' the ruler default face.
! ;; - `ruler-mode-fill-column' the face used to highlight the
;; `fill-column' character.
! ;; - `ruler-mode-comment-column' the face used to highlight the
;; `comment-column' character.
! ;; - `ruler-mode-goal-column' the face used to highlight the
;; `goal-column' character.
! ;; - `ruler-mode-current-column' the face used to highlight the
;; `current-column' character.
! ;; - `ruler-mode-tab-stop' the face used to highlight tab stop
;; characters.
! ;; - `ruler-mode-margins' the face used to highlight graduations
;; in the `window-margins' areas.
! ;; - `ruler-mode-fringes' the face used to highlight graduations
;; in the `window-fringes' areas.
! ;; - `ruler-mode-column-number' the face used to highlight the
;; numbered graduations.
;;
! ;; `ruler-mode-default' inherits from the built-in `default' face.
! ;; All `ruler-mode' faces inherit from `ruler-mode-default'.
;;
;; WARNING: To keep ruler graduations aligned on text columns it is
;; important to use the same font family and size for ruler and text
***************
*** 205,211 ****
:group 'ruler-mode
:type 'boolean)
! (defface ruler-mode-default-face
'((((type tty))
(:inherit default
:background "grey64"
--- 205,211 ----
:group 'ruler-mode
:type 'boolean)
! (defface ruler-mode-default
'((((type tty))
(:inherit default
:background "grey64"
***************
*** 221,303 ****
)))
"Default face used by the ruler."
:group 'ruler-mode)
! (defface ruler-mode-pad-face
'((((type tty))
! (:inherit ruler-mode-default-face
:background "grey50"
))
(t
! (:inherit ruler-mode-default-face
:background "grey64"
)))
"Face used to pad inactive ruler areas."
:group 'ruler-mode)
! (defface ruler-mode-margins-face
'((t
! (:inherit ruler-mode-default-face
:foreground "white"
)))
"Face used to highlight margin areas."
:group 'ruler-mode)
! (defface ruler-mode-fringes-face
'((t
! (:inherit ruler-mode-default-face
:foreground "green"
)))
"Face used to highlight fringes areas."
:group 'ruler-mode)
! (defface ruler-mode-column-number-face
'((t
! (:inherit ruler-mode-default-face
:foreground "black"
)))
"Face used to highlight number graduations."
:group 'ruler-mode)
! (defface ruler-mode-fill-column-face
'((t
! (:inherit ruler-mode-default-face
:foreground "red"
)))
"Face used to highlight the fill column character."
:group 'ruler-mode)
! (defface ruler-mode-comment-column-face
'((t
! (:inherit ruler-mode-default-face
:foreground "red"
)))
"Face used to highlight the comment column character."
:group 'ruler-mode)
! (defface ruler-mode-goal-column-face
'((t
! (:inherit ruler-mode-default-face
:foreground "red"
)))
"Face used to highlight the goal column character."
:group 'ruler-mode)
! (defface ruler-mode-tab-stop-face
'((t
! (:inherit ruler-mode-default-face
:foreground "steelblue"
)))
"Face used to highlight tab stop characters."
:group 'ruler-mode)
! (defface ruler-mode-current-column-face
'((t
! (:inherit ruler-mode-default-face
:weight bold
:foreground "yellow"
)))
"Face used to highlight the `current-column' character."
:group 'ruler-mode)
(defsubst ruler-mode-full-window-width ()
--- 221,323 ----
)))
"Default face used by the ruler."
:group 'ruler-mode)
+ ;; backward-compatibility alias
+ (put 'ruler-mode-default-face 'face-alias 'ruler-mode-default)
! (defface ruler-mode-pad
'((((type tty))
! (:inherit ruler-mode-default
:background "grey50"
))
(t
! (:inherit ruler-mode-default
:background "grey64"
)))
"Face used to pad inactive ruler areas."
:group 'ruler-mode)
+ ;; backward-compatibility alias
+ (put 'ruler-mode-pad-face 'face-alias 'ruler-mode-pad)
! (defface ruler-mode-margins
'((t
! (:inherit ruler-mode-default
:foreground "white"
)))
"Face used to highlight margin areas."
:group 'ruler-mode)
+ ;; backward-compatibility alias
+ (put 'ruler-mode-margins-face 'face-alias 'ruler-mode-margins)
! (defface ruler-mode-fringes
'((t
! (:inherit ruler-mode-default
:foreground "green"
)))
"Face used to highlight fringes areas."
:group 'ruler-mode)
+ ;; backward-compatibility alias
+ (put 'ruler-mode-fringes-face 'face-alias 'ruler-mode-fringes)
! (defface ruler-mode-column-number
'((t
! (:inherit ruler-mode-default
:foreground "black"
)))
"Face used to highlight number graduations."
:group 'ruler-mode)
+ ;; backward-compatibility alias
+ (put 'ruler-mode-column-number-face 'face-alias 'ruler-mode-column-number)
! (defface ruler-mode-fill-column
'((t
! (:inherit ruler-mode-default
:foreground "red"
)))
"Face used to highlight the fill column character."
:group 'ruler-mode)
+ ;; backward-compatibility alias
+ (put 'ruler-mode-fill-column-face 'face-alias 'ruler-mode-fill-column)
! (defface ruler-mode-comment-column
'((t
! (:inherit ruler-mode-default
:foreground "red"
)))
"Face used to highlight the comment column character."
:group 'ruler-mode)
+ ;; backward-compatibility alias
+ (put 'ruler-mode-comment-column-face 'face-alias 'ruler-mode-comment-column)
! (defface ruler-mode-goal-column
'((t
! (:inherit ruler-mode-default
:foreground "red"
)))
"Face used to highlight the goal column character."
:group 'ruler-mode)
+ ;; backward-compatibility alias
+ (put 'ruler-mode-goal-column-face 'face-alias 'ruler-mode-goal-column)
! (defface ruler-mode-tab-stop
'((t
! (:inherit ruler-mode-default
:foreground "steelblue"
)))
"Face used to highlight tab stop characters."
:group 'ruler-mode)
+ ;; backward-compatibility alias
+ (put 'ruler-mode-tab-stop-face 'face-alias 'ruler-mode-tab-stop)
! (defface ruler-mode-current-column
'((t
! (:inherit ruler-mode-default
:weight bold
:foreground "yellow"
)))
"Face used to highlight the `current-column' character."
:group 'ruler-mode)
+ ;; backward-compatibility alias
+ (put 'ruler-mode-current-column-face 'face-alias 'ruler-mode-current-column)
(defsubst ruler-mode-full-window-width ()
***************
*** 419,425 ****
(message "Goal column set to %d (click on %s again to unset it)"
newc
(propertize (char-to-string ruler-mode-goal-column-char)
! 'face 'ruler-mode-goal-column-face))
nil) ;; Don't start dragging.
)
(if (eq 'click (ruler-mode-mouse-drag-any-column-iteration
--- 439,445 ----
(message "Goal column set to %d (click on %s again to unset it)"
newc
(propertize (char-to-string ruler-mode-goal-column-char)
! 'face 'ruler-mode-goal-column))
nil) ;; Don't start dragging.
)
(if (eq 'click (ruler-mode-mouse-drag-any-column-iteration
***************
*** 629,662 ****
;; Setup the scrollbar, fringes, and margins areas.
(lf (ruler-mode-space
'left-fringe
! 'face 'ruler-mode-fringes-face
'help-echo (format ruler-mode-fringe-help-echo
"Left" (or (car f) 0))))
(rf (ruler-mode-space
'right-fringe
! 'face 'ruler-mode-fringes-face
'help-echo (format ruler-mode-fringe-help-echo
"Right" (or (cadr f) 0))))
(lm (ruler-mode-space
'left-margin
! 'face 'ruler-mode-margins-face
'help-echo (format ruler-mode-margin-help-echo
"Left" (or (car m) 0))))
(rm (ruler-mode-space
'right-margin
! 'face 'ruler-mode-margins-face
'help-echo (format ruler-mode-margin-help-echo
"Right" (or (cdr m) 0))))
(sb (ruler-mode-space
'scroll-bar
! 'face 'ruler-mode-pad-face))
;; Remember the scrollbar vertical type.
(sbvt (car (window-current-scroll-bars)))
;; Create an "clean" ruler.
(ruler
(propertize
(make-string w ruler-mode-basic-graduation-char)
! 'face 'ruler-mode-default-face
'local-map ruler-mode-map
'help-echo (cond
(ruler-mode-show-tab-stops
--- 649,682 ----
;; Setup the scrollbar, fringes, and margins areas.
(lf (ruler-mode-space
'left-fringe
! 'face 'ruler-mode-fringes
'help-echo (format ruler-mode-fringe-help-echo
"Left" (or (car f) 0))))
(rf (ruler-mode-space
'right-fringe
! 'face 'ruler-mode-fringes
'help-echo (format ruler-mode-fringe-help-echo
"Right" (or (cadr f) 0))))
(lm (ruler-mode-space
'left-margin
! 'face 'ruler-mode-margins
'help-echo (format ruler-mode-margin-help-echo
"Left" (or (car m) 0))))
(rm (ruler-mode-space
'right-margin
! 'face 'ruler-mode-margins
'help-echo (format ruler-mode-margin-help-echo
"Right" (or (cdr m) 0))))
(sb (ruler-mode-space
'scroll-bar
! 'face 'ruler-mode-pad))
;; Remember the scrollbar vertical type.
(sbvt (car (window-current-scroll-bars)))
;; Create an "clean" ruler.
(ruler
(propertize
(make-string w ruler-mode-basic-graduation-char)
! 'face 'ruler-mode-default
'local-map ruler-mode-map
'help-echo (cond
(ruler-mode-show-tab-stops
***************
*** 675,681 ****
m (length c)
k i)
(put-text-property
! i (1+ i) 'face 'ruler-mode-column-number-face
ruler)
(while (and (> m 0) (>= k 0))
(aset ruler k (aref c (setq m (1- m))))
--- 695,701 ----
m (length c)
k i)
(put-text-property
! i (1+ i) 'face 'ruler-mode-column-number
ruler)
(while (and (> m 0) (>= k 0))
(aset ruler k (aref c (setq m (1- m))))
***************
*** 689,701 ****
((= j (current-column))
(aset ruler i ruler-mode-current-column-char)
(put-text-property
! i (1+ i) 'face 'ruler-mode-current-column-face
ruler))
;; Show the `goal-column' marker.
((and goal-column (= j goal-column))
(aset ruler i ruler-mode-goal-column-char)
(put-text-property
! i (1+ i) 'face 'ruler-mode-goal-column-face
ruler)
(put-text-property
i (1+ i) 'mouse-face 'mode-line-highlight
--- 709,721 ----
((= j (current-column))
(aset ruler i ruler-mode-current-column-char)
(put-text-property
! i (1+ i) 'face 'ruler-mode-current-column
ruler))
;; Show the `goal-column' marker.
((and goal-column (= j goal-column))
(aset ruler i ruler-mode-goal-column-char)
(put-text-property
! i (1+ i) 'face 'ruler-mode-goal-column
ruler)
(put-text-property
i (1+ i) 'mouse-face 'mode-line-highlight
***************
*** 707,713 ****
((= j comment-column)
(aset ruler i ruler-mode-comment-column-char)
(put-text-property
! i (1+ i) 'face 'ruler-mode-comment-column-face
ruler)
(put-text-property
i (1+ i) 'mouse-face 'mode-line-highlight
--- 727,733 ----
((= j comment-column)
(aset ruler i ruler-mode-comment-column-char)
(put-text-property
! i (1+ i) 'face 'ruler-mode-comment-column
ruler)
(put-text-property
i (1+ i) 'mouse-face 'mode-line-highlight
***************
*** 719,725 ****
((= j fill-column)
(aset ruler i ruler-mode-fill-column-char)
(put-text-property
! i (1+ i) 'face 'ruler-mode-fill-column-face
ruler)
(put-text-property
i (1+ i) 'mouse-face 'mode-line-highlight
--- 739,745 ----
((= j fill-column)
(aset ruler i ruler-mode-fill-column-char)
(put-text-property
! i (1+ i) 'face 'ruler-mode-fill-column
ruler)
(put-text-property
i (1+ i) 'mouse-face 'mode-line-highlight
***************
*** 731,737 ****
((and ruler-mode-show-tab-stops (member j tab-stop-list))
(aset ruler i ruler-mode-tab-stop-char)
(put-text-property
! i (1+ i) 'face 'ruler-mode-tab-stop-face
ruler)))
(setq i (1+ i)
j (1+ j)))
--- 751,757 ----
((and ruler-mode-show-tab-stops (member j tab-stop-list))
(aset ruler i ruler-mode-tab-stop-char)
(put-text-property
! i (1+ i) 'face 'ruler-mode-tab-stop
ruler)))
(setq i (1+ i)
j (1+ j)))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/ruler-mode.el,
Miles Bader <=