diff options
author | Miles Bader <miles@gnu.org> | 2001-10-09 02:53:51 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2001-10-09 02:53:51 +0000 |
commit | f4be0a12f63ede47c75e621dd46ff774699fc7d0 (patch) | |
tree | 2b118bed27d4d13469e275904294398e261e1512 | |
parent | a277229e6b95a3610a88fcd5cd6f58d99414b95f (diff) | |
download | emacs-f4be0a12f63ede47c75e621dd46ff774699fc7d0.tar.gz |
(rfn-eshadow-regexp): Deal correctly with escaped dollar-signs.
-rw-r--r-- | lisp/ChangeLog | 8 | ||||
-rw-r--r-- | lisp/rfn-eshadow.el | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a2e0f9dbe8b..d60a1b91181 100644 --- 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 c0704d269e8..a478a72f3d4 100644 --- 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.") |