diff options
| author | Glenn Morris | 2010-10-31 23:00:04 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-10-31 23:00:04 -0700 |
| commit | f4ff702e2816f5756964ea6e81687f2aa8cc4a38 (patch) | |
| tree | 43fe30465c914b27b1a10e46bcb0e7f6a0d5bdd4 | |
| parent | 806c491ab119d930cf0d0824d0e47552322b47d1 (diff) | |
| download | emacs-f4ff702e2816f5756964ea6e81687f2aa8cc4a38.tar.gz emacs-f4ff702e2816f5756964ea6e81687f2aa8cc4a38.zip | |
* lisp/progmodes/ruby-mode.el (ruby-syntax-propertize-heredoc): Declare.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/progmodes/ruby-mode.el | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6ccc7752385..b0e35abc58d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2010-11-01 Glenn Morris <rgm@gnu.org> | 1 | 2010-11-01 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * progmodes/ruby-mode.el (ruby-syntax-propertize-heredoc): Declare. | ||
| 4 | |||
| 3 | * textmodes/ispell.el (comment-add): Declare. | 5 | * textmodes/ispell.el (comment-add): Declare. |
| 4 | 6 | ||
| 5 | * net/gnutls.el (gnutls-boot, gnutls-errorp, gnutls-error-string): | 7 | * net/gnutls.el (gnutls-boot, gnutls-errorp, gnutls-error-string): |
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el index af68699f2a4..fcd0242a10d 100644 --- a/lisp/progmodes/ruby-mode.el +++ b/lisp/progmodes/ruby-mode.el | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | ;;; ruby-mode.el --- Major mode for editing Ruby files | 1 | ;;; ruby-mode.el --- Major mode for editing Ruby files |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1994, 1995, 1996 1997, 1998, 1999, 2000, 2001, | 3 | ;; Copyright (C) 1994, 1995, 1996 1997, 1998, 1999, 2000, 2001, 2002, |
| 4 | ;; 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 | 4 | ;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
| 5 | ;; Free Software Foundation, Inc. | 5 | ;; Free Software Foundation, Inc. |
| 6 | 6 | ||
| 7 | ;; Authors: Yukihiro Matsumoto | 7 | ;; Authors: Yukihiro Matsumoto |
| @@ -1108,6 +1108,8 @@ See `add-log-current-defun-function'." | |||
| 1108 | (if mlist (concat mlist mname) mname) | 1108 | (if mlist (concat mlist mname) mname) |
| 1109 | mlist))))) | 1109 | mlist))))) |
| 1110 | 1110 | ||
| 1111 | (declare-function ruby-syntax-propertize-heredoc "ruby-mode" (limit)) | ||
| 1112 | |||
| 1111 | (if (eval-when-compile (fboundp #'syntax-propertize-rules)) | 1113 | (if (eval-when-compile (fboundp #'syntax-propertize-rules)) |
| 1112 | ;; New code that works independently from font-lock. | 1114 | ;; New code that works independently from font-lock. |
| 1113 | (progn | 1115 | (progn |
| @@ -1162,7 +1164,7 @@ See `add-log-current-defun-function'." | |||
| 1162 | ;; inf-loop. | 1164 | ;; inf-loop. |
| 1163 | (if (< (point) start) (goto-char start)))))) | 1165 | (if (< (point) start) (goto-char start)))))) |
| 1164 | ) | 1166 | ) |
| 1165 | 1167 | ||
| 1166 | ;; For Emacsen where syntax-propertize-rules is not (yet) available, | 1168 | ;; For Emacsen where syntax-propertize-rules is not (yet) available, |
| 1167 | ;; fallback on the old font-lock-syntactic-keywords stuff. | 1169 | ;; fallback on the old font-lock-syntactic-keywords stuff. |
| 1168 | 1170 | ||
| @@ -1478,5 +1480,4 @@ The variable `ruby-indent-level' controls the amount of indentation. | |||
| 1478 | 1480 | ||
| 1479 | (provide 'ruby-mode) | 1481 | (provide 'ruby-mode) |
| 1480 | 1482 | ||
| 1481 | ;; arch-tag: e6ecc893-8005-420c-b7f9-34ab99a1fff9 | ||
| 1482 | ;;; ruby-mode.el ends here | 1483 | ;;; ruby-mode.el ends here |