(rfn-eshadow-regexp): Deal correctly with escaped dollar-signs.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a2e0f9dbe8b43578b5680f7c73427dad50c1d61e..d60a1b9118154ef68409fd64ccbc7778838e69a2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,13 @@
 2001-10-09  Miles Bader  <miles@gnu.org>
 
+       * rfn-eshadow.el (rfn-eshadow-regexp): Deal correctly with escaped
+       dollar-signs.
+
+       * comint.el (comint-insert-previous-argument): New function.
+       (comint-mode-map): Bind `C-c .' to `comint-input-previous-argument'.
+       (comint-insert-previous-argument-last-start-pos) 
+       (comint-insert-previous-argument-last-index): New variables.
+
        * apropos.el (apropos-next-label-button): Use the presence of a
        `apropos-label' property to detect label buttons.
 

diff --git a/lisp/rfn-eshadow.el b/lisp/rfn-eshadow.el
index c0704d269e8b547c2a228e2653ba4fc3ef7793d3..a478a72f3d4a8da4fff0ae0d331bf386114e5955 100644 (file)
--- a/lisp/rfn-eshadow.el
+++ b/lisp/rfn-eshadow.el
@@ -129,10 +129,10 @@ system, `read-file-name-electric-shadow-properties' is used instead."
         ;; This horrible regexp considers the following patterns as
         ;; starting an absolute pathname, when following a `/' or an `\':
         ;;   L:  /  //  ~  $  \\  \\\\
-        "\\(.*[^/]+/+?\\|/*?\\|\\)\\([$~]\\|[][\\^a-z]:\\|//?\\([^][\\^a-z/$~]\\|[^/$~][^:]\\|[^/$~]?\\'\\)\\)")
+        "\\(.*[^/]+/+?\\|/*?\\|\\)\\(~\\|$[^$]\\|$\\'\\|[][\\^a-z]:\\|//?\\([^][\\^a-z/$~]\\|[^/$~][^:]\\|[^/$~]?\\'\\)\\)")
        (t
         ;; default is for unix-style filenames
-        "\\(.*/\\)[/$~]"))
+        "\\(.*/\\)\\([/~]\\|$[^$]\\|$\\'\\)"))
   "Regular expression used to match shadowed filenames.
 There should be at least one regexp group; the end of the first one
 is used as the end of the shadowed portion of the filename.")