diff options
| author | Juanma Barranquero | 2009-11-30 22:51:34 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2009-11-30 22:51:34 +0000 |
| commit | 5237d741a8744f6be1bcbf28f551fc222e6d75ae (patch) | |
| tree | dbe151397661bdbf56acd5b79f943cce81b0560a | |
| parent | 1613ac12def46f23442274a60d9c3c29527cf8c4 (diff) | |
| download | emacs-5237d741a8744f6be1bcbf28f551fc222e6d75ae.tar.gz emacs-5237d741a8744f6be1bcbf28f551fc222e6d75ae.zip | |
Fix references to jit-lock properties.
* progmodes/perl-mode.el (perl-font-lock-syntactic-keywords):
Refer to jit-lock-defer-multiline, not jit-lock-multiline.
(perl-font-lock-special-syntactic-constructs):
Quote jit-lock-defer-multiline property.
| -rw-r--r-- | lisp/ChangeLog | 18 | ||||
| -rw-r--r-- | lisp/progmodes/perl-mode.el | 4 |
2 files changed, 15 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index dfd2a3687f3..66710ac75ec 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,11 @@ | |||
| 1 | 2009-11-30 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | Fix references to jit-lock properties. | ||
| 4 | * progmodes/perl-mode.el (perl-font-lock-syntactic-keywords): | ||
| 5 | Refer to jit-lock-defer-multiline, not jit-lock-multiline. | ||
| 6 | (perl-font-lock-special-syntactic-constructs): | ||
| 7 | Quote jit-lock-defer-multiline property. | ||
| 8 | |||
| 1 | 2009-11-30 Dan Nicolaescu <dann@ics.uci.edu> | 9 | 2009-11-30 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 10 | ||
| 3 | * vc-git.el (vc-git-registered): Call vc-git-root only once. | 11 | * vc-git.el (vc-git-registered): Call vc-git-root only once. |
| @@ -972,13 +980,13 @@ | |||
| 972 | * calc/calc-menu.el (calc-arithmetic-menu): Remove `calc-symclip'. | 980 | * calc/calc-menu.el (calc-arithmetic-menu): Remove `calc-symclip'. |
| 973 | 981 | ||
| 974 | * calc/calc-map.el (calc-get-operator, calc-b-oper-keys): | 982 | * calc/calc-map.el (calc-get-operator, calc-b-oper-keys): |
| 975 | * calc/calc-help.el (calc-b-prefix-help): Remove references to | 983 | * calc/calc-help.el (calc-b-prefix-help): Remove references to |
| 976 | `calc-symclip'. | 984 | `calc-symclip'. |
| 977 | 985 | ||
| 978 | 2009-11-16 Kevin Ryde <user42@zip.com.au> | 986 | 2009-11-16 Kevin Ryde <user42@zip.com.au> |
| 979 | 987 | ||
| 980 | * textmodes/flyspell.el (sgml-mode-flyspell-verify): | 988 | * textmodes/flyspell.el (sgml-mode-flyspell-verify): |
| 981 | Use `sgml-lexical-context' instead of own parse for tag (Bug#4511). | 989 | Use `sgml-lexical-context' instead of own parse for tag (Bug#4511). |
| 982 | 990 | ||
| 983 | * emacs-lisp/lisp-mnt.el (lm-keywords): Allow multi-line keywords. | 991 | * emacs-lisp/lisp-mnt.el (lm-keywords): Allow multi-line keywords. |
| 984 | (lm-keywords-list): Allow comma-only separator like "foo,bar". | 992 | (lm-keywords-list): Allow comma-only separator like "foo,bar". |
| @@ -988,7 +996,7 @@ | |||
| 988 | 996 | ||
| 989 | 2009-11-16 Dan Nicolaescu <dann@ics.uci.edu> | 997 | 2009-11-16 Dan Nicolaescu <dann@ics.uci.edu> |
| 990 | 998 | ||
| 991 | * vc.el (vc-log-show-limit): Default to 2000. | 999 | * vc.el (vc-log-show-limit): Default to 2000. |
| 992 | (vc-print-log-internal): Insert buttons to request more entries | 1000 | (vc-print-log-internal): Insert buttons to request more entries |
| 993 | when limiting the output. | 1001 | when limiting the output. |
| 994 | 1002 | ||
| @@ -1050,7 +1058,7 @@ | |||
| 1050 | `calc-symclip'. | 1058 | `calc-symclip'. |
| 1051 | (calc-modes-menu): Add item for twos complement mode. | 1059 | (calc-modes-menu): Add item for twos complement mode. |
| 1052 | 1060 | ||
| 1053 | * calc/calc-help.el (calc-b-prefix-help): Add help for `calc-symclip'. | 1061 | * calc/calc-help.el (calc-b-prefix-help): Add help for `calc-symclip'. |
| 1054 | 1062 | ||
| 1055 | 2009-11-15 Chong Yidong <cyd@stupidchicken.com> | 1063 | 2009-11-15 Chong Yidong <cyd@stupidchicken.com> |
| 1056 | 1064 | ||
| @@ -1271,7 +1279,7 @@ | |||
| 1271 | 1279 | ||
| 1272 | * textmodes/artist.el (artist-mouse-choose-operation): | 1280 | * textmodes/artist.el (artist-mouse-choose-operation): |
| 1273 | Call `tmm-prompt' instead of `x-popup-menu' if we cannot popup | 1281 | Call `tmm-prompt' instead of `x-popup-menu' if we cannot popup |
| 1274 | menus. Bug noticed by Eli Zaretskii <eliz@gnu.org>. | 1282 | menus. Bug noticed by Eli Zaretskii <eliz@gnu.org>. |
| 1275 | (artist-compute-up-event-key): New function. | 1283 | (artist-compute-up-event-key): New function. |
| 1276 | (artist-mouse-choose-operation, artist-down-mouse-1): Call it. | 1284 | (artist-mouse-choose-operation, artist-down-mouse-1): Call it. |
| 1277 | 1285 | ||
diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el index eaa9bbc6af1..563bd10d39d 100644 --- a/lisp/progmodes/perl-mode.el +++ b/lisp/progmodes/perl-mode.el | |||
| @@ -287,7 +287,7 @@ The expansion is entirely correct because it uses the C preprocessor." | |||
| 287 | ;; the syntax-table before point, but better than nothing. | 287 | ;; the syntax-table before point, but better than nothing. |
| 288 | (forward-comment (- (point-max))) | 288 | (forward-comment (- (point-max))) |
| 289 | (put-text-property (point) (match-end 2) | 289 | (put-text-property (point) (match-end 2) |
| 290 | 'jit-lock-multiline t) | 290 | 'jit-lock-defer-multiline t) |
| 291 | (not (memq (char-before) | 291 | (not (memq (char-before) |
| 292 | '(?? ?: ?. ?, ?\; ?= ?! ?~ ?\( ?\[))))) | 292 | '(?? ?: ?. ?, ?\; ?= ?! ?~ ?\( ?\[))))) |
| 293 | nil ;; A division sign instead of a regexp-match. | 293 | nil ;; A division sign instead of a regexp-match. |
| @@ -387,7 +387,7 @@ The expansion is entirely correct because it uses the C preprocessor." | |||
| 387 | (perl-quote-syntax-table (char-after)) | 387 | (perl-quote-syntax-table (char-after)) |
| 388 | (forward-sexp 1)) | 388 | (forward-sexp 1)) |
| 389 | (put-text-property pos (line-end-position) | 389 | (put-text-property pos (line-end-position) |
| 390 | jit-lock-defer-multiline t) | 390 | 'jit-lock-defer-multiline t) |
| 391 | (looking-at "\\s-*\\sw*e"))) | 391 | (looking-at "\\s-*\\sw*e"))) |
| 392 | (put-text-property (point) (1+ (point)) | 392 | (put-text-property (point) (1+ (point)) |
| 393 | 'syntax-table | 393 | 'syntax-table |