diff options
| author | Kenichi Handa <handa@m17n.org> | 2012-03-19 13:17:50 +0900 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2012-03-19 13:17:50 +0900 |
| commit | 4ebb358f29e64094871ad6d35fb365d77c17047d (patch) | |
| tree | cfc5c5055207bd4e5995a12ca292d16939a9efdb /lisp/progmodes/perl-mode.el | |
| parent | 4827f94e1725c34d4b19d79f4c74f16a0dc3b0cb (diff) | |
| parent | e50a24a249e1bfd69af7e48ea5076cac78bf7224 (diff) | |
| download | emacs-4ebb358f29e64094871ad6d35fb365d77c17047d.tar.gz emacs-4ebb358f29e64094871ad6d35fb365d77c17047d.tar.bz2 emacs-4ebb358f29e64094871ad6d35fb365d77c17047d.zip | |
merge trunk
Diffstat (limited to 'lisp/progmodes/perl-mode.el')
| -rw-r--r-- | lisp/progmodes/perl-mode.el | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el index e7afd0e0e67..de728da236d 100644 --- a/lisp/progmodes/perl-mode.el +++ b/lisp/progmodes/perl-mode.el @@ -388,7 +388,11 @@ The expansion is entirely correct because it uses the C preprocessor." ;; In case of error, make sure we don't move backward. (scan-error (goto-char startpos) nil)) (not (or (nth 8 (parse-partial-sexp - (point) limit nil nil state 'syntax-table)) + ;; Since we don't know if point is within + ;; the first or the scond arg, we have to + ;; start from the beginning. + (if twoargs (1+ (nth 8 state)) (point)) + limit nil nil state 'syntax-table)) ;; If we have a self-paired opener and a twoargs ;; command, the form is s/../../ so we have to skip ;; a second time. |