From e824431077fcab5a2d577197c3758f91970acd94 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sun, 8 Nov 2009 10:45:22 +0000 Subject: [PATCH] * net/trampver.el: Update release number. --- lisp/ChangeLog | 18 ++++++++++++++++++ lisp/net/trampver.el | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c150a2084d..aa45dbc1c6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,21 @@ +2009-11-08 Michael Albinus + + * net/tramp.el (tramp-advice-make-auto-save-file-name) + (tramp-advice-file-expand-wildcards): Unload via + `ad-remove-advice'. + + * net/trampver.el: Update release number. + +2009-11-08 Kevin Ryde + + * net/tramp.el (tramp-advice-file-expand-wildcards): Don't rely on + `ad-do-it'. + +2009-11-08 Andr (tiny change) + + * net/tramp.el (tramp-handle-write-region): Copy but rename temp file, + in order to keep context in SELinux. + 2009-11-08 Chong Yidong * dired-aux.el (dired-query): Place cursor in echo area and allow diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el index 2a373a1a7d..aa48e3004a 100644 --- a/lisp/net/trampver.el +++ b/lisp/net/trampver.el @@ -29,14 +29,14 @@ ;; "autoconf && ./configure" to change them. (X)Emacs version check is defined ;; in macro AC_EMACS_INFO of aclocal.m4; should be changed only there. -(defconst tramp-version "2.1.17" +(defconst tramp-version "2.1.18-pre" "This version of Tramp.") (defconst tramp-bug-report-address "tramp-devel@gnu.org" "Email address to send bug reports to.") ;; Check for (X)Emacs version. -(let ((x (if (or (< emacs-major-version 21) (and (featurep 'xemacs) (= emacs-major-version 21) (< emacs-minor-version 4))) (format "Tramp 2.1.17 is not fit for %s" (when (string-match "^.*$" (emacs-version)) (match-string 0 (emacs-version)))) "ok"))) +(let ((x (if (or (< emacs-major-version 21) (and (featurep 'xemacs) (= emacs-major-version 21) (< emacs-minor-version 4))) (format "Tramp 2.1.18-pre is not fit for %s" (when (string-match "^.*$" (emacs-version)) (match-string 0 (emacs-version)))) "ok"))) (unless (string-match "\\`ok\\'" x) (error "%s" x))) (provide 'trampver) -- 2.39.2