HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove inline bytecode
[bpt/emacs.git]
/
lisp
/
ruler-mode.el
diff --git
a/lisp/ruler-mode.el
b/lisp/ruler-mode.el
index
fc62bf6
..
de31f2e
100644
(file)
--- a/
lisp/ruler-mode.el
+++ b/
lisp/ruler-mode.el
@@
-1,6
+1,6
@@
;;; ruler-mode.el --- display a ruler in the header line
;;; ruler-mode.el --- display a ruler in the header line
-;; Copyright (C) 2001-201
1
Free Software Foundation, Inc.
+;; Copyright (C) 2001-201
4
Free Software Foundation, Inc.
;; Author: David Ponce <david@dponce.com>
;; Maintainer: David Ponce <david@dponce.com>
;; Author: David Ponce <david@dponce.com>
;; Maintainer: David Ponce <david@dponce.com>
@@
-137,8
+137,8
@@
or remove a tab stop. \\[ruler-mode-toggle-show-tab-stops] or
(format "Invalid character value: %S" value))
widget))))
(format "Invalid character value: %S" value))
widget))))
-(defcustom ruler-mode-fill-column-char (if (char-displayable-p ?¶)
- ?\¶
+(defcustom ruler-mode-fill-column-char (if (char-displayable-p ?
Â
¶)
+ ?\
Â
¶
?\|)
"Character used at the `fill-column' location."
:group 'ruler-mode
?\|)
"Character used at the `fill-column' location."
:group 'ruler-mode
@@
-163,8
+163,8
@@
or remove a tab stop. \\[ruler-mode-toggle-show-tab-stops] or
(integer :tag "Integer char value"
:validate ruler-mode-character-validate)))
(integer :tag "Integer char value"
:validate ruler-mode-character-validate)))
-(defcustom ruler-mode-current-column-char (if (char-displayable-p ?¦)
- ?\¦
+(defcustom ruler-mode-current-column-char (if (char-displayable-p ?
Â
¦)
+ ?\
Â
¦
?\@)
"Character used at the `current-column' location."
:group 'ruler-mode
?\@)
"Character used at the `current-column' location."
:group 'ruler-mode
@@
-306,7
+306,6
@@
or remove a tab stop. \\[ruler-mode-toggle-show-tab-stops] or
"Return a column number relative to the selected window.
N is a column number relative to selected frame."
(- n
"Return a column number relative to the selected window.
N is a column number relative to selected frame."
(- n
- (car (window-edges))
(or (car (window-margins)) 0)
(fringe-columns 'left)
(scroll-bar-columns 'left)))
(or (car (window-margins)) 0)
(fringe-columns 'left)
(scroll-bar-columns 'left)))
@@
-321,7
+320,7
@@
START-EVENT is the mouse click event."
(when (eq start end) ;; mouse click
(save-selected-window
(select-window (posn-window start))
(when (eq start end) ;; mouse click
(save-selected-window
(select-window (posn-window start))
- (setq col (- (car (posn-col-row start))
(car (window-edges))
+ (setq col (- (car (posn-col-row start))
(scroll-bar-columns 'left))
w (- (ruler-mode-full-window-width)
(scroll-bar-columns 'left)
(scroll-bar-columns 'left))
w (- (ruler-mode-full-window-width)
(scroll-bar-columns 'left)
@@
-343,7
+342,7
@@
START-EVENT is the mouse click event."
(when (eq start end) ;; mouse click
(save-selected-window
(select-window (posn-window start))
(when (eq start end) ;; mouse click
(save-selected-window
(select-window (posn-window start))
- (setq col (- (car (posn-col-row start))
(car (window-edges))
+ (setq col (- (car (posn-col-row start))
(scroll-bar-columns 'left))
w (- (ruler-mode-full-window-width)
(scroll-bar-columns 'left)
(scroll-bar-columns 'left))
w (- (ruler-mode-full-window-width)
(scroll-bar-columns 'left)
@@
-477,8
+476,9
@@
START-EVENT is the mouse click event."
(not (member ts tab-stop-list))
(progn
(message "Tab stop set to %d" ts)
(not (member ts tab-stop-list))
(progn
(message "Tab stop set to %d" ts)
- (setq tab-stop-list (sort (cons ts tab-stop-list)
- #'<)))))))))
+ (when (null tab-stop-list)
+ (setq tab-stop-list (indent-accumulate-tab-stops (1- ts))))
+ (setq tab-stop-list (sort (cons ts tab-stop-list) #'<)))))))))
(defun ruler-mode-mouse-del-tab-stop (start-event)
"Delete tab stop at the graduation where the mouse pointer is on.
(defun ruler-mode-mouse-del-tab-stop (start-event)
"Delete tab stop at the graduation where the mouse pointer is on.
@@
-567,8
+567,10
@@
format first."
;;;###autoload
(define-minor-mode ruler-mode
;;;###autoload
(define-minor-mode ruler-mode
- "Toggle Ruler mode.
-In Ruler mode, Emacs displays a ruler in the header line."
+ "Toggle display of ruler in header line (Ruler mode).
+With a prefix argument ARG, enable Ruler mode if ARG is positive,
+and disable it otherwise. If called from Lisp, enable the mode
+if ARG is omitted or nil."
nil nil
ruler-mode-map
:group 'ruler-mode
nil nil
ruler-mode-map
:group 'ruler-mode
@@
-752,7
+754,7
@@
Optional argument PROPS specifies other text properties to apply."
i (1+ i) 'help-echo ruler-mode-fill-column-help-echo
ruler))
;; Show the `tab-stop-list' markers.
i (1+ i) 'help-echo ruler-mode-fill-column-help-echo
ruler))
;; Show the `tab-stop-list' markers.
- ((and ruler-mode-show-tab-stops (
member j tab-stop-list
))
+ ((and ruler-mode-show-tab-stops (
= j (indent-next-tab-stop (1- j))
))
(aset ruler i ruler-mode-tab-stop-char)
(put-text-property
i (1+ i) 'face 'ruler-mode-tab-stop
(aset ruler i ruler-mode-tab-stop-char)
(put-text-property
i (1+ i) 'face 'ruler-mode-tab-stop
@@
-772,7
+774,7
@@
Optional argument PROPS specifies other text properties to apply."
(provide 'ruler-mode)
;; Local Variables:
(provide 'ruler-mode)
;; Local Variables:
-;; coding:
iso-latin-1
+;; coding:
utf-8
;; End:
;;; ruler-mode.el ends here
;; End:
;;; ruler-mode.el ends here