[Emacs-diffs] Changes to emacs/lisp/progmodes/perl-mode.el

[Stefan Monnier]

Index: emacs/lisp/progmodes/perl-mode.el
diff -c emacs/lisp/progmodes/perl-mode.el:1.53 
emacs/lisp/progmodes/perl-mode.el:1.54
*** emacs/lisp/progmodes/perl-mode.el:1.53      Fri Mar 18 00:13:40 2005
--- emacs/lisp/progmodes/perl-mode.el   Sun Mar 20 17:06:13 2005
***************
*** 330,359 ****
                                      nil nil state 'syntax-table)))
            ;; The open/close chars are matched like () [] {} and <>.
            (let ((parse-sexp-lookup-properties nil))
!             (ignore-errors
!               (with-syntax-table st
!                 (goto-char (nth 8 state)) (forward-sexp 1))
!               (when twoargs
!                 (save-excursion
!                   ;; Skip whitespace and make sure that font-lock will
!                   ;; refontify the second part in the proper context.
!                   (put-text-property
!                    (point) (progn (forward-comment (point-max)) (point))
!                    'font-lock-multiline t)
!                   ;;
!                   (unless
!                       (save-excursion
!                         (let* ((char2 (char-after))
!                                (st2 (perl-quote-syntax-table char2)))
!                           (with-syntax-table st2 (forward-sexp 1))
!                           (put-text-property pos (line-end-position)
!                                              'jit-lock-defer-multiline t)
!                           (looking-at "\\s-*\\sw*e")))
!                     (put-text-property (point) (1+ (point))
!                                        'syntax-table
!                                        (if (assoc (char-after)
!                                                   perl-quote-like-pairs)
!                                            '(15) '(7)))))))))
          ;; Erase any syntactic marks within the quoted text.
          (put-text-property pos (1- (point)) 'syntax-table nil)
          (when (eq (char-before (1- (point))) ?$)
--- 330,363 ----
                                      nil nil state 'syntax-table)))
            ;; The open/close chars are matched like () [] {} and <>.
            (let ((parse-sexp-lookup-properties nil))
!             (condition-case err
!                 (progn
!                   (with-syntax-table st
!                     (goto-char (nth 8 state)) (forward-sexp 1))
!                   (when twoargs
!                     (save-excursion
!                       ;; Skip whitespace and make sure that font-lock will
!                       ;; refontify the second part in the proper context.
!                       (put-text-property
!                        (point) (progn (forward-comment (point-max)) (point))
!                        'font-lock-multiline t)
!                       ;;
!                       (unless
!                           (save-excursion
!                             (with-syntax-table
!                                 (perl-quote-syntax-table (char-after))
!                               (forward-sexp 1))
!                             (put-text-property pos (line-end-position)
!                                                'jit-lock-defer-multiline t)
!                             (looking-at "\\s-*\\sw*e"))
!                         (put-text-property (point) (1+ (point))
!                                            'syntax-table
!                                            (if (assoc (char-after)
!                                                       perl-quote-like-pairs)
!                                                '(15) '(7)))))))
!               ;; The arg(s) is not terminated, so it extends until EOB.
!               (scan-error (goto-char (point-max))))))
!         ;; Point is now right after the arg(s).
          ;; Erase any syntactic marks within the quoted text.
          (put-text-property pos (1- (point)) 'syntax-table nil)
          (when (eq (char-before (1- (point))) ?$)