summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/progmodes/cperl-mode.el7
-rw-r--r--lisp/simple.el2
2 files changed, 1 insertions, 8 deletions
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 94f42cb2bc4..ebbea6bed92 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -3225,13 +3225,6 @@ modify syntax-type text property if the situation is too hard."
(and cperl-brace-recursing
(or (eq ostart ?\{)
(eq starter ?\{)))
- ;; If we are at the end of a narrowed buffer, then a
- ;; scan error should not be reported to the user.
- ;; This situation actually happens when a closing
- ;; paren is entered in a regular expression.
- ;; Reported in Bug#37127.
- (and (eobp) (buffer-narrowed-p)
- (equal (car bb) 'scan-error))
(message
"End of `%s%s%c ... %c' string/RE not found: %s"
argument
diff --git a/lisp/simple.el b/lisp/simple.el
index 2e40e3261c9..a9d79d031e8 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -8014,6 +8014,7 @@ The function should return non-nil if the two tokens do not match.")
(blinkpos
(save-excursion
(save-restriction
+ (syntax-propertize (point))
(if blink-matching-paren-distance
(narrow-to-region
(max (minibuffer-prompt-end) ;(point-min) unless minibuf.
@@ -8024,7 +8025,6 @@ The function should return non-nil if the two tokens do not match.")
(not blink-matching-paren-dont-ignore-comments))))
(condition-case ()
(progn
- (syntax-propertize (point))
(forward-sexp -1)
;; backward-sexp skips backward over prefix chars,
;; so move back to the matching paren.