Commits

Anonymous committed 3e5f1aa

fixup commit for tag 'sumo-current'

Comments (0)

Files changed (5)

+Release Announcement
+CC Mode Version 5.28
+Martin Stjernholm
+<mailto:bug-cc-mode@gnu.org>
+
+This message announces the availability of a new version of CC Mode, a
+GNU Emacs mode for editing C (ANSI and K&R), C++, Objective-C, Java,
+CORBA's IDL, and Pike code.
+
+A list of user visible changes is detailed in the NEWS file and in the
+URL listed below.  More information, including links to download the
+source, are available on the CC Mode web page:
+
+    <http://cc-mode.sourceforge.net/>
+
+There is also a link to the CC Mode announcement mailing list, a
+moderated list that you can join to get future release announcements.
+Please see this page for more information on this mailing list:
+
+    <http://lists.sourceforge.net/mailman/listinfo/cc-mode-announce>
+
+Send email correspondence to
+
+    bug-cc-mode@gnu.org
+
+Note that the old address, cc-mode-help@python.org is still active,
+but its use is discouraged.
+
+For a list of changes please see
+
+    <http://cc-mode.sourceforge.net/changes-528.php>
+;;; cc-make.el --- Simplifies compilation.
+
+;; Copyright (C) 1985,1987,1992-2000 Free Software Foundation, Inc.
+
+;; Authors:    2000- Martin Stjernholm
+;;	       1998-1999 Barry A. Warsaw and Martin Stjernholm
+;;             1997 Barry A. Warsaw
+;; Maintainer: bug-cc-mode@gnu.org
+;; Created:    22-Apr-1997 (split from cc-mode.el)
+;; Version:    See cc-mode.el
+;; Keywords:   c languages oop
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+(defconst cc-path-to-the-custom-library
+  ;; In Emacs 19.34, change the following line to the directory that
+  ;; contains Per Abrahamsen's new Custom library, which you must
+  ;; download first.  You can get Custom from:
+  ;;
+  ;; http://www.dina.kvl.dk/~abraham/custom/
+  ;;
+  ;; See the CC Mode homepage for installation details:
+  ;;
+  ;; http://cc-mode.sourceforge.net/
+  nil
+  )
+
+(if cc-path-to-the-custom-library
+    (setq load-path (cons cc-path-to-the-custom-library load-path)))
+
+(if (not (and (condition-case nil
+		  (require 'custom)
+		(error nil))
+	      ;; Stock Emacs 19.34 doesn't have this
+	      (fboundp 'defcustom)))
+    (error "STOP! STOP! STOP! STOP!
+
+The Custom library was not found or is out of date.  A more current
+version is required to use CC Mode 5.  You MUST fix cc-make.el.  See
+that file or the CC Mode Web site for details:
+
+    <http://cc-mode.sourceforge.net/>"))
+
+(setq load-path (cons default-directory load-path))
+
+(batch-byte-compile)
+
+;;; cc-make.el ends here

cc-make.el.upstream

+;;; cc-make.el --- Simplifies compilation.
+
+;; Copyright (C) 1985,1987,1992-2000 Free Software Foundation, Inc.
+
+;; Authors:    2000- Martin Stjernholm
+;;	       1998-1999 Barry A. Warsaw and Martin Stjernholm
+;;             1997 Barry A. Warsaw
+;; Maintainer: bug-cc-mode@gnu.org
+;; Created:    22-Apr-1997 (split from cc-mode.el)
+;; Version:    See cc-mode.el
+;; Keywords:   c languages oop
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+(defconst cc-path-to-the-custom-library
+  ;; In Emacs 19.34, change the following line to the directory that
+  ;; contains Per Abrahamsen's new Custom library, which you must
+  ;; download first.  You can get Custom from:
+  ;;
+  ;; http://www.dina.kvl.dk/~abraham/custom/
+  ;;
+  ;; See the CC Mode homepage for installation details:
+  ;;
+  ;; http://cc-mode.sourceforge.net/
+  nil
+  )
+
+(if cc-path-to-the-custom-library
+    (setq load-path (cons cc-path-to-the-custom-library load-path)))
+
+(if (not (and (condition-case nil
+		  (require 'custom)
+		(error nil))
+	      ;; Stock Emacs 19.34 doesn't have this
+	      (fboundp 'defcustom)))
+    (error "STOP! STOP! STOP! STOP!
+
+The Custom library was not found or is out of date.  A more current
+version is required to use CC Mode 5.  You MUST fix cc-make.el.  See
+that file or the CC Mode Web site for details:
+
+    <http://cc-mode.sourceforge.net/>"))
+
+(setq load-path (cons default-directory load-path))
+
+(batch-byte-compile)
+
+;;; cc-make.el ends here
+;;; cc-mode-19.el --- compatibility library for Emacs and XEmacs 19
+
+;; Copyright (C) 1985,1987,1992-2001 Free Software Foundation, Inc.
+
+;; Authors:    2000- Martin Stjernholm
+;;	       1998-1999 Barry A. Warsaw and Martin Stjernholm
+;;             1997 Barry A. Warsaw
+;; Maintainer: bug-cc-mode@gnu.org
+;; Created:    03-Jul-1997
+;; Version:    See cc-mode.el
+;; Keywords:   c languages oop
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+;; This file is necessary in order to run CC Mode 5 under Emacs 19.34
+;; and MULE based on Emacs 19.34.
+
+;;; Code:
+
+(eval-when-compile
+  (let ((load-path
+	 (if (and (boundp 'byte-compile-dest-file)
+		  (stringp byte-compile-dest-file))
+	     (cons (file-name-directory byte-compile-dest-file) load-path)
+	   load-path)))
+    (require 'cc-bytecomp)))
+
+;; Silence the compiler (in case this file is compiled by other
+;; Emacsen even though it isn't used by them).
+(cc-bytecomp-obsolete-fun byte-code-function-p)
+
+(require 'advice)
+
+
+;; Emacs 19.34 requires the POS argument to char-after.  Emacs 20
+;; makes it optional, as it has long been in XEmacs.
+(eval-and-compile
+  (condition-case nil
+      (eval '(char-after))		; `eval' avoids argcount warnings
+    (error
+     (ad-define-subr-args 'char-after '(pos))
+     (defadvice char-after (before c-char-after-advice
+				   (&optional pos)
+				   activate preactivate)
+       "POS is optional and defaults to the position of point."
+       (if (not pos)
+	   (setq pos (point))))
+     (if (and (featurep 'cc-bytecomp)
+	      (cc-bytecomp-is-compiling))
+	 (progn
+	   ;; Since char-after is handled specially by the byte
+	   ;; compiler, we need some black magic to make the compiler
+	   ;; warnings go away.
+	   (defun byte-compile-char-after (form)
+	     (if (= (length form) 1)
+		 (byte-compile-one-arg (append form '((point))))
+	       (byte-compile-one-arg form)))
+	   (byte-defop-compiler char-after))))))
+
+(if (fboundp 'char-before)
+    ;; (or (condition-case nil
+    ;;         (progn (char-before) t)
+    ;;       (error nil))
+    ;;
+    ;; This test is commented out since it confuses the byte code
+    ;; optimizer (verified in Emacs 20.2 and XEmacs 20.4).  The effect
+    ;; of this is that the advice below may be activated in those
+    ;; versions, which is unnecessary but won't break anything.  It
+    ;; only occurs when this file is explicitly loaded; in normal use
+    ;; the test in cc-defs.el will skip it altogether.
+
+    ;; MULE based on Emacs 19.34 has a char-before function, but
+    ;; it requires a position.  It also has a second optional
+    ;; argument that we must pass on.
+    (progn
+      (ad-define-subr-args 'char-before '(pos &optional byte-unit))
+      (defadvice char-before (before c-char-before-advice
+				     (&optional pos byte-unit)
+				     activate preactivate)
+	"POS is optional and defaults to the position of point."
+	(if (not pos)
+	    (setq pos (point))))))
+
+(cc-eval-when-compile
+  (or (fboundp 'char-before)
+      ;; Emacs 19.34 doesn't have a char-before function.
+      (defsubst char-before (&optional pos)
+	(char-after (1- (or pos (point)))))))
+
+;; Emacs 19.34 doesn't have a functionp function.  Here's its Emacs
+;; 20 definition.
+(or (fboundp 'functionp)
+    (defun functionp (object)
+      "Non-nil if OBJECT is a type of object that can be called as a function."
+      (or (subrp object) (byte-code-function-p object)
+	  (eq (car-safe object) 'lambda)
+	  (and (symbolp object) (fboundp object)))))
+
+;; Emacs 19.34 doesn't have a when macro.  Here's its Emacs 20
+;; definition.
+(cc-eval-when-compile
+  (or (fboundp 'when)
+      (defmacro when (cond &rest body)
+	"(when COND BODY...): if COND yields non-nil, "
+	"do BODY, else return nil."
+	(list 'if cond (cons 'progn body)))))
+
+;; Emacs 19.34 doesn't have an unless macro.  Here's its Emacs 20
+;; definition.
+(cc-eval-when-compile
+  (or (fboundp 'unless)
+      (defmacro unless (cond &rest body)
+	"(unless COND BODY...): if COND yields nil, "
+	"do BODY, else return nil."
+	(cons 'if (cons cond (cons nil body))))))
+
+
+(cc-provide 'cc-mode-19)
+;;; cc-mode-19.el ends here

cc-mode-19.el.upstream

+;;; cc-mode-19.el --- compatibility library for Emacs and XEmacs 19
+
+;; Copyright (C) 1985,1987,1992-2001 Free Software Foundation, Inc.
+
+;; Authors:    2000- Martin Stjernholm
+;;	       1998-1999 Barry A. Warsaw and Martin Stjernholm
+;;             1997 Barry A. Warsaw
+;; Maintainer: bug-cc-mode@gnu.org
+;; Created:    03-Jul-1997
+;; Version:    See cc-mode.el
+;; Keywords:   c languages oop
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+;; This file is necessary in order to run CC Mode 5 under Emacs 19.34
+;; and MULE based on Emacs 19.34.
+
+;;; Code:
+
+(eval-when-compile
+  (let ((load-path
+	 (if (and (boundp 'byte-compile-dest-file)
+		  (stringp byte-compile-dest-file))
+	     (cons (file-name-directory byte-compile-dest-file) load-path)
+	   load-path)))
+    (require 'cc-bytecomp)))
+
+;; Silence the compiler (in case this file is compiled by other
+;; Emacsen even though it isn't used by them).
+(cc-bytecomp-obsolete-fun byte-code-function-p)
+
+(require 'advice)
+
+
+;; Emacs 19.34 requires the POS argument to char-after.  Emacs 20
+;; makes it optional, as it has long been in XEmacs.
+(eval-and-compile
+  (condition-case nil
+      (eval '(char-after))		; `eval' avoids argcount warnings
+    (error
+     (ad-define-subr-args 'char-after '(pos))
+     (defadvice char-after (before c-char-after-advice
+				   (&optional pos)
+				   activate preactivate)
+       "POS is optional and defaults to the position of point."
+       (if (not pos)
+	   (setq pos (point))))
+     (if (and (featurep 'cc-bytecomp)
+	      (cc-bytecomp-is-compiling))
+	 (progn
+	   ;; Since char-after is handled specially by the byte
+	   ;; compiler, we need some black magic to make the compiler
+	   ;; warnings go away.
+	   (defun byte-compile-char-after (form)
+	     (if (= (length form) 1)
+		 (byte-compile-one-arg (append form '((point))))
+	       (byte-compile-one-arg form)))
+	   (byte-defop-compiler char-after))))))
+
+(if (fboundp 'char-before)
+    ;; (or (condition-case nil
+    ;;         (progn (char-before) t)
+    ;;       (error nil))
+    ;;
+    ;; This test is commented out since it confuses the byte code
+    ;; optimizer (verified in Emacs 20.2 and XEmacs 20.4).  The effect
+    ;; of this is that the advice below may be activated in those
+    ;; versions, which is unnecessary but won't break anything.  It
+    ;; only occurs when this file is explicitly loaded; in normal use
+    ;; the test in cc-defs.el will skip it altogether.
+
+    ;; MULE based on Emacs 19.34 has a char-before function, but
+    ;; it requires a position.  It also has a second optional
+    ;; argument that we must pass on.
+    (progn
+      (ad-define-subr-args 'char-before '(pos &optional byte-unit))
+      (defadvice char-before (before c-char-before-advice
+				     (&optional pos byte-unit)
+				     activate preactivate)
+	"POS is optional and defaults to the position of point."
+	(if (not pos)
+	    (setq pos (point))))))
+
+(cc-eval-when-compile
+  (or (fboundp 'char-before)
+      ;; Emacs 19.34 doesn't have a char-before function.
+      (defsubst char-before (&optional pos)
+	(char-after (1- (or pos (point)))))))
+
+;; Emacs 19.34 doesn't have a functionp function.  Here's its Emacs
+;; 20 definition.
+(or (fboundp 'functionp)
+    (defun functionp (object)
+      "Non-nil if OBJECT is a type of object that can be called as a function."
+      (or (subrp object) (byte-code-function-p object)
+	  (eq (car-safe object) 'lambda)
+	  (and (symbolp object) (fboundp object)))))
+
+;; Emacs 19.34 doesn't have a when macro.  Here's its Emacs 20
+;; definition.
+(cc-eval-when-compile
+  (or (fboundp 'when)
+      (defmacro when (cond &rest body)
+	"(when COND BODY...): if COND yields non-nil, "
+	"do BODY, else return nil."
+	(list 'if cond (cons 'progn body)))))
+
+;; Emacs 19.34 doesn't have an unless macro.  Here's its Emacs 20
+;; definition.
+(cc-eval-when-compile
+  (or (fboundp 'unless)
+      (defmacro unless (cond &rest body)
+	"(unless COND BODY...): if COND yields nil, "
+	"do BODY, else return nil."
+	(cons 'if (cons cond (cons nil body))))))
+
+
+(cc-provide 'cc-mode-19)
+;;; cc-mode-19.el ends here