aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/progmodes/ruby-mode.el2
2 files changed, 4 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 16dc5bf581b..0919e5c3c64 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12013-05-24 Glenn Morris <rgm@gnu.org> 12013-05-24 Glenn Morris <rgm@gnu.org>
2 2
3 * progmodes/ruby-mode.el (ruby-syntax-propertize-expansion): Declare.
4
3 * progmodes/which-func.el (ediff-window-A, ediff-window-B) 5 * progmodes/which-func.el (ediff-window-A, ediff-window-B)
4 (ediff-window-C): Declare. 6 (ediff-window-C): Declare.
5 7
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index 629d5206331..a96ee64a229 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -1347,6 +1347,8 @@ If the result is do-end block, it will always be multiline."
1347(declare-function ruby-syntax-propertize-heredoc "ruby-mode" (limit)) 1347(declare-function ruby-syntax-propertize-heredoc "ruby-mode" (limit))
1348(declare-function ruby-syntax-enclosing-percent-literal "ruby-mode" (limit)) 1348(declare-function ruby-syntax-enclosing-percent-literal "ruby-mode" (limit))
1349(declare-function ruby-syntax-propertize-percent-literal "ruby-mode" (limit)) 1349(declare-function ruby-syntax-propertize-percent-literal "ruby-mode" (limit))
1350;; Unusual code layout confuses the byte-compiler.
1351(declare-function ruby-syntax-propertize-expansion "ruby-mode" ())
1350 1352
1351(if (eval-when-compile (fboundp #'syntax-propertize-rules)) 1353(if (eval-when-compile (fboundp #'syntax-propertize-rules))
1352 ;; New code that works independently from font-lock. 1354 ;; New code that works independently from font-lock.