diff lisp/hm--html-menus/hm--html-menu.el @ 46:6a22abad6937 r19-15

Import from CVS: tag r19-15
author cvs
date Mon, 13 Aug 2007 08:55:31 +0200
parents 8b8b7f3559a2
children 131b0175ea99
line wrap: on
line diff
--- a/lisp/hm--html-menus/hm--html-menu.el	Mon Aug 13 08:55:13 2007 +0200
+++ b/lisp/hm--html-menus/hm--html-menu.el	Mon Aug 13 08:55:31 2007 +0200
@@ -1,6 +1,6 @@
 ;;;  hm--html-menu ---  A menu for the hm--html-mode.
 ;;;  
-;;;  $Id: hm--html-menu.el,v 1.5 1997/03/24 01:26:52 steve Exp $
+;;;  $Id: hm--html-menu.el,v 1.6 1997/03/26 22:42:38 steve Exp $
 ;;;
 ;;;  Copyright (C) 1993 - 1997  Heiko Muenkel
 ;;;  email: muenkel@tnt.uni-hannover.de
@@ -64,7 +64,7 @@
 	  "----"
 	  ["Ftp link..." hm--html-add-ftp-link t]
 	  ["News link..." hm--html-add-news-link t]
-	  ["Mailbox link..." hm--html-add-mail-link t]
+	  ["Mailbox link..." hm--html-add-mail-box-link t]
 	  ["Mailto link..." hm--html-add-mailto-link t]
 	  ["Wais link (direct)..." hm--html-add-direct-wais-link t]
 	  ["Wais link (gateway)..." hm--html-add-wais-link t]
@@ -312,7 +312,7 @@
 	  "----"
 	  ["Ftp link..." hm--html-add-ftp-link-to-region t]
 	  ["News link..." hm--html-add-news-link-to-region t]
-	  ["Mailbox link..." hm--html-add-mail-link-to-region t]
+	  ["Mailbox link..." hm--html-add-mail-box-link-to-region t]
 	  ["Mailto link..." hm--html-add-mailto-link-to-region t]
 	  ["WAIS link (direct)..." hm--html-add-direct-wais-link-to-region t]
 	  ["WAIS link (gateway)..." hm--html-add-wais-link-to-region t]
@@ -534,7 +534,9 @@
       (if (and current-menubar (not (assoc menu-name current-menubar)))
 	  (progn
 	    (set-buffer-menubar (copy-sequence current-menubar))
-	    (add-submenu nil (cons menu-name (cdr hm--html-pulldown-menu)) "HTML"))))
+	    (add-submenu nil
+			 (cons menu-name (cdr hm--html-pulldown-menu))
+			 "HTML"))))
 
   (defun hm--install-html-menu (menu-name)
     (if (eq major-mode 'hm--html-mode)
@@ -688,9 +690,9 @@
 				    (car menudesc) ;
 				    "==")          ;
 			      (cdr menudesc)))     ;
-	  (while (popup-menu-up-p)
+	  (while (popup-up-p)
 	    (setq event (next-command-event event))
-	    (cond ((menu-event-p event)
+	    (cond ((misc-user-event-p event)
 		   (cond
 		    ((eq (event-object event) 'abort)
 		     (signal 'quit nil))