Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
66f50b12
Commit
66f50b12
authored
Apr 02, 2014
by
Stefan Monnier
Browse files
* lisp/progmodes/perl-mode.el (perl-indent-new-calculate):
Handle forward-sexp failure. Fixes: debbugs:16985
parent
ffcd5669
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
5 deletions
+12
-5
lisp/ChangeLog
lisp/ChangeLog
+6
-0
lisp/progmodes/perl-mode.el
lisp/progmodes/perl-mode.el
+6
-5
No files found.
lisp/ChangeLog
View file @
66f50b12
2014-04-02 Stefan Monnier <monnier@iro.umontreal.ca>
* progmodes/perl-mode.el (perl-indent-new-calculate):
Handle forward-sexp failure (bug#16985).
2014-04-02 Glenn Morris <rgm@gnu.org>
* menu-bar.el (menu-bar-file-menu):
...
...
@@ -210,6 +215,7 @@
(electric-indent-mode): Don't mess with the global map any more.
Don't drop the post-self-insert-hook is some buffer is still using it
(bug#16770).
* bindings.el (global-map): Remove C-j binding.
* emacs-lisp/nadvice.el (advice--make-docstring): Try harder to find
...
...
lisp/progmodes/perl-mode.el
View file @
66f50b12
...
...
@@ -854,11 +854,12 @@ changed by, or (parse-state) if line starts in a quoted string."
(
and
(
=
(
char-syntax
(
following-char
))
?\)
)
(
save-excursion
(
forward-char
1
)
(
forward-sexp
-1
)
(
perl-indent-new-calculate
;; Recalculate the parsing-start, since we may have jumped
;; dangerously close (typically in the case of nested functions).
'virtual
nil
(
save-excursion
(
perl-beginning-of-function
)))))
(
when
(
condition-case
nil
(
progn
(
forward-sexp
-1
)
t
)
(
scan-error
nil
))
(
perl-indent-new-calculate
;; Recalculate the parsing-start, since we may have jumped
;; dangerously close (typically in the case of nested functions).
'virtual
nil
(
save-excursion
(
perl-beginning-of-function
))))))
(
and
(
and
(
=
(
following-char
)
?{
)
(
save-excursion
(
forward-char
)
(
perl-hanging-paren-p
)))
(
+
(
or
default
(
perl-calculate-indent
parse-start
))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment