Mercurial > emacs
diff lisp/net/eudc.el @ 91073:4bc33ffdda1a
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 902-908)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 131-137)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 261-262)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-278
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sat, 27 Oct 2007 09:12:07 +0000 |
parents | d38543a1c0f9 f873840f9fea |
children | 606f2d163a64 |
line wrap: on
line diff
--- a/lisp/net/eudc.el Sat Oct 27 00:30:50 2007 +0000 +++ b/lisp/net/eudc.el Sat Oct 27 09:12:07 2007 +0000 @@ -66,13 +66,6 @@ ;;{{{ Internal variables and compatibility tricks -(defconst eudc-xemacs-p (string-match "XEmacs" emacs-version)) -(defconst eudc-emacs-p (not eudc-xemacs-p)) -(defconst eudc-xemacs-mule-p (and eudc-xemacs-p - (featurep 'mule))) -(defconst eudc-emacs-mule-p (and eudc-emacs-p - (featurep 'mule))) - (defvar eudc-form-widget-list nil) (defvar eudc-mode-map nil) @@ -670,7 +663,7 @@ (setq major-mode 'eudc-mode) (setq mode-name "EUDC") (use-local-map eudc-mode-map) - (if eudc-emacs-p + (if (not (featurep 'xemacs)) (easy-menu-define eudc-emacs-menu eudc-mode-map "" (eudc-menu)) (setq mode-popup-menu (eudc-menu))) (run-mode-hooks 'eudc-mode-hook)) @@ -1186,9 +1179,9 @@ (defun eudc-install-menu () (cond - ((and eudc-xemacs-p (featurep 'menubar)) + ((and (featurep 'xemacs) (featurep 'menubar)) (add-submenu '("Tools") (eudc-menu))) - (eudc-emacs-p + ((not (featurep 'xemacs)) (cond ((fboundp 'easy-menu-create-menu) (define-key @@ -1236,7 +1229,7 @@ nil) ;;;###autoload -(cond ((not (string-match "XEmacs" emacs-version)) +(cond ((not (featurep 'xemacs)) (defvar eudc-tools-menu (make-sparse-keymap "Directory Search")) (fset 'eudc-tools-menu (symbol-value 'eudc-tools-menu)) (define-key eudc-tools-menu [phone] @@ -1267,7 +1260,7 @@ ["Get Email" eudc-get-email t] ["Get Phone" eudc-get-phone t]))) (if (not (featurep 'eudc-autoloads)) - (if eudc-xemacs-p + (if (featurep 'xemacs) (if (and (featurep 'menubar) (not (featurep 'infodock))) (add-submenu '("Tools") menu))