[PATCH] rename make-mode-line-mouse-map to avoid confusing gnus

Jeff Miller jmiller at cablespeed.com
Sat Nov 18 19:22:48 EST 2006


 I will be committing this shortly.

Mike - Please let me know whether this fixes the problem you saw. 

Jeff

ChangeLog addition:

2006-11-18  Jeff Miller  <jeff.miller at xemacs.org>

	* cal-compat.el (make-mode-line-mouse-map): Removed.
	* cal-compat.el (cal-make-mode-line-mouse-map): Renamed.  Using
	the original name caused Gnus to think it was runnng under Emacs
	and it attempted to use a face XEmacs does not define.
	* calendar.el (calendar-mode-line-format): use the renamed function


calendar source patch:
Diff command:   cvs -q diff -uN
Files affected: calendar.el cal-compat.el

Index: cal-compat.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/cal-compat.el,v
retrieving revision 1.1
diff -u -u -r1.1 cal-compat.el
--- cal-compat.el	2006/10/23 01:25:27	1.1
+++ cal-compat.el	2006/11/19 00:18:38
@@ -229,7 +229,7 @@
 
 ;; Available in Emacs 22 
 ;;;###autoload
-(defun make-mode-line-mouse-map (mouse function) "\
+(defun cal-make-mode-line-mouse-map (mouse function) "\
 Return a keymap with single entry for mouse key MOUSE on the mode line.
 MOUSE is defined to run function FUNCTION with no args in the buffer
 corresponding to the mode line clicked."
Index: calendar.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/calendar/calendar.el,v
retrieving revision 1.12
diff -u -u -r1.12 calendar.el
--- calendar.el	2006/11/13 04:22:12	1.12
+++ calendar.el	2006/11/19 00:18:39
@@ -2359,7 +2359,7 @@
 		"\\<calendar-mode-map>\\[scroll-calendar-left]")
 	       'help-echo "mouse-2: scroll left"
                'mouse-face 'modeline-mousable
-	       'keymap (make-mode-line-mouse-map 'button2
+	       'keymap (cal-make-mode-line-mouse-map 'button2
 						 'mouse-scroll-calendar-left))
    "Calendar"
    (concat
@@ -2368,14 +2368,14 @@
       "\\<calendar-mode-map>\\[calendar-goto-info-node] info")
      'help-echo "mouse-2: read Info on Calendar"
      'mouse-face 'modeline-mousable
-     'keymap (make-mode-line-mouse-map 'button2 'calendar-goto-info-node))
+     'keymap (cal-make-mode-line-mouse-map 'button2 'calendar-goto-info-node))
     "/"
     (propertize
      (substitute-command-keys
      "\\<calendar-mode-map>\\[calendar-other-month] other")
      'help-echo "mouse-2: choose another month"
      'mouse-face 'modeline-mousable
-     'keymap (make-mode-line-mouse-map
+     'keymap (cal-make-mode-line-mouse-map
 	      'button2 'mouse-calendar-other-month))
     "/"
     (propertize
@@ -2383,13 +2383,13 @@
      "\\<calendar-mode-map>\\[calendar-goto-today] today")
      'help-echo "mouse-2: go to today's date"
      'mouse-face 'modeline-mousable
-     'keymap (make-mode-line-mouse-map 'button2 #'calendar-goto-today)))
+     'keymap (cal-make-mode-line-mouse-map 'button2 #'calendar-goto-today)))
    '(calendar-date-string (calendar-current-date) t)
    (propertize (substitute-command-keys
 		"\\<calendar-mode-map>\\[scroll-calendar-right]")
                'help-echo "mouse-2: scroll right"
                'mouse-face 'modeline-mousable
-               'keymap (make-mode-line-mouse-map
+               'keymap (cal-make-mode-line-mouse-map
                         'button2 'mouse-scroll-calendar-right)))
   "The mode line of the calendar buffer.
 



More information about the XEmacs-Patches mailing list