Mercurial > emacs
annotate lisp/progmodes/cc-compat.el @ 99602:c94ec53df9d8
* net/ange-ftp.el (ange-ftp-multi-msgs, ange-ftp-good-msgs)
(ange-ftp-try-passive-mode, ange-ftp-data-buffer-name)
(ange-ftp-account-hashtable, ange-ftp-ls-cache-lsargs)
(ange-ftp-ls-cache-file, ange-ftp-ls-cache-res, ange-ftp-get-user)
(ange-ftp-ftp-name-component, ange-ftp-kill-ftp-process)
(ange-ftp-quote-string, ange-ftp-process-handle-line)
(ange-ftp-start-process, ange-ftp-send-cmd, ange-ftp-add-dumb-unix-host)
(ange-ftp-before-parse-ls-hook, ange-ftp-after-parse-ls-hook)
(ange-ftp-ls, ange-ftp-add-dl-dir, ange-ftp-get-file-entry)
(ange-ftp-set-binary-mode, ange-ftp-set-ascii-mode, ange-ftp-get-pwd)
(ange-ftp-file-name-as-directory-alist, ange-ftp-reread-dir)
(ange-ftp-vms-filename-regexp, ange-ftp-bs2000-fix-name-regexp-reverse)
(ange-ftp-bs2000-fix-name-regexp): Fix typos in docstrings.
(ange-ftp-name-format, ange-ftp-gateway-fatal-msgs)
(ange-ftp-xfer-size-msgs, ange-ftp-tmp-name-template)
(ange-ftp-netrc-filename, ange-ftp-disable-netrc-security-check)
(ange-ftp-default-user, ange-ftp-default-password)
(ange-ftp-default-account, ange-ftp-netrc-default-password)
(ange-ftp-netrc-default-account, ange-ftp-dumb-unix-host-regexp)
(ange-ftp-binary-file-name-regexp, ange-ftp-gateway-host)
(ange-ftp-gateway-prompt-pattern, ange-ftp-smart-gateway-port)
(ange-ftp-send-hash, ange-ftp-binary-hash-mark-size)
(ange-ftp-ascii-hash-mark-size, ange-ftp-process-verbose)
(ange-ftp-ftp-program-name, ange-ftp-gateway-ftp-program-name)
(ange-ftp-ftp-program-args, ange-ftp-nslookup-program)
(ange-ftp-make-backup-files, ange-ftp-retry-time)
(ange-ftp-bs2000-special-prefix): Remove * from defcustom docstrings.
(ange-ftp-skip-msgs, ange-ftp-potential-error-msgs)
(ange-ftp-gateway-tmp-name-template)
(ange-ftp-generate-anonymous-password, ange-ftp-local-host-regexp)
(ange-ftp-gateway-program-interactive, ange-ftp-smart-gateway)
(ange-ftp-raw-login): Remove * from defcustom docstrings; fix typos.
(ange-ftp-fatal-msgs): Remove * from defcustom docstring; doc fix.
(ange-ftp-gateway-program): Remove * from docstring and reflow.
(ange-ftp-hash-entry-exists-p, ange-ftp-hash-table-keys)
(ange-ftp-raw-send-cmd, ange-ftp-get-files, ange-ftp-canonize-filename)
(ange-ftp-file-name-as-directory, ange-ftp-directory-file-name):
(ange-ftp-copy-files-async, ange-ftp-rename-remote-to-remote):
(ange-ftp-rename-local-to-remote): Doc fixes.
(ange-ftp-set-xfer-size, ange-ftp-call-cont, ange-ftp-process-filter):
Use `when', `unless'.
(ange-ftp-set-passwd): Rename arg PASSWD to PASSWORD.
(ange-ftp-process-handle-hash): Rename arg STR to STRING.
(ange-ftp-nslookup-host): Rename arg HOST to HOSTNAME.
(ange-ftp-smart-login): Rename arg PASS to PASSWORD.
(ange-ftp-normal-login): Rename arg PASS to PASSWORD. Fix typo.
(ange-ftp-process-sentinel): Use `when'. Fix typo.
(ange-ftp-gwp-start): Use `let', not `let*'; use `when'. Fix typo.
(ange-ftp-fix-name-func-alist, ange-ftp-fix-dir-name-func-alist)
(ange-ftp-parse-list-func-alist, ange-ftp-add-file-entry-alist)
(ange-ftp-delete-file-entry-alist): Fix typos and reflow docstring.
(ange-ftp-dumb-unix-host, ange-ftp-binary-file)
(ange-ftp-directory-files, ange-ftp-file-modtime, ange-ftp-vms-host)
(ange-ftp-mts-host, ange-ftp-cms-host, ange-ftp-bs2000-host)
(ange-ftp-bs2000-posix-host): Use `string-match-p' instead of
`(save-match-data (string-match ...))'.
(ange-ftp-use-gateway-p, ange-ftp-use-smart-gateway-p)
(ange-ftp-file-name-directory, ange-ftp-file-name-nondirectory):
Use `string-match-p' instead of `(save-match-data (string-match ...))'.
Doc fixes.
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Sun, 16 Nov 2008 05:50:23 +0000 |
parents | 52b7a8c22af5 |
children | a9dc0e7c3f2b |
rev | line source |
---|---|
18720 | 1 ;;; cc-compat.el --- cc-mode compatibility with c-mode.el confusion |
2 | |
74372 | 3 ;; Copyright (C) 1985, 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, |
79717 | 4 ;; 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 |
75347 | 5 ;; Free Software Foundation, Inc. |
18720 | 6 |
51714
bc91cbf50c24
Updated CC Mode to version 5.30.
Martin Stjernholm <mast@lysator.liu.se>
parents:
49598
diff
changeset
|
7 ;; Authors: 1998- Martin Stjernholm |
bc91cbf50c24
Updated CC Mode to version 5.30.
Martin Stjernholm <mast@lysator.liu.se>
parents:
49598
diff
changeset
|
8 ;; 1994-1999 Barry A. Warsaw |
30405 | 9 ;; Maintainer: bug-cc-mode@gnu.org |
18720 | 10 ;; Created: August 1994, split from cc-mode.el |
20141 | 11 ;; Version: See cc-mode.el |
18720 | 12 ;; Keywords: c languages oop |
13 | |
14 ;; This file is part of GNU Emacs. | |
15 | |
94673
52b7a8c22af5
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
16 ;; GNU Emacs is free software: you can redistribute it and/or modify |
18720 | 17 ;; it under the terms of the GNU General Public License as published by |
94673
52b7a8c22af5
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
18 ;; the Free Software Foundation, either version 3 of the License, or |
52b7a8c22af5
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
19 ;; (at your option) any later version. |
18720 | 20 |
21 ;; GNU Emacs is distributed in the hope that it will be useful, | |
22 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
23 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
24 ;; GNU General Public License for more details. | |
25 | |
26 ;; You should have received a copy of the GNU General Public License | |
94673
52b7a8c22af5
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
27 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
18720 | 28 |
29 ;;; Commentary: | |
30 ;; | |
31 ;; Boring old c-mode.el (BOCM) is confusion and brain melt. cc-mode.el | |
32 ;; is clarity of thought and purity of chi. If you are still unwilling | |
33 ;; to accept enlightenment, this might help, or it may prolong your | |
34 ;; agony. | |
35 ;; | |
36 ;; To use, add the following to your c-mode-hook: | |
37 ;; | |
38 ;; (require 'cc-compat) | |
39 ;; (c-set-style "BOCM") | |
36920 | 40 ;; |
41 ;; This file is completely unsupported! Although it has been patched | |
42 ;; superficially to keep pace with the rest of CC Mode, it hasn't been | |
43 ;; tested for a long time. | |
18720 | 44 |
45 ;;; Code: | |
46 | |
47 (eval-when-compile | |
26817 | 48 (let ((load-path |
36920 | 49 (if (and (boundp 'byte-compile-dest-file) |
50 (stringp byte-compile-dest-file)) | |
51 (cons (file-name-directory byte-compile-dest-file) load-path) | |
26817 | 52 load-path))) |
51714
bc91cbf50c24
Updated CC Mode to version 5.30.
Martin Stjernholm <mast@lysator.liu.se>
parents:
49598
diff
changeset
|
53 (load "cc-bytecomp" nil t))) |
36920 | 54 |
55 (cc-require 'cc-defs) | |
56 (cc-require 'cc-vars) | |
57 (cc-require 'cc-styles) | |
58 (cc-require 'cc-engine) | |
18720 | 59 |
60 | |
61 ;; In case c-mode.el isn't loaded | |
62 (defvar c-indent-level 2 | |
63 "*Indentation of C statements with respect to containing block.") | |
70590
63b772bfba93
Move `safe-local-variable' declarations to the respective files.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
69140
diff
changeset
|
64 ;;;###autoload(put 'c-indent-level 'safe-local-variable 'integerp) |
63b772bfba93
Move `safe-local-variable' declarations to the respective files.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
69140
diff
changeset
|
65 |
18720 | 66 (defvar c-brace-imaginary-offset 0 |
67 "*Imagined indentation of a C open brace that actually follows a statement.") | |
68 (defvar c-brace-offset 0 | |
69 "*Extra indentation for braces, compared with other text in same context.") | |
70 (defvar c-argdecl-indent 5 | |
71 "*Indentation level of declarations of C function arguments.") | |
72 (defvar c-label-offset -2 | |
73 "*Offset of C label lines and case statements relative to usual indentation.") | |
74 (defvar c-continued-statement-offset 2 | |
75 "*Extra indent for lines not starting new statements.") | |
76 (defvar c-continued-brace-offset 0 | |
77 "*Extra indent for substatements that start with open-braces. | |
78 This is in addition to c-continued-statement-offset.") | |
79 | |
80 | |
81 | |
82 ;; these offsets are taken by brute force testing c-mode.el, since | |
83 ;; there's no logic to what it does. | |
84 (let* ((offsets '(c-offsets-alist . | |
85 ((defun-block-intro . cc-block-intro-offset) | |
86 (statement-block-intro . cc-block-intro-offset) | |
87 (defun-open . 0) | |
88 (class-open . 0) | |
89 (inline-open . c-brace-offset) | |
90 (block-open . c-brace-offset) | |
91 (block-close . cc-block-close-offset) | |
92 (brace-list-open . c-brace-offset) | |
93 (substatement-open . cc-substatement-open-offset) | |
94 (substatement . c-continued-statement-offset) | |
95 (knr-argdecl-intro . c-argdecl-indent) | |
96 (case-label . c-label-offset) | |
97 (access-label . c-label-offset) | |
98 (label . c-label-offset) | |
99 )))) | |
100 (c-add-style "BOCM" offsets)) | |
101 | |
102 | |
103 (defun cc-block-intro-offset (langelem) | |
104 ;; taken directly from calculate-c-indent confusion | |
105 (save-excursion | |
106 (c-backward-syntactic-ws) | |
107 (if (eq (char-before) ?{) | |
108 (forward-char -1) | |
109 (goto-char (cdr langelem))) | |
51714
bc91cbf50c24
Updated CC Mode to version 5.30.
Martin Stjernholm <mast@lysator.liu.se>
parents:
49598
diff
changeset
|
110 (let* ((curcol (save-excursion |
18720 | 111 (goto-char (cdr langelem)) |
112 (current-column))) | |
113 (bocm-lossage | |
114 ;; If no previous statement, indent it relative to line | |
115 ;; brace is on. For open brace in column zero, don't let | |
116 ;; statement start there too. If c-indent-level is zero, | |
117 ;; use c-brace-offset + c-continued-statement-offset | |
118 ;; instead. For open-braces not the first thing in a line, | |
119 ;; add in c-brace-imaginary-offset. | |
120 (+ (if (and (bolp) (zerop c-indent-level)) | |
121 (+ c-brace-offset c-continued-statement-offset) | |
122 c-indent-level) | |
123 ;; Move back over whitespace before the openbrace. If | |
124 ;; openbrace is not first nonwhite thing on the line, | |
125 ;; add the c-brace-imaginary-offset. | |
126 (progn (skip-chars-backward " \t") | |
127 (if (bolp) 0 c-brace-imaginary-offset)) | |
128 ;; If the openbrace is preceded by a parenthesized exp, | |
129 ;; move to the beginning of that; possibly a different | |
130 ;; line | |
131 (progn | |
132 (if (eq (char-before) ?\)) | |
24282 | 133 (c-forward-sexp -1)) |
18720 | 134 ;; Get initial indentation of the line we are on. |
135 (current-indentation))))) | |
136 (- bocm-lossage curcol)))) | |
137 | |
138 | |
139 (defun cc-block-close-offset (langelem) | |
140 (save-excursion | |
141 (let* ((here (point)) | |
51714
bc91cbf50c24
Updated CC Mode to version 5.30.
Martin Stjernholm <mast@lysator.liu.se>
parents:
49598
diff
changeset
|
142 bracep |
18720 | 143 (curcol (progn |
144 (goto-char (cdr langelem)) | |
145 (current-column))) | |
146 (bocm-lossage (progn | |
147 (goto-char (cdr langelem)) | |
148 (if (eq (char-after) ?{) | |
149 (setq bracep t) | |
150 (goto-char here) | |
151 (beginning-of-line) | |
152 (backward-up-list 1) | |
153 (forward-char 1) | |
154 (c-forward-syntactic-ws)) | |
155 (current-column)))) | |
156 (- bocm-lossage curcol | |
157 (if bracep 0 c-indent-level))))) | |
51714
bc91cbf50c24
Updated CC Mode to version 5.30.
Martin Stjernholm <mast@lysator.liu.se>
parents:
49598
diff
changeset
|
158 |
18720 | 159 |
160 (defun cc-substatement-open-offset (langelem) | |
161 (+ c-continued-statement-offset c-continued-brace-offset)) | |
162 | |
163 | |
36920 | 164 (cc-provide 'cc-compat) |
52401 | 165 |
93975
1e3a407766b9
Fix up comment convention on the arch-tag lines.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79717
diff
changeset
|
166 ;; arch-tag: 564dab2f-e6ad-499c-a4a3-fedec3ecc192 |
18720 | 167 ;;; cc-compat.el ends here |