Mercurial > emacs
view lisp/progmodes/cc-compat.el @ 80756:76e75acf7e4e
Fix typos (sync from the trunk).
* facemenu.el (facemenu-unlisted-faces): Fix obsolescence declaration.
* hi-lock.el (hi-lock-mode): Fix typo in docstring.
* icomplete.el (icomplete-compute-delay, icomplete-get-keys): Doc fixes.
(icomplete-delay-completions-threshold): Fix typo in docstring.
* speedbar.el (speedbar-stealthy-function-list)
(speedbar-verbosity-level, speedbar-supported-extension-expressions)
(speedbar-update-current-file, speedbar-add-indicator)
(speedbar-tag-expand): Reflow docstrings.
(speedbar-use-imenu-flag, speedbar-use-tool-tips-flag)
(speedbar-ignored-directory-regexp, speedbar-file-unshown-regexp)
(speedbar-file-regexp, speedbar-message, speedbar-item-info)
(speedbar-files-item-info, speedbar-fetch-replacement-function)
(speedbar-maybe-add-localized-support)
(speedbar-generic-list-positioned-group-p, speedbar-insert-generic-list)
(speedbar-extract-one-symbol, speedbar-recenter-to-top)
(speedbar-recenter, speedbar-separator-face): Fix typos in docstrings.
(speedbar-ignored-directory-expressions, speedbar-handle-delete-frame)
(speedbar-show-info-under-mouse, speedbar-directory-buttons)
(speedbar-check-vc-this-line, speedbar-files-line-directory)
(speedbar-buffer-buttons, speedbar-buffer-buttons-temp)
(speedbar-buffers-line-directory): Doc fixes.
* tool-bar.el (tool-bar-add-item): Fix typo in docstring.
* emacs-lisp/edebug.el (edebug-unwrap*, edebug-signal)
(edebug-restore-status): Doc fixes.
(edebug-gensym, edebug-top-level-nonstop, edebug-eval-display)
(edebug-eval-result-list, edebug-eval-redisplay, edebug)
(edebug-trace): Fix typos in docstrings.
* emulation/tpu-edt.el (tpu-match-beginning, tpu-match-end)
(tpu-check-match, tpu-goto-breadcrumb, tpu-reset-screen-size)
(tpu-toggle-overwrite-mode, tpu-include, tpu-get, tpu-what-line)
(tpu-insert-escape, tpu-insert-formfeed, tpu-end-define-macro-key)
(tpu-check-search-case, tpu-select, tpu-unselect, tpu-trim-line-ends)
(tpu-toggle-control-keys): Fix typos in docstrings.
(tpu-kill-buffer): Doc fix.
(tpu-make-file-buffer-list, tpu-toggle-regexp, tpu-cut)
(tpu-append-region, tpu-delete-current-char, tpu-emacs-replace):
Reflow docstrings.
* eshell/em-smart.el (eshell-review-quick-commands): Doc fix.
* eshell/esh-arg.el (eshell-quote-backslash): Fix typo in docstring.
* play/solitaire.el (solitaire, solitaire-mode-map, solitaire-mode-hook)
(solitaire-mode, solitaire, solitaire-solve): Fix typos in docstrings.
* progmodes/gdb-ui.el (gdb-source-info): Fix typo in docstring.
* progmodes/python.el (python-comment-line-p, python-blank-line-p)
(python-skip-out): Doc fixes.
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Tue, 26 Aug 2008 11:02:51 +0000 |
parents | a1342e6e097a |
children | 606f2d163a64 1e3a407766b9 |
line wrap: on
line source
;;; cc-compat.el --- cc-mode compatibility with c-mode.el confusion ;; Copyright (C) 1985, 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, ;; 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 ;; 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 3, 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.") ;;;###autoload(put 'c-indent-level 'safe-local-variable 'integerp) (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