Mercurial > emacs
view lisp/progmodes/cc-compat.el @ 103344:d04aeff22966
2009-06-08 Adrian Robert <Adrian.B.Robert@gmail.com>
* nsterm.m (ns_use_system_highlight_color): Drop, unused.
2009-06-08 Adrian Robert <Adrian.B.Robert@gmail.com>
Changes to support :script/:lang/:otf in NS font driver.
* nsfont.m (nsfont_escape_name, nsfont_unescape_name)
(nsfont_get_family, nsfont_char_width): Rename to ns_ prefix to
indicate not part of font driver interface, and change callers.
(ns_get_family): Remove pointless null check.
(nsfont_spec_to_traits, nsfont_fmember_to_entity): Replace with
ns_spec_to_descriptor, ns_descriptor_to_entity.
(nsfont_trait_distance, nsfont_make_fontset_for_font): Remove.
(ns_attribute_value, ns_attribute_fvalue, ns_has_attribute)
(ns_spec_to_descriptor, ns_descriptor_to_entity)
(ns_charset_covers, ns_lang_to_script, ns_otf_to_script)
(ns_get_req_script, ns_accumulate_script_ranges)
(ns_script_to_charset, ns_get_covering_families, ns_findfonts):
New functions.
(nsfont_list, nsfont_match): Use ns_findfonts.
(nsfont_open): Use font descriptor instead of traits.
(nsfont_draw): Handle "automatic" (lookup-table) compositions.
(dump_glyphstring): Rename to ns_dump_glyphstring.
* nsfns.m (Fns_popup_font_panel): Use shared font manager.
* fontset.c (fontset_from_font): Remove NS-specific code.
2009-06-08 Peter Jones <pjones@pmade.com> (tiny change)
* nsterm.m (ns_draw_window_cursor): Respect cursor_type for
nonactive windows.
2009-06-08 Felix Mueller <felix@enqueue.eu> (tiny change)
* nsterm.m (ns_init_paths): Append path separator to INFOPATH
variable.
author | Adrian Robert <Adrian.B.Robert@gmail.com> |
---|---|
date | Mon, 08 Jun 2009 04:34:54 +0000 |
parents | a9dc0e7c3f2b |
children | 1d1d5d9bd884 |
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, 2009 ;; 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 of the License, 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 GNU Emacs. If not, see <http://www.gnu.org/licenses/>. ;;; 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