diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-06-25 23:55:15 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-06-25 23:55:15 -0700 |
| commit | 9ac6d28ab8c29547d9f9365dc8f7cea13c32ef7a (patch) | |
| tree | 026dc1d5a858b27086c4f9d8e0f4a60b7907eb80 /lisp/ruler-mode.el | |
| parent | a0e2175a9055f2ea8ae03744d495e5179885029d (diff) | |
| parent | 436550da1bf8d2cdd92a60f6ce84f131a8045062 (diff) | |
| download | emacs-9ac6d28ab8c29547d9f9365dc8f7cea13c32ef7a.tar.gz | |
Merge from emacs-24; up to 2014-06-11T19:33:14Z!rgm@gnu.org
Diffstat (limited to 'lisp/ruler-mode.el')
| -rw-r--r-- | lisp/ruler-mode.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/ruler-mode.el b/lisp/ruler-mode.el index 238754e8584..de31f2ec4ae 100644 --- a/lisp/ruler-mode.el +++ b/lisp/ruler-mode.el @@ -476,8 +476,9 @@ START-EVENT is the mouse click event." (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. @@ -753,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. - ((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 |