diff options
| author | Joakim Verona | 2013-09-12 07:46:45 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-09-12 07:46:45 +0200 |
| commit | 7701e0724215b82d2f635c19d7e7f2a9863e687c (patch) | |
| tree | b759e59df3edf3f5d661db8d24296cd3da116160 /lisp/progmodes/ruby-mode.el | |
| parent | dd30d6b73383df67468e4705492206bae6a8185c (diff) | |
| parent | 96b3f75a809761389cbbdc2eb0ed85f4559a8eef (diff) | |
| download | emacs-7701e0724215b82d2f635c19d7e7f2a9863e687c.tar.gz emacs-7701e0724215b82d2f635c19d7e7f2a9863e687c.zip | |
merge from trunk
Diffstat (limited to 'lisp/progmodes/ruby-mode.el')
| -rw-r--r-- | lisp/progmodes/ruby-mode.el | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el index 0f868255589..902616e3023 100644 --- a/lisp/progmodes/ruby-mode.el +++ b/lisp/progmodes/ruby-mode.el | |||
| @@ -1377,6 +1377,7 @@ If the result is do-end block, it will always be multiline." | |||
| 1377 | ;; Unusual code layout confuses the byte-compiler. | 1377 | ;; Unusual code layout confuses the byte-compiler. |
| 1378 | (declare-function ruby-syntax-propertize-expansion "ruby-mode" ()) | 1378 | (declare-function ruby-syntax-propertize-expansion "ruby-mode" ()) |
| 1379 | (declare-function ruby-syntax-expansion-allowed-p "ruby-mode" (parse-state)) | 1379 | (declare-function ruby-syntax-expansion-allowed-p "ruby-mode" (parse-state)) |
| 1380 | (declare-function ruby-syntax-propertize-function "ruby-mode" (start end)) | ||
| 1380 | 1381 | ||
| 1381 | (if (eval-when-compile (fboundp #'syntax-propertize-rules)) | 1382 | (if (eval-when-compile (fboundp #'syntax-propertize-rules)) |
| 1382 | ;; New code that works independently from font-lock. | 1383 | ;; New code that works independently from font-lock. |