diff options
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/eudc-bob.el | 39 | ||||
| -rw-r--r-- | lisp/net/eudc-hotlist.el | 10 | ||||
| -rw-r--r-- | lisp/net/eudc.el | 17 | ||||
| -rw-r--r-- | lisp/net/eudcb-ph.el | 2 |
4 files changed, 30 insertions, 38 deletions
diff --git a/lisp/net/eudc-bob.el b/lisp/net/eudc-bob.el index f3b9baa13bc..1ba6f4a0927 100644 --- a/lisp/net/eudc-bob.el +++ b/lisp/net/eudc-bob.el @@ -149,7 +149,7 @@ display a button." "Toggle inline display of an image." (interactive) (when (eudc-bob-can-display-inline-images) - (cond (eudc-xemacs-p + (cond ((featurep 'xemacs) (let ((overlays (append (overlays-at (1- (point))) (overlays-at (point)))) overlay glyph) @@ -266,7 +266,7 @@ display a button." (interactive "@e") (run-hooks 'activate-menubar-hook) (eudc-jump-to-event event) - (if eudc-xemacs-p + (if (featurep 'xemacs) (progn (run-hooks 'activate-popup-menu-hook) (popup-menu (eudc-bob-menu))) @@ -282,7 +282,7 @@ display a button." (let ((map (make-sparse-keymap))) (define-key map "s" 'eudc-bob-save-object) (define-key map "!" 'eudc-bob-pipe-object-to-external-program) - (define-key map (if eudc-xemacs-p + (define-key map (if (featurep 'xemacs) [button3] [down-mouse-3]) 'eudc-bob-popup-menu) map)) @@ -295,7 +295,7 @@ display a button." (setq eudc-bob-sound-keymap (let ((map (make-sparse-keymap))) (define-key map [return] 'eudc-bob-play-sound-at-point) - (define-key map (if eudc-xemacs-p + (define-key map (if (featurep 'xemacs) [button2] [down-mouse-2]) 'eudc-bob-play-sound-at-mouse) map)) @@ -303,7 +303,7 @@ display a button." (setq eudc-bob-url-keymap (let ((map (make-sparse-keymap))) (define-key map [return] 'browse-url-at-point) - (define-key map (if eudc-xemacs-p + (define-key map (if (featurep 'xemacs) [button2] [down-mouse-2]) 'browse-url-at-mouse) map)) @@ -311,7 +311,7 @@ display a button." (setq eudc-bob-mail-keymap (let ((map (make-sparse-keymap))) (define-key map [return] 'goto-address-at-point) - (define-key map (if eudc-xemacs-p + (define-key map (if (featurep 'xemacs) [button2] [down-mouse-2]) 'goto-address-at-mouse) map)) @@ -319,20 +319,19 @@ display a button." (set-keymap-parent eudc-bob-image-keymap eudc-bob-generic-keymap) (set-keymap-parent eudc-bob-sound-keymap eudc-bob-generic-keymap) -(if eudc-emacs-p - (progn - (easy-menu-define eudc-bob-generic-menu - eudc-bob-generic-keymap - "" - eudc-bob-generic-menu) - (easy-menu-define eudc-bob-image-menu - eudc-bob-image-keymap - "" - eudc-bob-image-menu) - (easy-menu-define eudc-bob-sound-menu - eudc-bob-sound-keymap - "" - eudc-bob-sound-menu))) +(when (not (featurep 'xemacs)) + (easy-menu-define eudc-bob-generic-menu + eudc-bob-generic-keymap + "" + eudc-bob-generic-menu) + (easy-menu-define eudc-bob-image-menu + eudc-bob-image-keymap + "" + eudc-bob-image-menu) + (easy-menu-define eudc-bob-sound-menu + eudc-bob-sound-keymap + "" + eudc-bob-sound-menu)) ;;;###autoload (defun eudc-display-generic-binary (data) diff --git a/lisp/net/eudc-hotlist.el b/lisp/net/eudc-hotlist.el index 2914ebdc1b0..5308bb2db1f 100644 --- a/lisp/net/eudc-hotlist.el +++ b/lisp/net/eudc-hotlist.el @@ -190,11 +190,11 @@ These are the special commands of this mode: ["Save and Quit" eudc-hotlist-quit-edit t] ["Exit without Saving" kill-this-buffer t])) -(if eudc-emacs-p - (easy-menu-define eudc-hotlist-emacs-menu - eudc-hotlist-mode-map - "" - eudc-hotlist-menu)) +(when (not (featurep 'xemacs)) + (easy-menu-define eudc-hotlist-emacs-menu + eudc-hotlist-mode-map + "" + eudc-hotlist-menu)) ;;; arch-tag: 9b633ab3-6a6e-4b46-b12e-d96739a7e0e8 ;;; eudc-hotlist.el ends here diff --git a/lisp/net/eudc.el b/lisp/net/eudc.el index 0f300c20736..f43b37187f7 100644 --- a/lisp/net/eudc.el +++ b/lisp/net/eudc.el @@ -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 @@ These are the special commands of EUDC mode: (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 @@ queries the server for the existing fields and displays a corresponding form." (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 @@ This does nothing except loading eudc by autoload side-effect." 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 @@ This does nothing except loading eudc by autoload side-effect." ["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)) diff --git a/lisp/net/eudcb-ph.el b/lisp/net/eudcb-ph.el index 373b015b07e..5fed37f90a1 100644 --- a/lisp/net/eudcb-ph.el +++ b/lisp/net/eudcb-ph.el @@ -179,7 +179,7 @@ SERVER is either a string naming the server or a list (NAME PORT)." (set-buffer eudc-ph-process-buffer) (erase-buffer) (setq eudc-ph-read-point (point)) - (and eudc-xemacs-mule-p + (and (featurep 'xemacs) (featurep 'mule) (set-buffer-file-coding-system 'binary t))) (setq process (open-network-stream "ph" eudc-ph-process-buffer host port)) (if (null process) |