Mercurial > emacs
changeset 66850:abf023447afb
* net/tramp-util.el (top): Fix compilation warning.
| author | Michael Albinus <michael.albinus@gmx.de> |
|---|---|
| date | Sun, 13 Nov 2005 22:12:59 +0000 |
| parents | 47cf6ef66885 |
| children | 89a5e481928a |
| files | lisp/ChangeLog lisp/net/tramp-util.el |
| diffstat | 2 files changed, 48 insertions(+), 38 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sun Nov 13 21:25:13 2005 +0000 +++ b/lisp/ChangeLog Sun Nov 13 22:12:59 2005 +0000 @@ -1,3 +1,7 @@ +2005-11-13 Michael Albinus <michael.albinus@gmx.de> + + * net/tramp-util.el (top): Fix compilation warning. + 2005-11-13 Kim F. Storm <storm@cua.dk> * help.el (help-for-help-internal): Fix `a' entry. Add `d' entry.
--- a/lisp/net/tramp-util.el Sun Nov 13 21:25:13 2005 +0000 +++ b/lisp/net/tramp-util.el Sun Nov 13 22:12:59 2005 +0000 @@ -36,53 +36,59 @@ ;; specific functions, like compilation. ;; The key remapping works since Emacs 22 only. Unknown for XEmacs. -(when (fboundp 'define-minor-mode) +;; Pacify byte-compiler +(eval-when-compile + (unless (fboundp 'define-minor-mode) + (defalias 'define-minor-mode 'identity) + (defvar tramp-minor-mode)) + (unless (featurep 'xemacs) + (defalias 'add-menu-button 'identity))) - (defvar tramp-minor-mode-map (make-sparse-keymap) - "Keymap for Tramp minor mode.") +(defvar tramp-minor-mode-map (make-sparse-keymap) + "Keymap for Tramp minor mode.") - (define-minor-mode tramp-minor-mode "Tramp minor mode for utility functions." - :group 'tramp - :global nil - :init-value nil - :lighter " Tramp" - :keymap tramp-minor-mode-map - (setq tramp-minor-mode - (and tramp-minor-mode (tramp-tramp-file-p default-directory)))) +(define-minor-mode tramp-minor-mode "Tramp minor mode for utility functions." + :group 'tramp + :global nil + :init-value nil + :lighter " Tramp" + :keymap tramp-minor-mode-map + (setq tramp-minor-mode + (and tramp-minor-mode (tramp-tramp-file-p default-directory)))) - (add-hook 'find-file-hooks 'tramp-minor-mode t) - (add-hook 'dired-mode-hook 'tramp-minor-mode t) +(add-hook 'find-file-hooks 'tramp-minor-mode t) +(add-hook 'dired-mode-hook 'tramp-minor-mode t) - (defun tramp-remap-command (old-command new-command) - "Replaces bindings of OLD-COMMAND by NEW-COMMAND. +(defun tramp-remap-command (old-command new-command) + "Replaces bindings of OLD-COMMAND by NEW-COMMAND. If remapping functionality for keymaps is defined, this happens for all bindings. Otherwise, only bindings active during invocation are taken into account. XEmacs menubar bindings are not changed by this." - (if (functionp 'command-remapping) - ;; Emacs 22 - (eval - `(define-key tramp-minor-mode-map [remap ,old-command] new-command)) - ;; previous Emacs versions. - (mapcar - '(lambda (x) - (define-key tramp-minor-mode-map x new-command)) - (where-is-internal old-command)))) + (if (functionp 'command-remapping) + ;; Emacs 22 + (eval + `(define-key tramp-minor-mode-map [remap ,old-command] new-command)) + ;; previous Emacs versions. + (mapcar + '(lambda (x) + (define-key tramp-minor-mode-map x new-command)) + (where-is-internal old-command)))) - (tramp-remap-command 'compile 'tramp-compile) - (tramp-remap-command 'recompile 'tramp-recompile) +(tramp-remap-command 'compile 'tramp-compile) +(tramp-remap-command 'recompile 'tramp-recompile) - ;; XEmacs has an own mimic for menu entries - (when (fboundp 'add-menu-button) - (funcall 'add-menu-button - '("Tools" "Compile") - ["Compile..." - (command-execute (if tramp-minor-mode 'tramp-compile 'compile)) - :active (fboundp 'compile)]) - (funcall 'add-menu-button - '("Tools" "Compile") - ["Repeat Compilation" - (command-execute (if tramp-minor-mode 'tramp-recompile 'recompile)) - :active (fboundp 'compile)]))) +;; XEmacs has an own mimic for menu entries +(when (fboundp 'add-menu-button) + (funcall 'add-menu-button + '("Tools" "Compile") + ["Compile..." + (command-execute (if tramp-minor-mode 'tramp-compile 'compile)) + :active (fboundp 'compile)]) + (funcall 'add-menu-button + '("Tools" "Compile") + ["Repeat Compilation" + (command-execute (if tramp-minor-mode 'tramp-recompile 'recompile)) + :active (fboundp 'compile)])) ;; Utility functions.