Merge from gnus--rel--5.10

[bpt/emacs.git] / lisp / ruler-mode.el

diff --git a/lisp/ruler-mode.el b/lisp/ruler-mode.el
index 9e85b78..10d05da 100644 (file)
--- a/lisp/ruler-mode.el
+++ b/lisp/ruler-mode.el
@@ -1,6 +1,7 @@
 ;;; ruler-mode.el --- display a ruler in the header line
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: David Ponce <david@dponce.com>
 ;; Maintainer: David Ponce <david@dponce.com>
@@ -22,8 +23,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -221,8 +222,6 @@ or remove a tab stop.  \\[ruler-mode-toggle-show-tab-stops] or
                )))
   "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))
@@ -235,8 +234,6 @@ or remove a tab stop.  \\[ruler-mode-toggle-show-tab-stops] or
                )))
   "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
@@ -245,8 +242,6 @@ or remove a tab stop.  \\[ruler-mode-toggle-show-tab-stops] or
                )))
   "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
@@ -255,8 +250,6 @@ or remove a tab stop.  \\[ruler-mode-toggle-show-tab-stops] or
                )))
   "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
@@ -265,8 +258,6 @@ or remove a tab stop.  \\[ruler-mode-toggle-show-tab-stops] or
                )))
   "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
@@ -275,8 +266,6 @@ or remove a tab stop.  \\[ruler-mode-toggle-show-tab-stops] or
                )))
   "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
@@ -285,8 +274,6 @@ or remove a tab stop.  \\[ruler-mode-toggle-show-tab-stops] or
                )))
   "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
@@ -295,8 +282,6 @@ or remove a tab stop.  \\[ruler-mode-toggle-show-tab-stops] or
                )))
   "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
@@ -305,8 +290,6 @@ or remove a tab stop.  \\[ruler-mode-toggle-show-tab-stops] or
                )))
   "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
@@ -316,8 +299,6 @@ or remove a tab stop.  \\[ruler-mode-toggle-show-tab-stops] or
                )))
   "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)
 \f
 
 (defsubst ruler-mode-full-window-width ()
@@ -546,6 +527,16 @@ START-EVENT is the mouse click event."
       #'ruler-mode-mouse-del-tab-stop)
     (define-key km [header-line (control down-mouse-2)]
       #'ruler-mode-toggle-show-tab-stops)
+    (define-key km [header-line (shift mouse-1)]
+      'ignore)
+    (define-key km [header-line (shift mouse-3)]
+      'ignore)
+    (define-key km [header-line (control mouse-1)]
+      'ignore)
+    (define-key km [header-line (control mouse-3)]
+      'ignore)
+    (define-key km [header-line (control mouse-2)]
+      'ignore)
     km)
   "Keymap for ruler minor mode.")