Remove directory-sep-char, obsolete since 21.1.

* lisp/subr.el (directory-sep-char): Remove obsolete variable.
* lisp/net/tramp-compat.el: Don't mess about with the byte-compiler unless
it is "necessary".

* doc/lispref/files.texi (File Name Components): Remove ignored
section about deleted variable directory-sep-char.

* etc/NEWS: Mention above change.

6 files changed, 19 insertions, 27 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index e49fe5fc3d8..284c0f2b954 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-03  Glenn Morris  <rgm@gnu.org>
+
+	* files.texi (File Name Components): Remove ignored section about
+	deleted variable directory-sep-char.
+
 2010-10-03  Michael Albinus  <michael.albinus@gmx.de>
 
 	* files.texi (Magic File Names): New defopt
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index 333e60e3df2..2b539f00975 100644
--- a/doc/lispref/files.texi
+++ b/doc/lispref/files.texi
@@ -1758,20 +1758,6 @@ Note that the @samp{.~3~} in the two last examples is the backup part,
 not an extension.
 @end defun
 
-@ignore
-Andrew Innes says that this
-
-@c @defvar directory-sep-char
-This variable holds the character that Emacs normally uses to separate
-file name components.  The default value is @code{?/}, but on MS-Windows
-you can set it to @code{?\\}; then the functions that transform file names
-use backslashes in their output.
-
-File names using backslashes work as input to Lisp primitives even on
-MS-DOS and MS-Windows, even if @code{directory-sep-char} has its default
-value of @code{?/}.
-@end defvar
-@end ignore
 
 @node Relative File Names
 @subsection Absolute and Relative File Names
diff --git a/etc/NEWS b/etc/NEWS
index ab43c2784dd..2abbda30025 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -559,7 +559,7 @@ make-local-hook
 
 ** The following variables and aliases, obsolete since at least Emacs 21.1,
 have been removed:
-checkdoc-minor-keymap, vc-header-alist
+checkdoc-minor-keymap, vc-header-alist, directory-sep-char
 
 
 * Lisp changes in Emacs 24.1
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 741ef0d5e0c..e220416a4af 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2010-10-03  Glenn Morris  <rgm@gnu.org>
 
+	* subr.el (directory-sep-char): Remove obsolete variable.
+	* net/tramp-compat.el: Don't mess about with the byte-compiler unless
+	it is "necessary".
+
 	* vc/vc-hooks.el (vc-header-alist): Remove obsolete variable.
 	* vc/vc.el (vc-static-header-alist): Doc fix.
 	* vc/vc-cvs.el (vc-cvs-header):
diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el
index afbaa8064dc..0a7502399f6 100644
--- a/lisp/net/tramp-compat.el
+++ b/lisp/net/tramp-compat.el
@@ -88,13 +88,15 @@
   ;; `directory-sep-char' is an obsolete variable in Emacs.  But it is
   ;; used in XEmacs, so we set it here and there.  The following is
   ;; needed to pacify Emacs byte-compiler.
-  (unless (boundp 'byte-compile-not-obsolete-var)
-    (defvar byte-compile-not-obsolete-var nil))
-  (setq byte-compile-not-obsolete-var 'directory-sep-char)
-  ;; Emacs 23.2.
-  (unless (boundp 'byte-compile-not-obsolete-vars)
-    (defvar byte-compile-not-obsolete-vars nil))
-  (setq byte-compile-not-obsolete-vars '(directory-sep-char))
+  ;; Note that it was removed altogether in Emacs 24.1.
+  (when (boundp 'directory-sep-char)
+    (unless (boundp 'byte-compile-not-obsolete-var)
+      (defvar byte-compile-not-obsolete-var nil))
+    (setq byte-compile-not-obsolete-var 'directory-sep-char)
+    ;; Emacs 23.2.
+    (unless (boundp 'byte-compile-not-obsolete-vars)
+      (defvar byte-compile-not-obsolete-vars nil))
+    (setq byte-compile-not-obsolete-vars '(directory-sep-char)))
 
   ;; `remote-file-name-inhibit-cache' has been introduced with Emacs 24.1.
   ;; Besides `t', `nil', and integer, we use also timestamps (as
diff --git a/lisp/subr.el b/lisp/subr.el
index 2dcc37863c7..484340895be 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1092,11 +1092,6 @@ is converted into a string by expressing it in decimal."
 (make-obsolete 'process-filter-multibyte-p nil "23.1")
 (make-obsolete 'set-process-filter-multibyte nil "23.1")
 
-(defconst directory-sep-char ?/
-  "Directory separator character for built-in functions that return file names.
-The value is always ?/.")
-(make-obsolete-variable 'directory-sep-char "do not use it, just use `/'." "21.1")
-
 (make-obsolete-variable
  'mode-line-inverse-video
  "use the appropriate faces instead."