diff options
author | Miles Bader <miles@gnu.org> | 2007-07-09 08:00:55 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2007-07-09 08:00:55 +0000 |
commit | 1011c48763982d02797a7058556d29f639f6efca (patch) | |
tree | 5f1b7529b4cc483b73475b89245633c5848b8a5e /lisp/ruler-mode.el | |
parent | 6f06dac7b57b8d73f4b26a855cd9862630192029 (diff) | |
parent | 69e4c7c4bacf19e9e004605fcb1c067e478beffe (diff) | |
download | emacs-1011c48763982d02797a7058556d29f639f6efca.tar.gz |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 803-805)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-227
Diffstat (limited to 'lisp/ruler-mode.el')
-rw-r--r-- | lisp/ruler-mode.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/ruler-mode.el b/lisp/ruler-mode.el index 037638e8d43..4438cb7e30b 100644 --- a/lisp/ruler-mode.el +++ b/lisp/ruler-mode.el @@ -29,7 +29,7 @@ ;;; Commentary: ;; This library provides a minor mode to display a ruler in the header -;; line. It works only on Emacs 21. +;; line. It works from Emacs 21 onwards. ;; ;; You can use the mouse to change the `fill-column' `comment-column', ;; `goal-column', `window-margins' and `tab-stop-list' settings: @@ -561,7 +561,8 @@ Call `ruler-mode-ruler-function' to compute the ruler value.") (progn ;; When `ruler-mode' is on save previous header line format ;; and install the ruler header line format. - (when (local-variable-p 'header-line-format) + (when (and (local-variable-p 'header-line-format) + (not (local-variable-p 'ruler-mode-header-line-format-old))) (set (make-local-variable 'ruler-mode-header-line-format-old) header-line-format)) (setq header-line-format ruler-mode-header-line-format) |