[Emacs-diffs] Changes to emacs/lisp/rfn-eshadow.el

[Miles Bader]

Index: emacs/lisp/rfn-eshadow.el
diff -c emacs/lisp/rfn-eshadow.el:1.8 emacs/lisp/rfn-eshadow.el:1.9
*** emacs/lisp/rfn-eshadow.el:1.8       Wed May  8 03:56:59 2002
--- emacs/lisp/rfn-eshadow.el   Sun Aug 25 04:25:00 2002
***************
*** 3,9 ****
  ;; Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
  ;;
  ;; Author: Miles Bader <address@hidden>
! ;; Keywords: convenience
  
  ;; This file is part of GNU Emacs.
  
--- 3,9 ----
  ;; Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
  ;;
  ;; Author: Miles Bader <address@hidden>
! ;; Keywords: convenience minibuffer
  
  ;; This file is part of GNU Emacs.
  
***************
*** 24,39 ****
  
  ;;; Commentary:
  ;;
! ;; Defines the mode `read-file-name-electric-shadow-mode'.
  ;;
  ;; The `read-file-name' function passes its result through
  ;; `substitute-in-file-name', so any part of the string preceding
  ;; multiple slashes (or a drive indicator on MS-DOS/MS-Windows) is
  ;; ignored.
  ;;
! ;; If `read-file-name-electric-shadow-mode' is active, any part of the
  ;; minibuffer text that would be ignored because of this is given the
! ;; properties in `read-file-name-electric-shadow-properties', which may
  ;; be used to make the ignored text invisible, dim, etc.
  ;;
  
--- 24,39 ----
  
  ;;; Commentary:
  ;;
! ;; Defines the mode `file-name-shadow-mode'.
  ;;
  ;; The `read-file-name' function passes its result through
  ;; `substitute-in-file-name', so any part of the string preceding
  ;; multiple slashes (or a drive indicator on MS-DOS/MS-Windows) is
  ;; ignored.
  ;;
! ;; If `file-name-shadow-mode' is active, any part of the
  ;; minibuffer text that would be ignored because of this is given the
! ;; properties in `file-name-shadow-properties', which may
  ;; be used to make the ignored text invisible, dim, etc.
  ;;
  
***************
*** 42,48 ****
  
  ;;; Customization
  
! (defconst read-file-name-electric-shadow-properties-custom-type
    '(list
      (checklist :inline t
               (const :tag "Invisible"
--- 42,48 ----
  
  ;;; Customization
  
! (defconst file-name-shadow-properties-custom-type
    '(list
      (checklist :inline t
               (const :tag "Invisible"
***************
*** 55,61 ****
                     :tag "Face"
                     :doc "Display shadowed part of filename using a different 
face"
                     (const :format "" face)
!                    (face :value read-file-name-electric-shadow))
               (list :inline t
                     :format "%t: %v%h"
                     :tag "Brackets"
--- 55,61 ----
                     :tag "Face"
                     :doc "Display shadowed part of filename using a different 
face"
                     (const :format "" face)
!                    (face :value file-name-shadow))
               (list :inline t
                     :format "%t: %v%h"
                     :tag "Brackets"
***************
*** 93,123 ****
                  (sexp :tag "Value")))))
  
  ;;;###autoload
! (defcustom read-file-name-electric-shadow-properties
!   '(face read-file-name-electric-shadow field shadow)
    "Properties given to the `shadowed' part of a filename in the minibuffer.
! Only used when `read-file-name-electric-shadow-mode' is active.
  If emacs is not running under a window system,
! `read-file-name-electric-shadow-tty-properties' is used instead."
!   :type read-file-name-electric-shadow-properties-custom-type
    :group 'minibuffer)
  
  ;;;###autoload
! (defcustom read-file-name-electric-shadow-tty-properties
    '(before-string "{" after-string "} " field shadow)
    "Properties given to the `shadowed' part of a filename in the minibuffer.
! Only used when `read-file-name-electric-shadow-mode' is active and emacs
  is not running under a window-system; if emacs is running under a window
! system, `read-file-name-electric-shadow-properties' is used instead."
!   :type read-file-name-electric-shadow-properties-custom-type
    :group 'minibuffer)
  
! (defface read-file-name-electric-shadow
    '((((background dark))
       :foreground "grey50")
      (t
       :foreground "grey70"))
!   "Face used by `read-file-name-electric-shadow-mode' for the shadow."
    :group 'minibuffer)
  
  
--- 93,133 ----
                  (sexp :tag "Value")))))
  
  ;;;###autoload
