# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: erikcharlebois@gmail.com-20130421062451-\ # 1z50svavx9ke3qby # target_branch: file:///Users/erikc/Source/emacs/emacs/trunk/ # testament_sha1: d48b99015430ece0334886f393d622f96c26e4a4 # timestamp: 2013-04-21 02:27:46 -0400 # base_revision_id: xfq.free@gmail.com-20130421032751-h3wwmi698ekosiio # # Begin patch === modified file 'lisp/emacs-lisp/syntax.el' --- lisp/emacs-lisp/syntax.el 2013-01-01 09:11:05 +0000 +++ lisp/emacs-lisp/syntax.el 2013-04-21 06:24:51 +0000 @@ -99,7 +99,7 @@ (setq beg (or (previous-single-property-change beg 'syntax-multiline) (point-min)))) ;; - (when (get-text-property end 'font-lock-multiline) + (when (get-text-property end 'syntax-multiline) (setq end (or (text-property-any end (point-max) 'syntax-multiline nil) (point-max)))) # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRXWxpcAAYBfgAAQUPP/91oA AgC/7//wUANtTeRtwXG6YZJNJ4QmmamFPTTEaamRk1NinqBJIm1NGQTCU3qamgyGmmmQZNBiQTJq nlNo0ZQaM1NBoaHpAMBoDQAAaaDQDQBoElJtTUnqb01R+k0m9EI0HogAxCaxiddfsQCjRqZY4AbK 2WLctS00007R9aYc7kRBq+z4W1C9izZ8sLWa1dtjs2ohUhOmi+yl/AMgdRNb1jprBeP3z4ICHSM2 U2J7EtvneVxwTU7bOCP1gHoy1UzyyRKWDRYYni/JBwIyYaNLF8CBuYuuQO/c0jWJI4vKKr9dtsoc 6idBfJhak8EO3vhNhEyQL+oWu75gRNxJ+c6/KMRFqr5m5evHU4rvhps9Tq+mWtymnMNGaWzdQn9C qQnUTFghigtR10zKMZWPBjC0iX1RgIg5SWAz3uKYC3KLIxqUBEmqUy4VZprGcWESNvAewri4XC3w z2HoX6kG6fFeC5FxO2Yo8mp12+7JuDA5HRb74q4K6GWag7qUSiqRm03osrB2M+wrbdXXZRRLKlcA ljrAcsMVTuaPaLw1jhWEL8Yl47R2MIQcVFQFQFUU89fEeOyevgnLLl6VQPmSpoJLOj8mhnZGbJjV 3yGDx2zp5b7i00y3gwjKc2tsRIBh9g6ic5xMCKozyBrAzxGWQr+7Rwqr5E19ImfQIoj8I2CpqN2w cnb5rFSFpqVGXiWUXhcVGijPxcckV7ZWCl/GhuUgG7JFSSAL4YBYAzfvaczddKYMpRm5dZeB2jiS /+KHTGHOgXFDddbe4OCUed2IGOAilAeRFbbrvFRT54i8ZmYT4WYeFDb2ORVJoRX5x5ginuUwA9KJ f/qC28bFtL8/8nV7C1QAmIxVaXZ7B6ok+/G5taiG4DILlrWUX5pkvIWwc0oiGBweAPYtQGRLPfbL yjfBGYih0EUU9KnC0nKRQGutkGD2WILGea74yk3ikyiyZcWrLCxU/oGqREKTdHMILvguh11mC5YI hiEYDKvyOgMkOBZ6BVZUZANrCsh/w8Mu5sTEATN0LAIHODBHDEImrXD+tGpUmZANI5VvLhBpHYH6 HL87okOrQjosVrEFEqVPZBBwbtdERsCmgPKkRDQoQzKdb+BDVoD3K3GkDWDU84lxyMZPQLNTQ5vm 0CAxil2inou6f/F3JFOFCQFdbGlw