mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-23 14:10:28 -08:00
cb694ab730
cc-defs.el, cc-engine.el, cc-fonts.el, cc-langs.el, cc-menus.el,
cc-mode.el, cc-styles.el, cc-subword.el, cc-vars.el: Add 2006 to the
copyright statement.
cc-awk.el: (c-awk-after-change): Protect the match data with
save-match-data. It was being corrupted when Font Lock was not enabled.
(ii): Fix a typo.
cc-cmds.el, cc-mode.el, cc-engine.el (c-update-modeline): Concatenate the
minor mode indicators directly onto mode-name, removing
c-submode-indicators. Sometimes, c-s-i got separated from the mode name
on the mode line.
cc-cmds.el, cc-mode.el: Rename c-hungry-backspace to
c-hungry-delete-backwards, at the request of RMS. Leave the old name as
an alias.
cc-cmds.el (c-electric-brace, c-electric-semi&comma, c-electric-colon):
Correct doc-strings: "/ln" -> "/la".
cc-cmds.el (c-electric-brace): Fix clean-up brace-else-brace (error due
to mbeg, mend being undefined).
cc-defs.el (c-version): Update to 5.31.3.
cc-defs.el: [Supersedes patch V1.38]: (top level): Check for a buggy
font-lock-compile-keywords ONLY in XEmacs. GNU Emacs 22 now has a check
which would throw an error here.
cc-engine.el (c-beginning-of-statement-1): Clarify doc-string and
comments. Distinguish real labels ("case 1:" or "foo:") from non-labels
("public:").
cc-engine.el (c-after-change-check-<>-operators): Remove save-match-data,
reversing change for V1.45. save-match-data is now in c-after-change.
cc-engine.el (c-forward-objc-directive): Replace c-forward-token-2 with
crude coding; c-f-t-2 doesn't move over a token at EOB. Objc Mode was
hanging after typing, e.g., "@implementation".
cc-langs.el (c-filter-ops): Made it available at runtime too to work when
`c-make-init-lang-vars-fun' needs to evaluate from source.
cc-langs.el (c-make-init-lang-vars-fun): Improved the error message when
there's an evaluation error to show whether it's loaded from source or
not.
(c-mode-menu): Add menu items for Electric Mode and Subword Mode.
cc-mode.el (c-after-change): Protect the match data with save-match-data.
It was getting corrupted by c-after-change-check-<>-operators.
cc-mode.el: File Local variables: Solve the problem where both `mode' and
c-file-offsets are specified: `mode' will overwrite c-f-o's settings:
(c-remove-any-local-eval-or-mode-variables): new function.
(c-postprocess-file-styles): call the above new function, within
c-tentative-buffer-change, to splat `mode' and `eval' before the second
hack-local-variables.
166 lines
5.7 KiB
EmacsLisp
166 lines
5.7 KiB
EmacsLisp
;;; cc-compat.el --- cc-mode compatibility with c-mode.el confusion
|
||
|
||
;; Copyright (C) 1985,1987,1992-2003, 2004, 2005, 2006 Free Software
|
||
;; Foundation, Inc.
|
||
|
||
;; Authors: 1998- Martin Stjernholm
|
||
;; 1994-1999 Barry A. Warsaw
|
||
;; Maintainer: bug-cc-mode@gnu.org
|
||
;; Created: August 1994, split from cc-mode.el
|
||
;; Version: See cc-mode.el
|
||
;; Keywords: c languages oop
|
||
|
||
;; This file is part of GNU Emacs.
|
||
|
||
;; GNU Emacs 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, or (at your option)
|
||
;; any later version.
|
||
|
||
;; GNU Emacs 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., 51 Franklin Street, Fifth Floor,
|
||
;; Boston, MA 02110-1301, USA.
|
||
|
||
;;; Commentary:
|
||
;;
|
||
;; Boring old c-mode.el (BOCM) is confusion and brain melt. cc-mode.el
|
||
;; is clarity of thought and purity of chi. If you are still unwilling
|
||
;; to accept enlightenment, this might help, or it may prolong your
|
||
;; agony.
|
||
;;
|
||
;; To use, add the following to your c-mode-hook:
|
||
;;
|
||
;; (require 'cc-compat)
|
||
;; (c-set-style "BOCM")
|
||
;;
|
||
;; This file is completely unsupported! Although it has been patched
|
||
;; superficially to keep pace with the rest of CC Mode, it hasn't been
|
||
;; tested for a long time.
|
||
|
||
;;; 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)))
|
||
(load "cc-bytecomp" nil t)))
|
||
|
||
(cc-require 'cc-defs)
|
||
(cc-require 'cc-vars)
|
||
(cc-require 'cc-styles)
|
||
(cc-require 'cc-engine)
|
||
|
||
|
||
;; In case c-mode.el isn't loaded
|
||
(defvar c-indent-level 2
|
||
"*Indentation of C statements with respect to containing block.")
|
||
(defvar c-brace-imaginary-offset 0
|
||
"*Imagined indentation of a C open brace that actually follows a statement.")
|
||
(defvar c-brace-offset 0
|
||
"*Extra indentation for braces, compared with other text in same context.")
|
||
(defvar c-argdecl-indent 5
|
||
"*Indentation level of declarations of C function arguments.")
|
||
(defvar c-label-offset -2
|
||
"*Offset of C label lines and case statements relative to usual indentation.")
|
||
(defvar c-continued-statement-offset 2
|
||
"*Extra indent for lines not starting new statements.")
|
||
(defvar c-continued-brace-offset 0
|
||
"*Extra indent for substatements that start with open-braces.
|
||
This is in addition to c-continued-statement-offset.")
|
||
|
||
|
||
|
||
;; these offsets are taken by brute force testing c-mode.el, since
|
||
;; there's no logic to what it does.
|
||
(let* ((offsets '(c-offsets-alist .
|
||
((defun-block-intro . cc-block-intro-offset)
|
||
(statement-block-intro . cc-block-intro-offset)
|
||
(defun-open . 0)
|
||
(class-open . 0)
|
||
(inline-open . c-brace-offset)
|
||
(block-open . c-brace-offset)
|
||
(block-close . cc-block-close-offset)
|
||
(brace-list-open . c-brace-offset)
|
||
(substatement-open . cc-substatement-open-offset)
|
||
(substatement . c-continued-statement-offset)
|
||
(knr-argdecl-intro . c-argdecl-indent)
|
||
(case-label . c-label-offset)
|
||
(access-label . c-label-offset)
|
||
(label . c-label-offset)
|
||
))))
|
||
(c-add-style "BOCM" offsets))
|
||
|
||
|
||
(defun cc-block-intro-offset (langelem)
|
||
;; taken directly from calculate-c-indent confusion
|
||
(save-excursion
|
||
(c-backward-syntactic-ws)
|
||
(if (eq (char-before) ?{)
|
||
(forward-char -1)
|
||
(goto-char (cdr langelem)))
|
||
(let* ((curcol (save-excursion
|
||
(goto-char (cdr langelem))
|
||
(current-column)))
|
||
(bocm-lossage
|
||
;; If no previous statement, indent it relative to line
|
||
;; brace is on. For open brace in column zero, don't let
|
||
;; statement start there too. If c-indent-level is zero,
|
||
;; use c-brace-offset + c-continued-statement-offset
|
||
;; instead. For open-braces not the first thing in a line,
|
||
;; add in c-brace-imaginary-offset.
|
||
(+ (if (and (bolp) (zerop c-indent-level))
|
||
(+ c-brace-offset c-continued-statement-offset)
|
||
c-indent-level)
|
||
;; Move back over whitespace before the openbrace. If
|
||
;; openbrace is not first nonwhite thing on the line,
|
||
;; add the c-brace-imaginary-offset.
|
||
(progn (skip-chars-backward " \t")
|
||
(if (bolp) 0 c-brace-imaginary-offset))
|
||
;; If the openbrace is preceded by a parenthesized exp,
|
||
;; move to the beginning of that; possibly a different
|
||
;; line
|
||
(progn
|
||
(if (eq (char-before) ?\))
|
||
(c-forward-sexp -1))
|
||
;; Get initial indentation of the line we are on.
|
||
(current-indentation)))))
|
||
(- bocm-lossage curcol))))
|
||
|
||
|
||
(defun cc-block-close-offset (langelem)
|
||
(save-excursion
|
||
(let* ((here (point))
|
||
bracep
|
||
(curcol (progn
|
||
(goto-char (cdr langelem))
|
||
(current-column)))
|
||
(bocm-lossage (progn
|
||
(goto-char (cdr langelem))
|
||
(if (eq (char-after) ?{)
|
||
(setq bracep t)
|
||
(goto-char here)
|
||
(beginning-of-line)
|
||
(backward-up-list 1)
|
||
(forward-char 1)
|
||
(c-forward-syntactic-ws))
|
||
(current-column))))
|
||
(- bocm-lossage curcol
|
||
(if bracep 0 c-indent-level)))))
|
||
|
||
|
||
(defun cc-substatement-open-offset (langelem)
|
||
(+ c-continued-statement-offset c-continued-brace-offset))
|
||
|
||
|
||
(cc-provide 'cc-compat)
|
||
|
||
;;; arch-tag: 564dab2f-e6ad-499c-a4a3-fedec3ecc192
|
||
;;; cc-compat.el ends here
|