# HG changeset patch # User Kai Grojohann # Date 1085950853 0 # Node ID dc60eb9fbbdcbdbc56195ad662a6b1e355778bbf # Parent ac44232c68e12f44579500fd5d39fb25870c47f4 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. diff -r ac44232c68e1 -r dc60eb9fbbdc lisp/ChangeLog --- a/lisp/ChangeLog Sun May 30 18:24:08 2004 +0000 +++ b/lisp/ChangeLog Sun May 30 21:00:53 2004 +0000 @@ -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 -r ac44232c68e1 -r dc60eb9fbbdc lisp/net/tramp.el --- a/lisp/net/tramp.el Sun May 30 18:24:08 2004 +0000 +++ b/lisp/net/tramp.el Sun May 30 21:00:53 2004 +0000 @@ -1885,6 +1885,16 @@ ;; 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 @@ (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 --