! (defcustom file-name-shadow-properties
!   '(face file-name-shadow field shadow)
    "Properties given to the `shadowed' part of a filename in the minibuffer.
! Only used when `file-name-shadow-mode' is active.
  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
    '(before-string "{" after-string "} " field shadow)
    "Properties given to the `shadowed' part of a filename in the minibuffer.
! Only used when `file-name-shadow-mode' is active and emacs
  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"))
!   "Face used by `file-name-shadow-mode' for the shadow."
    :group 'minibuffer)
  
  
***************
*** 150,156 ****
  
  ;; This function goes on minibuffer-setup-hook
  (defun rfn-eshadow-setup-minibuffer ()
!   "Set up a minibuffer for `read-file-name-electric-shadow-mode'.
  The prompt and initial input should already have been inserted."
    (when minibuffer-completing-file-name
      (setq rfn-eshadow-overlay
--- 160,166 ----
  
  ;; This function goes on minibuffer-setup-hook
  (defun rfn-eshadow-setup-minibuffer ()
!   "Set up a minibuffer for `file-name-shadow-mode'.
  The prompt and initial input should already have been inserted."
    (when minibuffer-completing-file-name
      (setq rfn-eshadow-overlay
***************
*** 158,165 ****
      ;; Give rfn-eshadow-overlay the user's props.
      (let ((props
           (if window-system
!              read-file-name-electric-shadow-properties
!            read-file-name-electric-shadow-tty-properties)))
        (while props
        (overlay-put rfn-eshadow-overlay (pop props) (pop props))))
      ;; Turn on overlay evaporation so that we don't have to worry about
--- 168,175 ----
      ;; Give rfn-eshadow-overlay the user's props.
      (let ((props
           (if window-system
!              file-name-shadow-properties
!            file-name-shadow-tty-properties)))
        (while props
        (overlay-put rfn-eshadow-overlay (pop props) (pop props))))
      ;; Turn on overlay evaporation so that we don't have to worry about
***************
*** 174,180 ****
  (defun rfn-eshadow-update-overlay ()
    "Update `rfn-eshadow-overlay' to cover shadowed part of minibuffer input.
  This is intended to be used as a minibuffer post-command-hook for
! `read-file-name-electric-shadow-mode'; the minibuffer should have already
  been set up by `rfn-eshadow-setup-minibuffer'."
    ;; This is not really a correct implementation; it won't always do the
    ;; right thing in the presence of environment variables that
--- 184,190 ----
  (defun rfn-eshadow-update-overlay ()
    "Update `rfn-eshadow-overlay' to cover shadowed part of minibuffer input.
  This is intended to be used as a minibuffer post-command-hook for
! `file-name-shadow-mode'; the minibuffer should have already
  been set up by `rfn-eshadow-setup-minibuffer'."
    ;; This is not really a correct implementation; it won't always do the
    ;; right thing in the presence of environment variables that
***************
*** 196,214 ****
  ;;; associated variable is non-nil, which requires that all needed
  ;;; functions be already defined.  [This is arguably a bug in d-m-m]
  ;;;###autoload
! (define-minor-mode read-file-name-electric-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
! `read-file-name-electric-shadow-properties', which can be used to make
  that portion dim, invisible, or otherwise less visually noticeable.
  
  With prefix argument ARG, turn on if positive, otherwise off.
  Returns non-nil if the new state is enabled."
    :global t
    :group 'minibuffer
!   (if read-file-name-electric-shadow-mode
        ;; Enable the mode
        (add-hook 'minibuffer-setup-hook 'rfn-eshadow-setup-minibuffer)
      ;; Disable the mode
--- 206,224 ----
  ;;; associated variable is non-nil, which requires that all needed
  ;;; 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
! `file-name-shadow-properties', which can be used to make
  that portion dim, invisible, or otherwise less visually noticeable.
  
  With prefix argument ARG, turn on if positive, otherwise off.
  Returns non-nil if the new state is enabled."
    :global t
    :group 'minibuffer
!   (if file-name-shadow-mode
        ;; Enable the mode
        (add-hook 'minibuffer-setup-hook 'rfn-eshadow-setup-minibuffer)
      ;; Disable the mode
***************
*** 218,223 ****
--- 228,241 ----
        (with-current-buffer minibuf
        (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)