diff options
| author | Glenn Morris | 2010-08-16 23:54:03 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-08-16 23:54:03 -0700 |
| commit | f3b554af9d648556994fbdae665c41c79a313572 (patch) | |
| tree | cd508c058d5d6dd8757707e0f9cb8f999c6717f9 /lisp | |
| parent | 30ebab6dedca76184a4b6aba60fc32ed7da43b89 (diff) | |
| download | emacs-f3b554af9d648556994fbdae665c41c79a313572.tar.gz emacs-f3b554af9d648556994fbdae665c41c79a313572.zip | |
Silence some cc-mode compiler warnings.
* lisp/progmodes/cc-engine.el (c-new-BEG, c-new-END)
(c-fontify-recorded-types-and-refs): Define for compiler.
* lisp/progmodes/cc-mode.el (c-new-BEG, c-new-END): Move definitions
before use.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/cc-engine.el | 11 | ||||
| -rw-r--r-- | lisp/progmodes/cc-mode.el | 22 |
3 files changed, 25 insertions, 13 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 031103c0ed8..bdeb1d6b082 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,10 @@ | |||
| 1 | 2010-08-17 Glenn Morris <rgm@gnu.org> | 1 | 2010-08-17 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * progmodes/cc-engine.el (c-new-BEG, c-new-END) | ||
| 4 | (c-fontify-recorded-types-and-refs): Define for compiler. | ||
| 5 | * progmodes/cc-mode.el (c-new-BEG, c-new-END): Move definitions | ||
| 6 | before use. | ||
| 7 | |||
| 3 | * calendar/icalendar.el (icalendar--convert-recurring-to-diary): | 8 | * calendar/icalendar.el (icalendar--convert-recurring-to-diary): |
| 4 | Fix format call. | 9 | Fix format call. |
| 5 | 10 | ||
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index d87db0fe8b3..5aa03317491 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | ;;; cc-engine.el --- core syntax guessing engine for CC mode | 1 | ;;; cc-engine.el --- core syntax guessing engine for CC mode |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1985, 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, | 3 | ;; Copyright (C) 1985, 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, |
| 4 | ;; 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 | 4 | ;; 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, |
| 5 | ;; Free Software Foundation, Inc. | 5 | ;; 2010 Free Software Foundation, Inc. |
| 6 | 6 | ||
| 7 | ;; Authors: 2001- Alan Mackenzie | 7 | ;; Authors: 2001- Alan Mackenzie |
| 8 | ;; 1998- Martin Stjernholm | 8 | ;; 1998- Martin Stjernholm |
| @@ -5023,6 +5023,10 @@ comment at the start of cc-engine.el for more info." | |||
| 5023 | (c-unmark-<->-as-paren pos)) | 5023 | (c-unmark-<->-as-paren pos)) |
| 5024 | t))) | 5024 | t))) |
| 5025 | 5025 | ||
| 5026 | ;; Set by c-common-init in cc-mode.el. | ||
| 5027 | (defvar c-new-BEG) | ||
| 5028 | (defvar c-new-END) | ||
| 5029 | |||
| 5026 | (defun c-before-change-check-<>-operators (beg end) | 5030 | (defun c-before-change-check-<>-operators (beg end) |
| 5027 | ;; Unmark certain pairs of "< .... >" which are currently marked as | 5031 | ;; Unmark certain pairs of "< .... >" which are currently marked as |
| 5028 | ;; template/generic delimiters. (This marking is via syntax-table | 5032 | ;; template/generic delimiters. (This marking is via syntax-table |
| @@ -5366,6 +5370,9 @@ comment at the start of cc-engine.el for more info." | |||
| 5366 | (goto-char safe-pos) | 5370 | (goto-char safe-pos) |
| 5367 | t))) | 5371 | t))) |
| 5368 | 5372 | ||
| 5373 | ;; cc-mode requires cc-fonts. | ||
| 5374 | (declare-function c-fontify-recorded-types-and-refs "cc-fonts" ()) | ||
| 5375 | |||
| 5369 | (defun c-forward-<>-arglist (all-types) | 5376 | (defun c-forward-<>-arglist (all-types) |
| 5370 | ;; The point is assumed to be at a "<". Try to treat it as the open | 5377 | ;; The point is assumed to be at a "<". Try to treat it as the open |
| 5371 | ;; paren of an angle bracket arglist and move forward to the | 5378 | ;; paren of an angle bracket arglist and move forward to the |
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index f9917ce406e..d61c8d42457 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | ;;; cc-mode.el --- major mode for editing C and similar languages | 1 | ;;; cc-mode.el --- major mode for editing C and similar languages |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1985, 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, | 3 | ;; Copyright (C) 1985, 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, |
| 4 | ;; 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 | 4 | ;; 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, |
| 5 | ;; Free Software Foundation, Inc. | 5 | ;; 2010 Free Software Foundation, Inc. |
| 6 | 6 | ||
| 7 | ;; Authors: 2003- Alan Mackenzie | 7 | ;; Authors: 2003- Alan Mackenzie |
| 8 | ;; 1998- Martin Stjernholm | 8 | ;; 1998- Martin Stjernholm |
| @@ -616,6 +616,15 @@ that requires a literal mode spec at compile time." | |||
| 616 | (font-lock-mode 0) | 616 | (font-lock-mode 0) |
| 617 | (font-lock-mode 1))) | 617 | (font-lock-mode 1))) |
| 618 | 618 | ||
| 619 | ;; Buffer local variables defining the region to be fontified by a font lock | ||
| 620 | ;; after-change function. They are set in c-after-change to | ||
| 621 | ;; after-change-function's BEG and END, and may be modified by a | ||
| 622 | ;; `c-before-font-lock-function'. | ||
| 623 | (defvar c-new-BEG 0) | ||
| 624 | (make-variable-buffer-local 'c-new-BEG) | ||
| 625 | (defvar c-new-END 0) | ||
| 626 | (make-variable-buffer-local 'c-new-END) | ||
| 627 | |||
| 619 | (defun c-common-init (&optional mode) | 628 | (defun c-common-init (&optional mode) |
| 620 | "Common initialization for all CC Mode modes. | 629 | "Common initialization for all CC Mode modes. |
| 621 | In addition to the work done by `c-basic-common-init' and | 630 | In addition to the work done by `c-basic-common-init' and |
| @@ -811,15 +820,6 @@ Note that the style variables are always made local to the buffer." | |||
| 811 | 820 | ||
| 812 | ;;; Change hooks, linking with Font Lock. | 821 | ;;; Change hooks, linking with Font Lock. |
| 813 | 822 | ||
| 814 | ;; Buffer local variables defining the region to be fontified by a font lock | ||
| 815 | ;; after-change function. They are set in c-after-change to | ||
| 816 | ;; after-change-function's BEG and END, and may be modified by a | ||
| 817 | ;; `c-before-font-lock-function'. | ||
| 818 | (defvar c-new-BEG 0) | ||
| 819 | (make-variable-buffer-local 'c-new-BEG) | ||
| 820 | (defvar c-new-END 0) | ||
| 821 | (make-variable-buffer-local 'c-new-END) | ||
| 822 | |||
| 823 | ;; Buffer local variables recording Beginning/End-of-Macro position before a | 823 | ;; Buffer local variables recording Beginning/End-of-Macro position before a |
| 824 | ;; change, when a macro straddles, respectively, the BEG or END (or both) of | 824 | ;; change, when a macro straddles, respectively, the BEG or END (or both) of |
| 825 | ;; the change region. Otherwise these have the values BEG/END. | 825 | ;; the change region. Otherwise these have the values BEG/END. |