(Frename_file): Undo last change: no need to ifdef away

[bpt/emacs.git] / lisp / rfn-eshadow.el

diff --git a/lisp/rfn-eshadow.el b/lisp/rfn-eshadow.el
index 9951929..8473111 100644 (file)
--- a/lisp/rfn-eshadow.el
+++ b/lisp/rfn-eshadow.el
@@ -101,11 +101,6 @@ If emacs is not running under a window system,
 `file-name-shadow-tty-properties' is used instead."
   :type file-name-shadow-properties-custom-type
   :group 'minibuffer)
-;; backwards compatibility
-(make-obsolete-variable 'read-file-name-electric-shadow-properties
-                       'file-name-shadow-properties "21.4")
-(defvaralias 'read-file-name-electric-shadow-properties
-  'file-name-shadow-properties)
 
 ;;;###autoload
 (defcustom file-name-shadow-tty-properties
@@ -116,17 +111,9 @@ is not running under a window-system; if emacs is running under a window
 system, `file-name-shadow-properties' is used instead."
   :type file-name-shadow-properties-custom-type
   :group 'minibuffer)
-;; backwards compatibility
-(make-obsolete-variable 'read-file-name-electric-shadow-tty-properties
-                       'file-name-shadow-tty-properties "21.4")
-(defvaralias 'read-file-name-electric-shadow-tty-properties
-  'file-name-shadow-tty-properties)
 
 (defface file-name-shadow
-  '((((background dark))
-     :foreground "grey50")
-    (t
-     :foreground "grey70"))
+  '((t :inherit shadow))
   "Face used by `file-name-shadow-mode' for the shadow."
   :group 'minibuffer)
 
@@ -207,10 +194,10 @@ been set up by `rfn-eshadow-setup-minibuffer'."
 ;;; functions be already defined.  [This is arguably a bug in d-m-m]
 ;;;###autoload
 (define-minor-mode file-name-shadow-mode
-  "Toggle Read-File-Name Electric Shadow mode.
-When active, any part of the filename being read in the minibuffer
-that would be ignored because the result is passed through
-`substitute-in-file-name' is given the properties in
+  "Toggle File-Name Shadow mode.
+When active, any part of a filename being read in the minibuffer
+that would be ignored (because the result is passed through
+`substitute-in-file-name') is given the properties in
 `file-name-shadow-properties', which can be used to make
 that portion dim, invisible, or otherwise less visually noticeable.
 
@@ -229,15 +216,8 @@ Returns non-nil if the new state is enabled."
        (remove-hook 'post-command-hook #'rfn-eshadow-update-overlay t)))
     (setq rfn-eshadow-frobbed-minibufs nil)))
 
-;; backwards compatibility
-(make-obsolete 'read-file-name-electric-shadow-mode 'file-name-shadow-mode
-              "21.4")
-(defalias 'read-file-name-electric-shadow-mode 'file-name-shadow-mode)
-(make-obsolete-variable 'read-file-name-electric-shadow-mode
-                       'file-name-shadow-mode "21.4")
-(defvaralias 'read-file-name-electric-shadow-mode 'file-name-shadow-mode)
-
 
 (provide 'rfn-eshadow)
 
+;;; arch-tag: dcf70a52-0115-4ec2-b1e3-4f8d3541a888
 ;;; rfn-eshadow.el ends here