From 2fcaee47a419d668b304d75f7511f2090c6736be Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kai=20Gro=C3=9Fjohann?= Date: Sun, 30 May 2004 21:00:53 +0000 Subject: [PATCH] Sync with Tramp. (tramp-let-maybe): ReportReverse args of `get'. (tramp-let-maybe): Move to an earlier spot in the file. Patch by Andreas Schwab. --- lisp/ChangeLog | 7 +++++++ lisp/net/tramp.el | 20 ++++++++++---------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d23005ed0bd..dc5913c467c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2004-05-30 Kai Grossjohann + Sync with Tramp. + + * net/tramp.el (tramp-let-maybe): ReportReverse args of `get'. + (tramp-let-maybe): Move to an earlier spot in the file. Patch by + Andreas Schwab. + 2004-05-30 Andreas Schwab * dired.el (dired-get-filename): Don't use dired-re-dot. diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 1350774dbaa..769ad3f51f6 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -1885,6 +1885,16 @@ If VAR is nil, then we bind `v' to the structure and `multi-method', ;; To be activated for debugging containing this macro (def-edebug-spec with-parsed-tramp-file-name t) +(defmacro tramp-let-maybe (variable value &rest body) + "Let-bind VARIABLE to VALUE in BODY, but only if VARIABLE is not obsolete. +BODY is executed whether or not the variable is obsolete. +The intent is to protect against `obsolete variable' warnings." + `(if (get ',variable 'byte-obsolete-variable) + (progn ,@body) + (let ((,variable ,value)) + ,@body))) +(put 'tramp-let-maybe 'lisp-indent-function 2) + ;;; Config Manipulation Functions: (defun tramp-set-completion-function (method function-list) @@ -6790,16 +6800,6 @@ exiting if process is running." (funcall (symbol-function 'process-kill-without-query) process flag))) -(defmacro tramp-let-maybe (variable value &rest body) - "Let-bind VARIABLE to VALUE in BODY, but only if VARIABLE is not obsolete. -BODY is executed whether or not the variable is obsolete. -The intent is to protect against `obsolete variable' warnings." - `(if (get 'byte-obsolete-variable ',variable) - (progn ,@body) - (let ((,variable ,value)) - ,@body))) -(put 'tramp-let-maybe 'lisp-indent-function 2) - ;; ------------------------------------------------------------ ;; -- Kludges section -- -- 2.39.5