diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2005-07-10 18:46:24 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2005-07-10 18:46:24 +0000 |
| commit | 10739efa6b06219e7ed4fa9fb7e2a2f27e8b9030 (patch) | |
| tree | bbc8109eb04682b082db3ef1a1fa864ee502ceff /lisp/ediff-ptch.el | |
| parent | 3ae39f1b761e1a33950d59d1f971dee3492c22b0 (diff) | |
| download | emacs-10739efa6b06219e7ed4fa9fb7e2a2f27e8b9030.tar.gz | |
* viper-cmd.el (viper--key-maps): new variable.
(viper-normalize-minor-mode-map-alist): use viper--key-maps and
emulation-mode-map-alists.
(viper-envelop-ESC-key): use viper-subseq.
(viper-search-forward/backward/next): disable debug-on-error.
* viper-keym.el (viper-toggle-key,viper-quoted-insert-key,
viper-ESC-key): new defcustoms.
* viper-macs.el (ex-map-read-args): use viper-subseq.
* viper-util.el (viper-key-to-emacs-key): use viper-subseq.
(viper-subseq): copy of subseq from cl.el.
* viper.el (viper-go-away,viper-set-hooks): use
emulation-mode-map-alists, advise self-insert-command, add-minor-mode.
* viper-mous.el (viper-current-frame-saved): use defvar.
* viper-init.el: got rid of -face in face names.
* ediff-diff.el (ediff-extract-diffs,ediff-extract-diffs3):
Make it work with longlines mode
* ediff-mult.el (ediff-meta-mode-hook): new variable.
* ediff-ptch.el (ediff-file-name-sans-prefix): quote regexp.
* ediff-init: got rid of -face in face names.
Diffstat (limited to 'lisp/ediff-ptch.el')
| -rw-r--r-- | lisp/ediff-ptch.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/ediff-ptch.el b/lisp/ediff-ptch.el index 45b214c0cb3..9176a38c2c9 100644 --- a/lisp/ediff-ptch.el +++ b/lisp/ediff-ptch.el @@ -163,7 +163,7 @@ program." ;; returns /dev/null, if can't strip prefix (defsubst ediff-file-name-sans-prefix (filename prefix) (save-match-data - (if (string-match (concat "^" prefix) filename) + (if (string-match (concat "^" (regexp-quote prefix)) filename) (substring filename (match-end 0)) (concat "/null/" filename)))) |