* net/trampver.el: Update release number.

2 files changed, 20 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c150a2084d8..aa45dbc1c68 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,21 @@
+2009-11-08  Michael Albinus  <michael.albinus@gmx.de>
+
+        * 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 <user42@zip.com.au>
+
+        * net/tramp.el (tramp-advice-file-expand-wildcards): Don't rely on
+        `ad-do-it'.
+
+2009-11-08  Andr <m00naticus@gmail.com>  (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  <cyd@stupidchicken.com>
 
         * 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 2a373a1a7d4..aa48e3004af 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)