1997-07-10 07:54:06 +00:00
|
|
|
|
;;; cc-cmds.el --- user level commands for CC Mode
|
|
|
|
|
|
(c-beginning-of-statement)
(c-end-of-statement): Do not move by sentence in strings.
(c-beginning-of-statement): Major rewrite.
(c-beginning-of-defun, c-indent-defun):
Use (c-point 'bod) instead of beginning-of-defun directly.
(c-beginning-of-defun, c-end-of-defun): New commands.
(c-beginning-of-statement): When moving forward by sentences, because
we're either inside or at the start of a comment, be sure to limit
movement to only within the extent of the comment.
(c-electric-colon): Don't insert newlines before or after scope
operators, regardless of the value of c-hanging-colons.
(c-electric-brace): namespace-open and namespace-close braces can hang.
(c-comment-line-break-function): When breaking a
line-oriented comment, copy the comment leader from the previous
line instead of hardcoding it to "// ". This ensures that
whitespace between the slashes and the text is preserved.
(c-electric-pound, c-electric-brace)
(c-electric-slash, c-electric-star, c-electric-semi&comma)
(c-electric-colon, c-electric-lt-gt, c-scope-operator)
(c-electric-backspace, c-electric-delete)
(c-indent-command, c-indent-exp, c-indent-defun)
(c-backslash-region, c-fill-paragraph): Add "*" to interactive spec.
(c-fill-paragraph): regexp-quote the
fill-prefix when search forward for the end of line oriented comments.
(c-backslash-region): Do not preserve the zmacs region (XEmacs).
1998-02-17 07:04:48 +00:00
|
|
|
|
;; Copyright (C) 1985,87,92,93,94,95,96,97,98 Free Software Foundation, Inc.
|
1997-07-10 07:54:06 +00:00
|
|
|
|
|
|
|
|
|
;; Authors: 1992-1997 Barry A. Warsaw
|
|
|
|
|
;; 1987 Dave Detlefs and Stewart Clamen
|
|
|
|
|
;; 1985 Richard M. Stallman
|
|
|
|
|
;; Maintainer: cc-mode-help@python.org
|
|
|
|
|
;; Created: 22-Apr-1997 (split from cc-mode.el)
|
1997-10-23 07:48:34 +00:00
|
|
|
|
;; Version: See cc-mode.el
|
1997-07-10 07:54:06 +00:00
|
|
|
|
;; 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 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.
|
|
|
|
|
|
1997-07-18 02:10:48 +00:00
|
|
|
|
|
1997-07-10 07:54:06 +00:00
|
|
|
|
|
|
|
|
|
(defun c-calculate-state (arg prevstate)
|
|
|
|
|
;; Calculate the new state of PREVSTATE, t or nil, based on arg. If
|
|
|
|
|
;; arg is nil or zero, toggle the state. If arg is negative, turn
|
|
|
|
|
;; the state off, and if arg is positive, turn the state on
|
|
|
|
|
(if (or (not arg)
|
|
|
|
|
(zerop (setq arg (prefix-numeric-value arg))))
|
|
|
|
|
(not prevstate)
|
|
|
|
|
(> arg 0)))
|
|
|
|
|
|
|
|
|
|
;; Auto-newline and hungry-delete
|
|
|
|
|
(defun c-toggle-auto-state (arg)
|
|
|
|
|
"Toggle auto-newline feature.
|
|
|
|
|
Optional numeric ARG, if supplied turns on auto-newline when positive,
|
|
|
|
|
turns it off when negative, and just toggles it when zero.
|
|
|
|
|
|
|
|
|
|
When the auto-newline feature is enabled (as evidenced by the `/a' or
|
|
|
|
|
`/ah' on the modeline after the mode name) newlines are automatically
|
|
|
|
|
inserted after special characters such as brace, comma, semi-colon,
|
|
|
|
|
and colon."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(setq c-auto-newline (c-calculate-state arg c-auto-newline))
|
|
|
|
|
(c-update-modeline)
|
|
|
|
|
(c-keep-region-active))
|
|
|
|
|
|
|
|
|
|
(defun c-toggle-hungry-state (arg)
|
|
|
|
|
"Toggle hungry-delete-key feature.
|
|
|
|
|
Optional numeric ARG, if supplied turns on hungry-delete when positive,
|
|
|
|
|
turns it off when negative, and just toggles it when zero.
|
|
|
|
|
|
|
|
|
|
When the hungry-delete-key feature is enabled (as evidenced by the
|
|
|
|
|
`/h' or `/ah' on the modeline after the mode name) the delete key
|
|
|
|
|
gobbles all preceding whitespace in one fell swoop."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(setq c-hungry-delete-key (c-calculate-state arg c-hungry-delete-key))
|
|
|
|
|
(c-update-modeline)
|
|
|
|
|
(c-keep-region-active))
|
|
|
|
|
|
|
|
|
|
(defun c-toggle-auto-hungry-state (arg)
|
|
|
|
|
"Toggle auto-newline and hungry-delete-key features.
|
|
|
|
|
Optional numeric ARG, if supplied turns on auto-newline and
|
|
|
|
|
hungry-delete when positive, turns them off when negative, and just
|
|
|
|
|
toggles them when zero.
|
|
|
|
|
|
|
|
|
|
See `c-toggle-auto-state' and `c-toggle-hungry-state' for details."
|
|
|
|
|
(interactive "P")
|
|
|
|
|
(setq c-auto-newline (c-calculate-state arg c-auto-newline))
|
|
|
|
|
(setq c-hungry-delete-key (c-calculate-state arg c-hungry-delete-key))
|
|
|
|
|
(c-update-modeline)
|
|
|
|
|
(c-keep-region-active))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; Electric keys
|
|
|
|
|
|
|
|
|
|
;; Note: In XEmacs 20.3 the Delete and BackSpace keysyms have been
|
|
|
|
|
;; separated and "\177" is no longer an alias for both keys. Also,
|
|
|
|
|
;; the variable delete-key-deletes-forward controls in which direction
|
|
|
|
|
;; the Delete keysym deletes characters. The functions
|
|
|
|
|
;; c-electric-delete and c-electric-backspace attempt to deal with
|
|
|
|
|
;; this new functionality. For Emacs 19 and XEmacs 19 backwards
|
|
|
|
|
;; compatibility, the old behavior has moved to c-electric-backspace
|
|
|
|
|
;; and c-backspace-function.
|
|
|
|
|
|
|
|
|
|
(defun c-electric-backspace (arg)
|
|
|
|
|
"Deletes preceding character or whitespace.
|
|
|
|
|
If `c-hungry-delete-key' is non-nil, as evidenced by the \"/h\" or
|
|
|
|
|
\"/ah\" string on the mode line, then all preceding whitespace is
|
|
|
|
|
consumed. If however an ARG is supplied, or `c-hungry-delete-key' is
|
|
|
|
|
nil, or point is inside a literal then the function in the variable
|
|
|
|
|
`c-backspace-function' is called.
|
|
|
|
|
|
|
|
|
|
See also \\[c-electric-delete]."
|
(c-beginning-of-statement)
(c-end-of-statement): Do not move by sentence in strings.
(c-beginning-of-statement): Major rewrite.
(c-beginning-of-defun, c-indent-defun):
Use (c-point 'bod) instead of beginning-of-defun directly.
(c-beginning-of-defun, c-end-of-defun): New commands.
(c-beginning-of-statement): When moving forward by sentences, because
we're either inside or at the start of a comment, be sure to limit
movement to only within the extent of the comment.
(c-electric-colon): Don't insert newlines before or after scope
operators, regardless of the value of c-hanging-colons.
(c-electric-brace): namespace-open and namespace-close braces can hang.
(c-comment-line-break-function): When breaking a
line-oriented comment, copy the comment leader from the previous
line instead of hardcoding it to "// ". This ensures that
whitespace between the slashes and the text is preserved.
(c-electric-pound, c-electric-brace)
(c-electric-slash, c-electric-star, c-electric-semi&comma)
(c-electric-colon, c-electric-lt-gt, c-scope-operator)
(c-electric-backspace, c-electric-delete)
(c-indent-command, c-indent-exp, c-indent-defun)
(c-backslash-region, c-fill-paragraph): Add "*" to interactive spec.
(c-fill-paragraph): regexp-quote the
fill-prefix when search forward for the end of line oriented comments.
(c-backslash-region): Do not preserve the zmacs region (XEmacs).
1998-02-17 07:04:48 +00:00
|
|
|
|
(interactive "*P")
|
1997-07-10 07:54:06 +00:00
|
|
|
|
(if (or (not c-hungry-delete-key)
|
|
|
|
|
arg
|
|
|
|
|
(c-in-literal))
|
|
|
|
|
(funcall c-backspace-function (prefix-numeric-value arg))
|
|
|
|
|
(let ((here (point)))
|
|
|
|
|
(skip-chars-backward " \t\n")
|
|
|
|
|
(if (/= (point) here)
|
|
|
|
|
(delete-region (point) here)
|
|
|
|
|
(funcall c-backspace-function 1)
|
|
|
|
|
))))
|
|
|
|
|
|
|
|
|
|
(defun c-electric-delete (arg)
|
|
|
|
|
"Deletes preceding or following character or whitespace.
|
|
|
|
|
|
|
|
|
|
The behavior of this function depends on the variable
|
|
|
|
|
`delete-key-deletes-forward'. If this variable is nil (or does not
|
|
|
|
|
exist, as in older Emacsen), then this function behaves identical to
|
|
|
|
|
\\[c-electric-backspace].
|
|
|
|
|
|
(c-beginning-of-statement)
(c-end-of-statement): Do not move by sentence in strings.
(c-beginning-of-statement): Major rewrite.
(c-beginning-of-defun, c-indent-defun):
Use (c-point 'bod) instead of beginning-of-defun directly.
(c-beginning-of-defun, c-end-of-defun): New commands.
(c-beginning-of-statement): When moving forward by sentences, because
we're either inside or at the start of a comment, be sure to limit
movement to only within the extent of the comment.
(c-electric-colon): Don't insert newlines before or after scope
operators, regardless of the value of c-hanging-colons.
(c-electric-brace): namespace-open and namespace-close braces can hang.
(c-comment-line-break-function): When breaking a
line-oriented comment, copy the comment leader from the previous
line instead of hardcoding it to "// ". This ensures that
whitespace between the slashes and the text is preserved.
(c-electric-pound, c-electric-brace)
(c-electric-slash, c-electric-star, c-electric-semi&comma)
(c-electric-colon, c-electric-lt-gt, c-scope-operator)
(c-electric-backspace, c-electric-delete)
(c-indent-command, c-indent-exp, c-indent-defun)
(c-backslash-region, c-fill-paragraph): Add "*" to interactive spec.
(c-fill-paragraph): regexp-quote the
fill-prefix when search forward for the end of line oriented comments.
(c-backslash-region): Do not preserve the zmacs region (XEmacs).
1998-02-17 07:04:48 +00:00
|
|
|
|
If `delete-key-deletes-forward' is non-nil and is supported in your
|
|
|
|
|
Emacs, then deletion occurs in the forward direction. So if
|
|
|
|
|
`c-hungry-delete-key' is non-nil, as evidenced by the \"/h\" or
|
|
|
|
|
\"/ah\" string on the mode line, then all following whitespace is
|
|
|
|
|
consumed. If however an ARG is supplied, or `c-hungry-delete-key' is
|
|
|
|
|
nil, or point is inside a literal then the function in the variable
|
|
|
|
|
`c-delete-function' is called."
|
|
|
|
|
(interactive "*P")
|
1997-07-10 07:54:06 +00:00
|
|
|
|
(if (and (boundp 'delete-key-deletes-forward)
|
|
|
|
|
delete-key-deletes-forward)
|
|
|
|
|
(if (or (not c-hungry-delete-key)
|
|
|
|
|
arg
|
|
|
|
|
(c-in-literal))
|
|
|
|
|
(funcall c-delete-function (prefix-numeric-value arg))
|
|
|
|
|
(let ((here (point)))
|
|
|
|
|
(skip-chars-forward " \t\n")
|
|
|
|
|
(if (/= (point) here)
|
|
|
|
|
(delete-region (point) here)
|
|
|
|
|
(funcall c-delete-function 1))))
|
|
|
|
|
;; act just like c-electric-backspace
|
|
|
|
|
(c-electric-backspace arg)))
|
|
|
|
|
|
|
|
|
|
(defun c-electric-pound (arg)
|
|
|
|
|
"Electric pound (`#') insertion.
|
|
|
|
|
Inserts a `#' character specially depending on the variable
|
|
|
|
|
`c-electric-pound-behavior'. If a numeric ARG is supplied, or if
|
|
|
|
|
point is inside a literal, nothing special happens."
|
(c-beginning-of-statement)
(c-end-of-statement): Do not move by sentence in strings.
(c-beginning-of-statement): Major rewrite.
(c-beginning-of-defun, c-indent-defun):
Use (c-point 'bod) instead of beginning-of-defun directly.
(c-beginning-of-defun, c-end-of-defun): New commands.
(c-beginning-of-statement): When moving forward by sentences, because
we're either inside or at the start of a comment, be sure to limit
movement to only within the extent of the comment.
(c-electric-colon): Don't insert newlines before or after scope
operators, regardless of the value of c-hanging-colons.
(c-electric-brace): namespace-open and namespace-close braces can hang.
(c-comment-line-break-function): When breaking a
line-oriented comment, copy the comment leader from the previous
line instead of hardcoding it to "// ". This ensures that
whitespace between the slashes and the text is preserved.
(c-electric-pound, c-electric-brace)
(c-electric-slash, c-electric-star, c-electric-semi&comma)
(c-electric-colon, c-electric-lt-gt, c-scope-operator)
(c-electric-backspace, c-electric-delete)
(c-indent-command, c-indent-exp, c-indent-defun)
(c-backslash-region, c-fill-paragraph): Add "*" to interactive spec.
(c-fill-paragraph): regexp-quote the
fill-prefix when search forward for the end of line oriented comments.
(c-backslash-region): Do not preserve the zmacs region (XEmacs).
1998-02-17 07:04:48 +00:00
|
|
|
|
(interactive "*P")
|
1997-07-10 07:54:06 +00:00
|
|
|
|
(if (or (c-in-literal)
|
|
|
|
|
arg
|
|
|
|
|
(not (memq 'alignleft c-electric-pound-behavior)))
|
|
|
|
|
;; do nothing special
|
|
|
|
|
(self-insert-command (prefix-numeric-value arg))
|
|
|
|
|
;; place the pound character at the left edge
|
|
|
|
|
(let ((pos (- (point-max) (point)))
|
|
|
|
|
(bolp (bolp)))
|
|
|
|
|
(beginning-of-line)
|
|
|
|
|
(delete-horizontal-space)
|
|
|
|
|
(insert-char last-command-char 1)
|
|
|
|
|
(and (not bolp)
|
|
|
|
|
(goto-char (- (point-max) pos)))
|
|
|
|
|
)))
|
|
|
|
|
|
|
|
|
|
(defun c-electric-brace (arg)
|
|
|
|
|
"Insert a brace.
|
|
|
|
|
|
|
|
|
|
If the auto-newline feature is turned on, as evidenced by the \"/a\"
|
|
|
|
|
or \"/ah\" string on the mode line, newlines are inserted before and
|
|
|
|
|
after braces based on the value of `c-hanging-braces-alist'.
|
|
|
|
|
|
|
|
|
|
Also, the line is re-indented unless a numeric ARG is supplied, there
|
|
|
|
|
are non-whitespace characters present on the line after the brace, or
|
|
|
|
|
the brace is inserted inside a literal."
|
(c-beginning-of-statement)
(c-end-of-statement): Do not move by sentence in strings.
(c-beginning-of-statement): Major rewrite.
(c-beginning-of-defun, c-indent-defun):
Use (c-point 'bod) instead of beginning-of-defun directly.
(c-beginning-of-defun, c-end-of-defun): New commands.
(c-beginning-of-statement): When moving forward by sentences, because
we're either inside or at the start of a comment, be sure to limit
movement to only within the extent of the comment.
(c-electric-colon): Don't insert newlines before or after scope
operators, regardless of the value of c-hanging-colons.
(c-electric-brace): namespace-open and namespace-close braces can hang.
(c-comment-line-break-function): When breaking a
line-oriented comment, copy the comment leader from the previous
line instead of hardcoding it to "// ". This ensures that
whitespace between the slashes and the text is preserved.
(c-electric-pound, c-electric-brace)
(c-electric-slash, c-electric-star, c-electric-semi&comma)
(c-electric-colon, c-electric-lt-gt, c-scope-operator)
(c-electric-backspace, c-electric-delete)
(c-indent-command, c-indent-exp, c-indent-defun)
(c-backslash-region, c-fill-paragraph): Add "*" to interactive spec.
(c-fill-paragraph): regexp-quote the
fill-prefix when search forward for the end of line oriented comments.
(c-backslash-region): Do not preserve the zmacs region (XEmacs).
1998-02-17 07:04:48 +00:00
|
|
|
|
(interactive "*P")
|
1997-07-10 07:54:06 +00:00
|
|
|
|
(let* ((c-state-cache (c-parse-state))
|
|
|
|
|
(safepos (c-safe-position (point) c-state-cache))
|
|
|
|
|
(literal (c-in-literal safepos)))
|
|
|
|
|
;; if we're in a literal, or we're not at the end of the line, or
|
|
|
|
|
;; a numeric arg is provided, or auto-newlining is turned off,
|
|
|
|
|
;; then just insert the character.
|
|
|
|
|
(if (or literal arg
|
|
|
|
|
; (not c-auto-newline)
|
|
|
|
|
(not (looking-at "[ \t]*$")))
|
|
|
|
|
(self-insert-command (prefix-numeric-value arg))
|
(c-beginning-of-statement)
(c-end-of-statement): Do not move by sentence in strings.
(c-beginning-of-statement): Major rewrite.
(c-beginning-of-defun, c-indent-defun):
Use (c-point 'bod) instead of beginning-of-defun directly.
(c-beginning-of-defun, c-end-of-defun): New commands.
(c-beginning-of-statement): When moving forward by sentences, because
we're either inside or at the start of a comment, be sure to limit
movement to only within the extent of the comment.
(c-electric-colon): Don't insert newlines before or after scope
operators, regardless of the value of c-hanging-colons.
(c-electric-brace): namespace-open and namespace-close braces can hang.
(c-comment-line-break-function): When breaking a
line-oriented comment, copy the comment leader from the previous
line instead of hardcoding it to "// ". This ensures that
whitespace between the slashes and the text is preserved.
(c-electric-pound, c-electric-brace)
(c-electric-slash, c-electric-star, c-electric-semi&comma)
(c-electric-colon, c-electric-lt-gt, c-scope-operator)
(c-electric-backspace, c-electric-delete)
(c-indent-command, c-indent-exp, c-indent-defun)
(c-backslash-region, c-fill-paragraph): Add "*" to interactive spec.
(c-fill-paragraph): regexp-quote the
fill-prefix when search forward for the end of line oriented comments.
(c-backslash-region): Do not preserve the zmacs region (XEmacs).
1998-02-17 07:04:48 +00:00
|
|
|
|
(let* ((syms
|
|
|
|
|
;; This is the list of brace syntactic symbols that can
|
|
|
|
|
;; hang. If any new ones are added to c-offsets-alist,
|
|
|
|
|
;; they should be added here as well.
|
|
|
|
|
'(class-open class-close defun-open defun-close
|
|
|
|
|
inline-open inline-close
|
|
|
|
|
brace-list-open brace-list-close
|
|
|
|
|
brace-list-intro brace-list-entry
|
|
|
|
|
block-open block-close
|
|
|
|
|
substatement-open statement-case-open
|
|
|
|
|
extern-lang-open extern-lang-close
|
|
|
|
|
namespace-open namespace-close
|
|
|
|
|
))
|
1997-07-10 07:54:06 +00:00
|
|
|
|
;; we want to inhibit blinking the paren since this will
|
|
|
|
|
;; be most disruptive. we'll blink it ourselves later on
|
|
|
|
|
(old-blink-paren blink-paren-function)
|
|
|
|
|
blink-paren-function
|
|
|
|
|
(insertion-point (point))
|
|
|
|
|
delete-temp-newline
|
1997-08-11 23:51:04 +00:00
|
|
|
|
(preserve-p (and (not (bobp))
|
|
|
|
|
(eq ?\ (char-syntax (char-before)))))
|
1997-07-10 07:54:06 +00:00
|
|
|
|
;; shut this up too
|
|
|
|
|
(c-echo-syntactic-information-p nil)
|
|
|
|
|
(syntax (progn
|
|
|
|
|
;; only insert a newline if there is
|
|
|
|
|
;; non-whitespace behind us
|
|
|
|
|
(if (save-excursion
|
|
|
|
|
(skip-chars-backward " \t")
|
|
|
|
|
(not (bolp)))
|
|
|
|
|
(progn (newline)
|
|
|
|
|
(setq delete-temp-newline t)))
|
|
|
|
|
(self-insert-command (prefix-numeric-value arg))
|
|
|
|
|
;; state cache doesn't change
|
|
|
|
|
(c-guess-basic-syntax)))
|
|
|
|
|
(newlines (and
|
|
|
|
|
c-auto-newline
|
|
|
|
|
(or (c-lookup-lists syms syntax c-hanging-braces-alist)
|
|
|
|
|
'(ignore before after)))))
|
|
|
|
|
;; If syntax is a function symbol, then call it using the
|
|
|
|
|
;; defined semantics.
|
|
|
|
|
(if (and (not (consp (cdr newlines)))
|
|
|
|
|
(functionp (cdr newlines)))
|
|
|
|
|
(let ((c-syntactic-context syntax))
|
|
|
|
|
(setq newlines
|
|
|
|
|
(funcall (cdr newlines) (car newlines) insertion-point))))
|
|
|
|
|
;; does a newline go before the open brace?
|
|
|
|
|
(if (memq 'before newlines)
|
|
|
|
|
;; we leave the newline we've put in there before,
|
|
|
|
|
;; but we need to re-indent the line above
|
|
|
|
|
(let ((pos (- (point-max) (point)))
|
|
|
|
|
(here (point))
|
|
|
|
|
(c-state-cache c-state-cache))
|
|
|
|
|
(forward-line -1)
|
|
|
|
|
;; we may need to update the cache. this should still be
|
|
|
|
|
;; faster than recalculating the state in many cases
|
|
|
|
|
(save-excursion
|
|
|
|
|
(save-restriction
|
|
|
|
|
(narrow-to-region here (point))
|
|
|
|
|
(if (and (c-safe (progn (backward-up-list -1) t))
|
|
|
|
|
(memq (char-before) '(?\) ?}))
|
|
|
|
|
(progn (widen)
|
|
|
|
|
(c-safe (progn (forward-sexp -1) t))))
|
|
|
|
|
(setq c-state-cache
|
|
|
|
|
(c-hack-state (point) 'open c-state-cache))
|
|
|
|
|
(if (and (car c-state-cache)
|
|
|
|
|
(not (consp (car c-state-cache)))
|
|
|
|
|
(<= (point) (car c-state-cache)))
|
|
|
|
|
(setq c-state-cache (cdr c-state-cache))
|
|
|
|
|
))))
|
|
|
|
|
(let ((here (point))
|
|
|
|
|
(shift (c-indent-line)))
|
|
|
|
|
(setq c-state-cache (c-adjust-state (c-point 'bol) here
|
|
|
|
|
(- shift) c-state-cache)))
|
|
|
|
|
(goto-char (- (point-max) pos))
|
|
|
|
|
;; if the buffer has changed due to the indentation, we
|
|
|
|
|
;; need to recalculate syntax for the current line, but
|
|
|
|
|
;; we won't need to update the state cache.
|
|
|
|
|
(if (/= (point) here)
|
|
|
|
|
(setq syntax (c-guess-basic-syntax))))
|
|
|
|
|
;; must remove the newline we just stuck in (if we really did it)
|
|
|
|
|
(and delete-temp-newline
|
|
|
|
|
(save-excursion
|
|
|
|
|
;; if there is whitespace before point, then preserve
|
|
|
|
|
;; at least one space.
|
|
|
|
|
(delete-indentation)
|
|
|
|
|
(just-one-space)
|
|
|
|
|
(if (not preserve-p)
|
|
|
|
|
(delete-char -1))))
|
|
|
|
|
;; since we're hanging the brace, we need to recalculate
|
|
|
|
|
;; syntax. Update the state to accurately reflect the
|
|
|
|
|
;; beginning of the line. We punt if we cross any open or
|
|
|
|
|
;; closed parens because its just too hard to modify the
|
|
|
|
|
;; known state. This limitation will be fixed in v5.
|
|
|
|
|
(save-excursion
|
|
|
|
|
(let ((bol (c-point 'bol)))
|
|
|
|
|
(if (zerop (car (parse-partial-sexp bol (1- (point)))))
|
|
|
|
|
(setq c-state-cache (c-whack-state bol c-state-cache)
|
|
|
|
|
syntax (c-guess-basic-syntax))
|
|
|
|
|
;; gotta punt. this requires some horrible kludgery
|
|
|
|
|
(beginning-of-line)
|
|
|
|
|
(makunbound 'c-state-cache)
|
|
|
|
|
(setq c-state-cache (c-parse-state)
|
|
|
|
|
syntax nil))))
|
|
|
|
|
)
|
|
|
|
|
;; now adjust the line's indentation. don't update the state
|
|
|
|
|
;; cache since c-guess-basic-syntax isn't called when the
|
|
|
|
|
;; syntax is passed to c-indent-line
|
|
|
|
|
(let ((here (point))
|
|
|
|
|
(shift (c-indent-line syntax)))
|
|
|
|
|
(setq c-state-cache (c-adjust-state (c-point 'bol) here
|
|
|
|
|
(- shift) c-state-cache)))
|
|
|
|
|
;; Do all appropriate clean ups
|
|
|
|
|
(let ((here (point))
|
|
|
|
|
(pos (- (point-max) (point)))
|
|
|
|
|
mbeg mend)
|
|
|
|
|
;; clean up empty defun braces
|
|
|
|
|
(if (and c-auto-newline
|
|
|
|
|
(memq 'empty-defun-braces c-cleanup-list)
|
|
|
|
|
(eq last-command-char ?\})
|
|
|
|
|
(c-intersect-lists '(defun-close class-close inline-close)
|
|
|
|
|
syntax)
|
|
|
|
|
(progn
|
|
|
|
|
(forward-char -1)
|
|
|
|
|
(skip-chars-backward " \t\n")
|
|
|
|
|
(eq (char-before) ?\{))
|
|
|
|
|
;; make sure matching open brace isn't in a comment
|
|
|
|
|
(not (c-in-literal)))
|
|
|
|
|
(delete-region (point) (1- here)))
|
|
|
|
|
;; clean up brace-else-brace
|
|
|
|
|
(if (and c-auto-newline
|
|
|
|
|
(memq 'brace-else-brace c-cleanup-list)
|
|
|
|
|
(eq last-command-char ?\{)
|
|
|
|
|
(re-search-backward "}[ \t\n]*else[ \t\n]*{" nil t)
|
|
|
|
|
(progn
|
|
|
|
|
(setq mbeg (match-beginning 0)
|
|
|
|
|
mend (match-end 0))
|
|
|
|
|
(= mend here))
|
|
|
|
|
(not (c-in-literal)))
|
|
|
|
|
(progn
|
|
|
|
|
(delete-region mbeg mend)
|
|
|
|
|
(insert "} else {")))
|
|
|
|
|
;; clean up brace-elseif-brace
|
|
|
|
|
(if (and c-auto-newline
|
|
|
|
|
(memq 'brace-elseif-brace c-cleanup-list)
|
|
|
|
|
(eq last-command-char ?\{)
|
|
|
|
|
(re-search-backward "}[ \t\n]*else[ \t\n]+if[ \t\n]*" nil t)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char (match-end 0))
|
|
|
|
|
(c-safe (forward-sexp 1))
|
|
|
|
|
(skip-chars-forward " \t\n")
|
|
|
|
|
(setq mbeg (match-beginning 0)
|
|
|
|
|
mend (match-end 0))
|
|
|
|
|
(= here (1+ (point))))
|
|
|
|
|
(not (c-in-literal)))
|
|
|
|
|
(progn
|
|
|
|
|
(delete-region mbeg mend)
|
|
|
|
|
(insert "} else if ")))
|
|
|
|
|
(goto-char (- (point-max) pos))
|
|
|
|
|
)
|
|
|
|
|
;; does a newline go after the brace?
|
|
|
|
|
(if (memq 'after newlines)
|
|
|
|
|
(progn
|
|
|
|
|
(newline)
|
|
|
|
|
;; update on c-state-cache
|
|
|
|
|
(let* ((bufpos (- (point) 2))
|
|
|
|
|
(which (if (eq (char-after bufpos) ?{) 'open 'close))
|
|
|
|
|
(c-state-cache (c-hack-state bufpos which c-state-cache)))
|
|
|
|
|
(c-indent-line))))
|
|
|
|
|
;; blink the paren
|
|
|
|
|
(and (eq last-command-char ?\})
|
|
|
|
|
old-blink-paren
|
|
|
|
|
(save-excursion
|
|
|
|
|
(c-backward-syntactic-ws safepos)
|
|
|
|
|
(funcall old-blink-paren)))
|
|
|
|
|
))))
|
|
|
|
|
|
|
|
|
|
(defun c-electric-slash (arg)
|
|
|
|
|
"Insert a slash character.
|
1997-08-11 22:09:45 +00:00
|
|
|
|
|
|
|
|
|
Indent the line as a comment, if:
|
|
|
|
|
|
|
|
|
|
1. The slash is second of a `//' line oriented comment introducing
|
|
|
|
|
token and we are on a comment-only-line, or
|
|
|
|
|
|
|
|
|
|
2. The slash is part of a `*/' token that closes a block oriented
|
|
|
|
|
comment.
|
|
|
|
|
|
1997-07-10 07:54:06 +00:00
|
|
|
|
If numeric ARG is supplied or point is inside a literal, indentation
|
|
|
|
|
is inhibited."
|
(c-beginning-of-statement)
(c-end-of-statement): Do not move by sentence in strings.
(c-beginning-of-statement): Major rewrite.
(c-beginning-of-defun, c-indent-defun):
Use (c-point 'bod) instead of beginning-of-defun directly.
(c-beginning-of-defun, c-end-of-defun): New commands.
(c-beginning-of-statement): When moving forward by sentences, because
we're either inside or at the start of a comment, be sure to limit
movement to only within the extent of the comment.
(c-electric-colon): Don't insert newlines before or after scope
operators, regardless of the value of c-hanging-colons.
(c-electric-brace): namespace-open and namespace-close braces can hang.
(c-comment-line-break-function): When breaking a
line-oriented comment, copy the comment leader from the previous
line instead of hardcoding it to "// ". This ensures that
whitespace between the slashes and the text is preserved.
(c-electric-pound, c-electric-brace)
(c-electric-slash, c-electric-star, c-electric-semi&comma)
(c-electric-colon, c-electric-lt-gt, c-scope-operator)
(c-electric-backspace, c-electric-delete)
(c-indent-command, c-indent-exp, c-indent-defun)
(c-backslash-region, c-fill-paragraph): Add "*" to interactive spec.
(c-fill-paragraph): regexp-quote the
fill-prefix when search forward for the end of line oriented comments.
(c-backslash-region): Do not preserve the zmacs region (XEmacs).
1998-02-17 07:04:48 +00:00
|
|
|
|
(interactive "*P")
|
1997-08-11 22:09:45 +00:00
|
|
|
|
(let* ((ch (char-before))
|
|
|
|
|
(indentp (and (not arg)
|
|
|
|
|
(eq last-command-char ?/)
|
|
|
|
|
(or (and (eq ch ?/)
|
|
|
|
|
(not (c-in-literal)))
|
|
|
|
|
(and (eq ch ?*)
|
|
|
|
|
(c-in-literal)))
|
|
|
|
|
))
|
|
|
|
|
;; shut this up
|
|
|
|
|
(c-echo-syntactic-information-p nil))
|
1997-07-10 07:54:06 +00:00
|
|
|
|
(self-insert-command (prefix-numeric-value arg))
|
|
|
|
|
(if indentp
|
|
|
|
|
(c-indent-line))))
|
|
|
|
|
|
|
|
|
|
(defun c-electric-star (arg)
|
|
|
|
|
"Insert a star character.
|
|
|
|
|
If the star is the second character of a C style comment introducing
|
|
|
|
|
construct, and we are on a comment-only-line, indent line as comment.
|
|
|
|
|
If numeric ARG is supplied or point is inside a literal, indentation
|
|
|
|
|
is inhibited."
|
(c-beginning-of-statement)
(c-end-of-statement): Do not move by sentence in strings.
(c-beginning-of-statement): Major rewrite.
(c-beginning-of-defun, c-indent-defun):
Use (c-point 'bod) instead of beginning-of-defun directly.
(c-beginning-of-defun, c-end-of-defun): New commands.
(c-beginning-of-statement): When moving forward by sentences, because
we're either inside or at the start of a comment, be sure to limit
movement to only within the extent of the comment.
(c-electric-colon): Don't insert newlines before or after scope
operators, regardless of the value of c-hanging-colons.
(c-electric-brace): namespace-open and namespace-close braces can hang.
(c-comment-line-break-function): When breaking a
line-oriented comment, copy the comment leader from the previous
line instead of hardcoding it to "// ". This ensures that
whitespace between the slashes and the text is preserved.
(c-electric-pound, c-electric-brace)
(c-electric-slash, c-electric-star, c-electric-semi&comma)
(c-electric-colon, c-electric-lt-gt, c-scope-operator)
(c-electric-backspace, c-electric-delete)
(c-indent-command, c-indent-exp, c-indent-defun)
(c-backslash-region, c-fill-paragraph): Add "*" to interactive spec.
(c-fill-paragraph): regexp-quote the
fill-prefix when search forward for the end of line oriented comments.
(c-backslash-region): Do not preserve the zmacs region (XEmacs).
1998-02-17 07:04:48 +00:00
|
|
|
|
(interactive "*P")
|
1997-07-10 07:54:06 +00:00
|
|
|
|
(self-insert-command (prefix-numeric-value arg))
|
|
|
|
|
;; if we are in a literal, or if arg is given do not re-indent the
|
|
|
|
|
;; current line, unless this star introduces a comment-only line.
|
|
|
|
|
(if (and (not arg)
|
|
|
|
|
(memq (c-in-literal) '(c))
|
|
|
|
|
(eq (char-before) ?*)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(forward-char -1)
|
|
|
|
|
(skip-chars-backward "*")
|
|
|
|
|
(if (eq (char-before) ?/)
|
|
|
|
|
(forward-char -1))
|
|
|
|
|
(skip-chars-backward " \t")
|
|
|
|
|
(bolp)))
|
|
|
|
|
;; shut this up
|
|
|
|
|
(let (c-echo-syntactic-information-p)
|
|
|
|
|
(c-indent-line))
|
|
|
|
|
))
|
|
|
|
|
|
|
|
|
|
(defun c-electric-semi&comma (arg)
|
|
|
|
|
"Insert a comma or semicolon.
|
|
|
|
|
When the auto-newline feature is turned on, as evidenced by the \"/a\"
|
|
|
|
|
or \"/ah\" string on the mode line, a newline might be inserted. See
|
|
|
|
|
the variable `c-hanging-semi&comma-criteria' for how newline insertion
|
|
|
|
|
is determined.
|
|
|
|
|
|
|
|
|
|
When semicolon is inserted, the line is re-indented unless a numeric
|
|
|
|
|
arg is supplied, point is inside a literal, or there are
|
|
|
|
|
non-whitespace characters on the line following the semicolon."
|
(c-beginning-of-statement)
(c-end-of-statement): Do not move by sentence in strings.
(c-beginning-of-statement): Major rewrite.
(c-beginning-of-defun, c-indent-defun):
Use (c-point 'bod) instead of beginning-of-defun directly.
(c-beginning-of-defun, c-end-of-defun): New commands.
(c-beginning-of-statement): When moving forward by sentences, because
we're either inside or at the start of a comment, be sure to limit
movement to only within the extent of the comment.
(c-electric-colon): Don't insert newlines before or after scope
operators, regardless of the value of c-hanging-colons.
(c-electric-brace): namespace-open and namespace-close braces can hang.
(c-comment-line-break-function): When breaking a
line-oriented comment, copy the comment leader from the previous
line instead of hardcoding it to "// ". This ensures that
whitespace between the slashes and the text is preserved.
(c-electric-pound, c-electric-brace)
(c-electric-slash, c-electric-star, c-electric-semi&comma)
(c-electric-colon, c-electric-lt-gt, c-scope-operator)
(c-electric-backspace, c-electric-delete)
(c-indent-command, c-indent-exp, c-indent-defun)
(c-backslash-region, c-fill-paragraph): Add "*" to interactive spec.
(c-fill-paragraph): regexp-quote the
fill-prefix when search forward for the end of line oriented comments.
(c-backslash-region): Do not preserve the zmacs region (XEmacs).
1998-02-17 07:04:48 +00:00
|
|
|
|
(interactive "*P")
|
1997-07-10 07:54:06 +00:00
|
|
|
|
(let* ((lim (c-most-enclosing-brace (c-parse-state)))
|
|
|
|
|
(literal (c-in-literal lim))
|
|
|
|
|
(here (point))
|
|
|
|
|
;; shut this up
|
|
|
|
|
(c-echo-syntactic-information-p nil))
|
|
|
|
|
(if (or literal
|
|
|
|
|
arg
|
|
|
|
|
(not (looking-at "[ \t]*$")))
|
|
|
|
|
(self-insert-command (prefix-numeric-value arg))
|
|
|
|
|
;; do some special stuff with the character
|
|
|
|
|
(self-insert-command (prefix-numeric-value arg))
|
|
|
|
|
;; do all cleanups, reindentations, and newline insertions, but
|
|
|
|
|
;; only if c-auto-newline is turned on
|
|
|
|
|
(if (not c-auto-newline) nil
|
|
|
|
|
;; clean ups
|
|
|
|
|
(let ((pos (- (point-max) (point))))
|
|
|
|
|
(if (and (or (and
|
|
|
|
|
(eq last-command-char ?,)
|
|
|
|
|
(memq 'list-close-comma c-cleanup-list))
|
|
|
|
|
(and
|
|
|
|
|
(eq last-command-char ?\;)
|
|
|
|
|
(memq 'defun-close-semi c-cleanup-list)))
|
|
|
|
|
(progn
|
|
|
|
|
(forward-char -1)
|
|
|
|
|
(skip-chars-backward " \t\n")
|
|
|
|
|
(eq (char-before) ?}))
|
|
|
|
|
;; make sure matching open brace isn't in a comment
|
|
|
|
|
(not (c-in-literal lim)))
|
|
|
|
|
(delete-region (point) here))
|
|
|
|
|
(goto-char (- (point-max) pos)))
|
|
|
|
|
;; re-indent line
|
|
|
|
|
(c-indent-line)
|
|
|
|
|
;; check to see if a newline should be added
|
|
|
|
|
(let ((criteria c-hanging-semi&comma-criteria)
|
|
|
|
|
answer add-newline-p)
|
|
|
|
|
(while criteria
|
|
|
|
|
(setq answer (funcall (car criteria)))
|
|
|
|
|
;; only nil value means continue checking
|
|
|
|
|
(if (not answer)
|
|
|
|
|
(setq criteria (cdr criteria))
|
|
|
|
|
(setq criteria nil)
|
|
|
|
|
;; only 'stop specifically says do not add a newline
|
|
|
|
|
(setq add-newline-p (not (eq answer 'stop)))
|
|
|
|
|
))
|
|
|
|
|
(if add-newline-p
|
|
|
|
|
(progn (newline)
|
|
|
|
|
(c-indent-line)))
|
|
|
|
|
)))))
|
|
|
|
|
|
|
|
|
|
(defun c-electric-colon (arg)
|
|
|
|
|
"Insert a colon.
|
|
|
|
|
|
|
|
|
|
If the auto-newline feature is turned on, as evidenced by the \"/a\"
|
|
|
|
|
or \"/ah\" string on the mode line, newlines are inserted before and
|
|
|
|
|
after colons based on the value of `c-hanging-colons-alist'.
|
|
|
|
|
|
|
|
|
|
Also, the line is re-indented unless a numeric ARG is supplied, there
|
|
|
|
|
are non-whitespace characters present on the line after the colon, or
|
|
|
|
|
the colon is inserted inside a literal.
|
|
|
|
|
|
|
|
|
|
This function cleans up double colon scope operators based on the
|
|
|
|
|
value of `c-cleanup-list'."
|
(c-beginning-of-statement)
(c-end-of-statement): Do not move by sentence in strings.
(c-beginning-of-statement): Major rewrite.
(c-beginning-of-defun, c-indent-defun):
Use (c-point 'bod) instead of beginning-of-defun directly.
(c-beginning-of-defun, c-end-of-defun): New commands.
(c-beginning-of-statement): When moving forward by sentences, because
we're either inside or at the start of a comment, be sure to limit
movement to only within the extent of the comment.
(c-electric-colon): Don't insert newlines before or after scope
operators, regardless of the value of c-hanging-colons.
(c-electric-brace): namespace-open and namespace-close braces can hang.
(c-comment-line-break-function): When breaking a
line-oriented comment, copy the comment leader from the previous
line instead of hardcoding it to "// ". This ensures that
whitespace between the slashes and the text is preserved.
(c-electric-pound, c-electric-brace)
(c-electric-slash, c-electric-star, c-electric-semi&comma)
(c-electric-colon, c-electric-lt-gt, c-scope-operator)
(c-electric-backspace, c-electric-delete)
(c-indent-command, c-indent-exp, c-indent-defun)
(c-backslash-region, c-fill-paragraph): Add "*" to interactive spec.
(c-fill-paragraph): regexp-quote the
fill-prefix when search forward for the end of line oriented comments.
(c-backslash-region): Do not preserve the zmacs region (XEmacs).
1998-02-17 07:04:48 +00:00
|
|
|
|
(interactive "*P")
|
1997-07-10 07:54:06 +00:00
|
|
|
|
(let* ((bod (c-point 'bod))
|
|
|
|
|
(literal (c-in-literal bod))
|
(c-beginning-of-statement)
(c-end-of-statement): Do not move by sentence in strings.
(c-beginning-of-statement): Major rewrite.
(c-beginning-of-defun, c-indent-defun):
Use (c-point 'bod) instead of beginning-of-defun directly.
(c-beginning-of-defun, c-end-of-defun): New commands.
(c-beginning-of-statement): When moving forward by sentences, because
we're either inside or at the start of a comment, be sure to limit
movement to only within the extent of the comment.
(c-electric-colon): Don't insert newlines before or after scope
operators, regardless of the value of c-hanging-colons.
(c-electric-brace): namespace-open and namespace-close braces can hang.
(c-comment-line-break-function): When breaking a
line-oriented comment, copy the comment leader from the previous
line instead of hardcoding it to "// ". This ensures that
whitespace between the slashes and the text is preserved.
(c-electric-pound, c-electric-brace)
(c-electric-slash, c-electric-star, c-electric-semi&comma)
(c-electric-colon, c-electric-lt-gt, c-scope-operator)
(c-electric-backspace, c-electric-delete)
(c-indent-command, c-indent-exp, c-indent-defun)
(c-backslash-region, c-fill-paragraph): Add "*" to interactive spec.
(c-fill-paragraph): regexp-quote the
fill-prefix when search forward for the end of line oriented comments.
(c-backslash-region): Do not preserve the zmacs region (XEmacs).
1998-02-17 07:04:48 +00:00
|
|
|
|
syntax newlines is-scope-op
|
1997-07-10 07:54:06 +00:00
|
|
|
|
;; shut this up
|
|
|
|
|
(c-echo-syntactic-information-p nil))
|
|
|
|
|
(if (or literal
|
|
|
|
|
arg
|
|
|
|
|
(not (looking-at "[ \t]*$")))
|
|
|
|
|
(self-insert-command (prefix-numeric-value arg))
|
|
|
|
|
;; insert the colon, then do any specified cleanups
|
|
|
|
|
(self-insert-command (prefix-numeric-value arg))
|
|
|
|
|
(let ((pos (- (point-max) (point)))
|
|
|
|
|
(here (point)))
|
|
|
|
|
(if (and c-auto-newline
|
|
|
|
|
(memq 'scope-operator c-cleanup-list)
|
|
|
|
|
(eq (char-before) ?:)
|
|
|
|
|
(progn
|
|
|
|
|
(forward-char -1)
|
|
|
|
|
(skip-chars-backward " \t\n")
|
|
|
|
|
(eq (char-before) ?:))
|
|
|
|
|
(not (c-in-literal))
|
|
|
|
|
(not (eq (char-after (- (point) 2)) ?:)))
|
(c-beginning-of-statement)
(c-end-of-statement): Do not move by sentence in strings.
(c-beginning-of-statement): Major rewrite.
(c-beginning-of-defun, c-indent-defun):
Use (c-point 'bod) instead of beginning-of-defun directly.
(c-beginning-of-defun, c-end-of-defun): New commands.
(c-beginning-of-statement): When moving forward by sentences, because
we're either inside or at the start of a comment, be sure to limit
movement to only within the extent of the comment.
(c-electric-colon): Don't insert newlines before or after scope
operators, regardless of the value of c-hanging-colons.
(c-electric-brace): namespace-open and namespace-close braces can hang.
(c-comment-line-break-function): When breaking a
line-oriented comment, copy the comment leader from the previous
line instead of hardcoding it to "// ". This ensures that
whitespace between the slashes and the text is preserved.
(c-electric-pound, c-electric-brace)
(c-electric-slash, c-electric-star, c-electric-semi&comma)
(c-electric-colon, c-electric-lt-gt, c-scope-operator)
(c-electric-backspace, c-electric-delete)
(c-indent-command, c-indent-exp, c-indent-defun)
(c-backslash-region, c-fill-paragraph): Add "*" to interactive spec.
(c-fill-paragraph): regexp-quote the
fill-prefix when search forward for the end of line oriented comments.
(c-backslash-region): Do not preserve the zmacs region (XEmacs).
1998-02-17 07:04:48 +00:00
|
|
|
|
(progn
|
|
|
|
|
(delete-region (point) (1- here))
|
|
|
|
|
(setq is-scope-op t)))
|
1997-07-10 07:54:06 +00:00
|
|
|
|
(goto-char (- (point-max) pos)))
|
|
|
|
|
;; lets do some special stuff with the colon character
|
|
|
|
|
(setq syntax (c-guess-basic-syntax)
|
|
|
|
|
;; some language elements can only be determined by
|
|
|
|
|
;; checking the following line. Lets first look for ones
|
|
|
|
|
;; that can be found when looking on the line with the
|
|
|
|
|
;; colon
|
|
|
|
|
newlines
|
|
|
|
|
(and c-auto-newline
|
|
|
|
|
(or (c-lookup-lists '(case-label label access-label)
|
|
|
|
|
syntax c-hanging-colons-alist)
|
|
|
|
|
(c-lookup-lists '(member-init-intro inher-intro)
|
|
|
|
|
(prog2
|
|
|
|
|
(insert "\n")
|
|
|
|
|
(c-guess-basic-syntax)
|
|
|
|
|
(delete-char -1))
|
|
|
|
|
c-hanging-colons-alist))))
|
|
|
|
|
;; indent the current line
|
|
|
|
|
(c-indent-line syntax)
|
|
|
|
|
;; does a newline go before the colon? Watch out for already
|
|
|
|
|
;; non-hung colons. However, we don't unhang them because that
|
|
|
|
|
;; would be a cleanup (and anti-social).
|
|
|
|
|
(if (and (memq 'before newlines)
|
(c-beginning-of-statement)
(c-end-of-statement): Do not move by sentence in strings.
(c-beginning-of-statement): Major rewrite.
(c-beginning-of-defun, c-indent-defun):
Use (c-point 'bod) instead of beginning-of-defun directly.
(c-beginning-of-defun, c-end-of-defun): New commands.
(c-beginning-of-statement): When moving forward by sentences, because
we're either inside or at the start of a comment, be sure to limit
movement to only within the extent of the comment.
(c-electric-colon): Don't insert newlines before or after scope
operators, regardless of the value of c-hanging-colons.
(c-electric-brace): namespace-open and namespace-close braces can hang.
(c-comment-line-break-function): When breaking a
line-oriented comment, copy the comment leader from the previous
line instead of hardcoding it to "// ". This ensures that
whitespace between the slashes and the text is preserved.
(c-electric-pound, c-electric-brace)
(c-electric-slash, c-electric-star, c-electric-semi&comma)
(c-electric-colon, c-electric-lt-gt, c-scope-operator)
(c-electric-backspace, c-electric-delete)
(c-indent-command, c-indent-exp, c-indent-defun)
(c-backslash-region, c-fill-paragraph): Add "*" to interactive spec.
(c-fill-paragraph): regexp-quote the
fill-prefix when search forward for the end of line oriented comments.
(c-backslash-region): Do not preserve the zmacs region (XEmacs).
1998-02-17 07:04:48 +00:00
|
|
|
|
(not is-scope-op)
|
1997-07-10 07:54:06 +00:00
|
|
|
|
(save-excursion
|
|
|
|
|
(skip-chars-backward ": \t")
|
|
|
|
|
(not (bolp))))
|
|
|
|
|
(let ((pos (- (point-max) (point))))
|
|
|
|
|
(forward-char -1)
|
|
|
|
|
(newline)
|
|
|
|
|
(c-indent-line)
|
|
|
|
|
(goto-char (- (point-max) pos))))
|
|
|
|
|
;; does a newline go after the colon?
|
(c-beginning-of-statement)
(c-end-of-statement): Do not move by sentence in strings.
(c-beginning-of-statement): Major rewrite.
(c-beginning-of-defun, c-indent-defun):
Use (c-point 'bod) instead of beginning-of-defun directly.
(c-beginning-of-defun, c-end-of-defun): New commands.
(c-beginning-of-statement): When moving forward by sentences, because
we're either inside or at the start of a comment, be sure to limit
movement to only within the extent of the comment.
(c-electric-colon): Don't insert newlines before or after scope
operators, regardless of the value of c-hanging-colons.
(c-electric-brace): namespace-open and namespace-close braces can hang.
(c-comment-line-break-function): When breaking a
line-oriented comment, copy the comment leader from the previous
line instead of hardcoding it to "// ". This ensures that
whitespace between the slashes and the text is preserved.
(c-electric-pound, c-electric-brace)
(c-electric-slash, c-electric-star, c-electric-semi&comma)
(c-electric-colon, c-electric-lt-gt, c-scope-operator)
(c-electric-backspace, c-electric-delete)
(c-indent-command, c-indent-exp, c-indent-defun)
(c-backslash-region, c-fill-paragraph): Add "*" to interactive spec.
(c-fill-paragraph): regexp-quote the
fill-prefix when search forward for the end of line oriented comments.
(c-backslash-region): Do not preserve the zmacs region (XEmacs).
1998-02-17 07:04:48 +00:00
|
|
|
|
(if (and (memq 'after (cdr-safe newlines))
|
|
|
|
|
(not is-scope-op))
|
1997-07-10 07:54:06 +00:00
|
|
|
|
(progn
|
|
|
|
|
(newline)
|
|
|
|
|
(c-indent-line)))
|
|
|
|
|
)))
|
|
|
|
|
|
|
|
|
|
(defun c-electric-lt-gt (arg)
|
|
|
|
|
"Insert a less-than, or greater-than character.
|
|
|
|
|
When the auto-newline feature is turned on, as evidenced by the \"/a\"
|
|
|
|
|
or \"/ah\" string on the mode line, the line will be re-indented if
|
|
|
|
|
the character inserted is the second of a C++ style stream operator
|
|
|
|
|
and the buffer is in C++ mode.
|
|
|
|
|
|
|
|
|
|
The line will also not be re-indented if a numeric argument is
|
|
|
|
|
supplied, or point is inside a literal."
|
(c-beginning-of-statement)
(c-end-of-statement): Do not move by sentence in strings.
(c-beginning-of-statement): Major rewrite.
(c-beginning-of-defun, c-indent-defun):
Use (c-point 'bod) instead of beginning-of-defun directly.
(c-beginning-of-defun, c-end-of-defun): New commands.
(c-beginning-of-statement): When moving forward by sentences, because
we're either inside or at the start of a comment, be sure to limit
movement to only within the extent of the comment.
(c-electric-colon): Don't insert newlines before or after scope
operators, regardless of the value of c-hanging-colons.
(c-electric-brace): namespace-open and namespace-close braces can hang.
(c-comment-line-break-function): When breaking a
line-oriented comment, copy the comment leader from the previous
line instead of hardcoding it to "// ". This ensures that
whitespace between the slashes and the text is preserved.
(c-electric-pound, c-electric-brace)
(c-electric-slash, c-electric-star, c-electric-semi&comma)
(c-electric-colon, c-electric-lt-gt, c-scope-operator)
(c-electric-backspace, c-electric-delete)
(c-indent-command, c-indent-exp, c-indent-defun)
(c-backslash-region, c-fill-paragraph): Add "*" to interactive spec.
(c-fill-paragraph): regexp-quote the
fill-prefix when search forward for the end of line oriented comments.
(c-backslash-region): Do not preserve the zmacs region (XEmacs).
1998-02-17 07:04:48 +00:00
|
|
|
|
(interactive "*P")
|
1997-07-10 07:54:06 +00:00
|
|
|
|
(let ((indentp (and (not arg)
|
|
|
|
|
(eq (char-before) last-command-char)
|
|
|
|
|
(not (c-in-literal))))
|
|
|
|
|
;; shut this up
|
|
|
|
|
(c-echo-syntactic-information-p nil))
|
|
|
|
|
(self-insert-command (prefix-numeric-value arg))
|
|
|
|
|
(if indentp
|
|
|
|
|
(c-indent-line))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; better movement routines for ThisStyleOfVariablesCommonInCPlusPlus
|
|
|
|
|
;; originally contributed by Terry_Glanfield.Southern@rxuk.xerox.com
|
|
|
|
|
(defun c-forward-into-nomenclature (&optional arg)
|
|
|
|
|
"Move forward to end of a nomenclature section or word.
|
|
|
|
|
With arg, to it arg times."
|
|
|
|
|
(interactive "p")
|
|
|
|
|
(let ((case-fold-search nil))
|
|
|
|
|
(if (> arg 0)
|
|
|
|
|
(re-search-forward "\\W*\\([A-Z]*[a-z0-9]*\\)" (point-max) t arg)
|
|
|
|
|
(while (and (< arg 0)
|
|
|
|
|
(re-search-backward
|
|
|
|
|
"\\(\\(\\W\\|[a-z0-9]\\)[A-Z]+\\|\\W\\w+\\)"
|
|
|
|
|
(point-min) 0))
|
|
|
|
|
(forward-char 1)
|
|
|
|
|
(setq arg (1+ arg)))))
|
|
|
|
|
(c-keep-region-active))
|
|
|
|
|
|
|
|
|
|
(defun c-backward-into-nomenclature (&optional arg)
|
|
|
|
|
"Move backward to beginning of a nomenclature section or word.
|
|
|
|
|
With optional ARG, move that many times. If ARG is negative, move
|
|
|
|
|
forward."
|
|
|
|
|
(interactive "p")
|
|
|
|
|
(c-forward-into-nomenclature (- arg))
|
|
|
|
|
(c-keep-region-active))
|
|
|
|
|
|
|
|
|
|
(defun c-scope-operator ()
|
|
|
|
|
"Insert a double colon scope operator at point.
|
|
|
|
|
No indentation or other \"electric\" behavior is performed."
|
(c-beginning-of-statement)
(c-end-of-statement): Do not move by sentence in strings.
(c-beginning-of-statement): Major rewrite.
(c-beginning-of-defun, c-indent-defun):
Use (c-point 'bod) instead of beginning-of-defun directly.
(c-beginning-of-defun, c-end-of-defun): New commands.
(c-beginning-of-statement): When moving forward by sentences, because
we're either inside or at the start of a comment, be sure to limit
movement to only within the extent of the comment.
(c-electric-colon): Don't insert newlines before or after scope
operators, regardless of the value of c-hanging-colons.
(c-electric-brace): namespace-open and namespace-close braces can hang.
(c-comment-line-break-function): When breaking a
line-oriented comment, copy the comment leader from the previous
line instead of hardcoding it to "// ". This ensures that
whitespace between the slashes and the text is preserved.
(c-electric-pound, c-electric-brace)
(c-electric-slash, c-electric-star, c-electric-semi&comma)
(c-electric-colon, c-electric-lt-gt, c-scope-operator)
(c-electric-backspace, c-electric-delete)
(c-indent-command, c-indent-exp, c-indent-defun)
(c-backslash-region, c-fill-paragraph): Add "*" to interactive spec.
(c-fill-paragraph): regexp-quote the
fill-prefix when search forward for the end of line oriented comments.
(c-backslash-region): Do not preserve the zmacs region (XEmacs).
1998-02-17 07:04:48 +00:00
|
|
|
|
(interactive "*")
|
1997-07-10 07:54:06 +00:00
|
|
|
|
(insert "::"))
|
|
|
|
|
|
(c-beginning-of-statement)
(c-end-of-statement): Do not move by sentence in strings.
(c-beginning-of-statement): Major rewrite.
(c-beginning-of-defun, c-indent-defun):
Use (c-point 'bod) instead of beginning-of-defun directly.
(c-beginning-of-defun, c-end-of-defun): New commands.
(c-beginning-of-statement): When moving forward by sentences, because
we're either inside or at the start of a comment, be sure to limit
movement to only within the extent of the comment.
(c-electric-colon): Don't insert newlines before or after scope
operators, regardless of the value of c-hanging-colons.
(c-electric-brace): namespace-open and namespace-close braces can hang.
(c-comment-line-break-function): When breaking a
line-oriented comment, copy the comment leader from the previous
line instead of hardcoding it to "// ". This ensures that
whitespace between the slashes and the text is preserved.
(c-electric-pound, c-electric-brace)
(c-electric-slash, c-electric-star, c-electric-semi&comma)
(c-electric-colon, c-electric-lt-gt, c-scope-operator)
(c-electric-backspace, c-electric-delete)
(c-indent-command, c-indent-exp, c-indent-defun)
(c-backslash-region, c-fill-paragraph): Add "*" to interactive spec.
(c-fill-paragraph): regexp-quote the
fill-prefix when search forward for the end of line oriented comments.
(c-backslash-region): Do not preserve the zmacs region (XEmacs).
1998-02-17 07:04:48 +00:00
|
|
|
|
(defun c-beginning-of-defun (&optional arg)
|
|
|
|
|
"Move backward to the beginning of a defun.
|
|
|
|
|
With argument, do it that many times. Negative arg -N
|
|
|
|
|
means move forward to Nth following beginning of defun.
|
|
|
|
|
Returns t unless search stops due to beginning or end of buffer.
|
|
|
|
|
|
|
|
|
|
Unlike the built-in `beginning-of-defun' this tries to be smarter
|
|
|
|
|
about finding the char with open-parenthesis syntax that starts the
|
|
|
|
|
defun."
|
|
|
|
|
(interactive "p")
|
|
|
|
|
(if (< arg 0)
|
|
|
|
|
(c-end-of-defun (- arg))
|
|
|
|
|
(while (> arg 0)
|
|
|
|
|
(let ((state (nreverse (c-parse-state)))
|
|
|
|
|
prevbod bod)
|
|
|
|
|
(while (and state (not bod))
|
|
|
|
|
(setq bod (car state)
|
|
|
|
|
state (cdr state))
|
|
|
|
|
(if (consp bod)
|
|
|
|
|
(setq prevbod (car bod)
|
|
|
|
|
bod nil)))
|
|
|
|
|
(cond
|
|
|
|
|
(bod (goto-char bod))
|
|
|
|
|
(prevbod (goto-char prevbod))
|
|
|
|
|
(t (goto-char (c-point 'bod)))))
|
|
|
|
|
(setq arg (1- arg))))
|
|
|
|
|
(c-keep-region-active))
|
|
|
|
|
|
|
|
|
|
(defun c-end-of-defun (&optional arg)
|
|
|
|
|
"Move forward to next end of defun. With argument, do it that many times.
|
|
|
|
|
Negative argument -N means move back to Nth preceding end of defun.
|
|
|
|
|
|
|
|
|
|
An end of a defun occurs right after the close-parenthesis that matches
|
|
|
|
|
the open-parenthesis that starts a defun; see `beginning-of-defun'."
|
|
|
|
|
(interactive "p")
|
|
|
|
|
(if (< arg 0)
|
|
|
|
|
(c-beginning-of-defun (- arg))
|
|
|
|
|
(while (> arg 0)
|
|
|
|
|
;; skip down into the next defun-block
|
|
|
|
|
(while (and (c-safe (down-list 1) t)
|
|
|
|
|
(not (eq (char-before) ?{)))
|
|
|
|
|
(forward-char -1)
|
|
|
|
|
(forward-sexp))
|
|
|
|
|
(c-beginning-of-defun 1)
|
|
|
|
|
(forward-sexp 1)
|
|
|
|
|
(setq arg (1- arg)))
|
|
|
|
|
(forward-line 1))
|
|
|
|
|
(c-keep-region-active))
|
|
|
|
|
|
1997-07-10 07:54:06 +00:00
|
|
|
|
|
|
|
|
|
(defun c-beginning-of-statement (&optional count lim sentence-flag)
|
|
|
|
|
"Go to the beginning of the innermost C statement.
|
|
|
|
|
With prefix arg, go back N - 1 statements. If already at the
|
(c-beginning-of-statement)
(c-end-of-statement): Do not move by sentence in strings.
(c-beginning-of-statement): Major rewrite.
(c-beginning-of-defun, c-indent-defun):
Use (c-point 'bod) instead of beginning-of-defun directly.
(c-beginning-of-defun, c-end-of-defun): New commands.
(c-beginning-of-statement): When moving forward by sentences, because
we're either inside or at the start of a comment, be sure to limit
movement to only within the extent of the comment.
(c-electric-colon): Don't insert newlines before or after scope
operators, regardless of the value of c-hanging-colons.
(c-electric-brace): namespace-open and namespace-close braces can hang.
(c-comment-line-break-function): When breaking a
line-oriented comment, copy the comment leader from the previous
line instead of hardcoding it to "// ". This ensures that
whitespace between the slashes and the text is preserved.
(c-electric-pound, c-electric-brace)
(c-electric-slash, c-electric-star, c-electric-semi&comma)
(c-electric-colon, c-electric-lt-gt, c-scope-operator)
(c-electric-backspace, c-electric-delete)
(c-indent-command, c-indent-exp, c-indent-defun)
(c-backslash-region, c-fill-paragraph): Add "*" to interactive spec.
(c-fill-paragraph): regexp-quote the
fill-prefix when search forward for the end of line oriented comments.
(c-backslash-region): Do not preserve the zmacs region (XEmacs).
1998-02-17 07:04:48 +00:00
|
|
|
|
beginning of a statement then go to the beginning of the closest
|
|
|
|
|
preceding one, moving into nested blocks if necessary (use
|
|
|
|
|
\\[backward-sexp] to skip over a block). If within a comment, or next
|
|
|
|
|
to a comment (only whitespace between), move by sentences instead of
|
|
|
|
|
statements.
|
1997-07-10 07:54:06 +00:00
|
|
|
|
|
|
|
|
|
When called from a program, this function takes 3 optional args: the
|
|
|
|
|
repetition count, a buffer position limit which is the farthest back
|
|
|
|
|
to search, and a flag saying whether to do sentence motion when in a
|
|
|
|
|
comment."
|
|
|
|
|
(interactive (list (prefix-numeric-value current-prefix-arg)
|
|
|
|
|
nil t))
|
(c-beginning-of-statement)
(c-end-of-statement): Do not move by sentence in strings.
(c-beginning-of-statement): Major rewrite.
(c-beginning-of-defun, c-indent-defun):
Use (c-point 'bod) instead of beginning-of-defun directly.
(c-beginning-of-defun, c-end-of-defun): New commands.
(c-beginning-of-statement): When moving forward by sentences, because
we're either inside or at the start of a comment, be sure to limit
movement to only within the extent of the comment.
(c-electric-colon): Don't insert newlines before or after scope
operators, regardless of the value of c-hanging-colons.
(c-electric-brace): namespace-open and namespace-close braces can hang.
(c-comment-line-break-function): When breaking a
line-oriented comment, copy the comment leader from the previous
line instead of hardcoding it to "// ". This ensures that
whitespace between the slashes and the text is preserved.
(c-electric-pound, c-electric-brace)
(c-electric-slash, c-electric-star, c-electric-semi&comma)
(c-electric-colon, c-electric-lt-gt, c-scope-operator)
(c-electric-backspace, c-electric-delete)
(c-indent-command, c-indent-exp, c-indent-defun)
(c-backslash-region, c-fill-paragraph): Add "*" to interactive spec.
(c-fill-paragraph): regexp-quote the
fill-prefix when search forward for the end of line oriented comments.
(c-backslash-region): Do not preserve the zmacs region (XEmacs).
1998-02-17 07:04:48 +00:00
|
|
|
|
(let* ((count (or count 1))
|
|
|
|
|
here
|
|
|
|
|
(range (c-collect-line-comments (c-literal-limits lim))))
|
|
|
|
|
(while (and (/= count 0)
|
|
|
|
|
(or (not lim) (> (point) lim)))
|
|
|
|
|
(setq here (point))
|
|
|
|
|
(if (and (not range) sentence-flag)
|
|
|
|
|
(save-excursion
|
|
|
|
|
;; Find the comment next to point if we're not in one.
|
|
|
|
|
(if (> count 0)
|
|
|
|
|
;; Finding a comment backwards is a bit cumbersome
|
|
|
|
|
;; because `forward-comment' regards every newline as
|
|
|
|
|
;; a comment when searching backwards (Emacs 19.34).
|
|
|
|
|
(while (and (progn (skip-chars-backward " \t")
|
|
|
|
|
(setq range (point))
|
|
|
|
|
(setq range (if (forward-comment -1)
|
|
|
|
|
(cons (point) range)
|
|
|
|
|
nil)))
|
|
|
|
|
(= (char-after) ?\n)))
|
|
|
|
|
(skip-chars-forward " \t\n")
|
|
|
|
|
(setq range (point))
|
|
|
|
|
(setq range (if (forward-comment 1)
|
|
|
|
|
(cons range (point))
|
|
|
|
|
nil)))
|
|
|
|
|
(setq range (c-collect-line-comments range))))
|
|
|
|
|
(if (and (< count 0) (= here (point-max)))
|
|
|
|
|
;; Special case because eob might be in a literal.
|
|
|
|
|
(setq range nil))
|
|
|
|
|
(if range
|
|
|
|
|
(if (and sentence-flag
|
|
|
|
|
(/= (char-syntax (char-after (car range))) ?\"))
|
|
|
|
|
(progn
|
|
|
|
|
;; move by sentence, but not past the limit of the literal
|
|
|
|
|
(save-restriction
|
|
|
|
|
(narrow-to-region (save-excursion
|
|
|
|
|
(goto-char (car range))
|
|
|
|
|
(looking-at comment-start-skip)
|
|
|
|
|
(goto-char (match-end 0))
|
|
|
|
|
(point))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char (cdr range))
|
|
|
|
|
(if (save-excursion
|
|
|
|
|
(goto-char (car range))
|
|
|
|
|
(looking-at "/\\*"))
|
|
|
|
|
(backward-char 2))
|
|
|
|
|
(skip-chars-backward " \t\n")
|
|
|
|
|
(point)))
|
|
|
|
|
(c-safe (forward-sentence (if (> count 0) -1 1))))
|
|
|
|
|
;; See if we should escape the literal.
|
|
|
|
|
(if (> count 0)
|
|
|
|
|
(if (< (point) here)
|
|
|
|
|
(setq count (1- count))
|
|
|
|
|
(goto-char (car range))
|
|
|
|
|
(setq range nil))
|
|
|
|
|
(if (> (point) here)
|
|
|
|
|
(setq count (1+ count))
|
|
|
|
|
(goto-char (cdr range))
|
|
|
|
|
(setq range nil))))
|
|
|
|
|
(goto-char (if (> count 0) (car range) (cdr range)))
|
|
|
|
|
(setq range nil))
|
|
|
|
|
;; Below we do approximately the same as
|
|
|
|
|
;; c-beginning-of-statement-1 and c-end-of-statement-1 and
|
|
|
|
|
;; perhaps they should be changed, but that'd likely break a
|
|
|
|
|
;; lot in cc-engine.
|
|
|
|
|
(goto-char here)
|
|
|
|
|
;; Move out of any enclosing non-`{ }' parens.
|
|
|
|
|
(let ((last (point)))
|
|
|
|
|
(while (and (c-safe (progn (up-list 1) t))
|
|
|
|
|
(/= (char-before) ?\}))
|
|
|
|
|
(setq last (point)))
|
|
|
|
|
(goto-char last))
|
|
|
|
|
(if (> count 0)
|
|
|
|
|
(if (condition-case nil
|
|
|
|
|
;; Stop before `{' and after `;', `{', `}' and
|
|
|
|
|
;; `};' when not followed by `}', but on the other
|
|
|
|
|
;; side of the syntactic ws. Also stop before
|
|
|
|
|
;; `}', but only to catch comments. Move by sexps
|
|
|
|
|
;; and move into `{ }', but not into any other
|
|
|
|
|
;; other type of paren.
|
|
|
|
|
(catch 'done
|
|
|
|
|
(let (last)
|
|
|
|
|
(while t
|
|
|
|
|
(setq last (point))
|
|
|
|
|
(if (and (looking-at "[{}]")
|
|
|
|
|
(/= here last))
|
|
|
|
|
(throw 'done (= (char-after) ?{)))
|
|
|
|
|
(c-backward-syntactic-ws)
|
|
|
|
|
(cond ((bobp) ; Must handle bob specially.
|
|
|
|
|
(if (= here last)
|
|
|
|
|
(if (= last (point-min))
|
|
|
|
|
(throw 'done t)
|
|
|
|
|
(goto-char last)
|
|
|
|
|
(throw 'done nil))
|
|
|
|
|
(goto-char last)
|
|
|
|
|
(throw 'done t)))
|
|
|
|
|
((progn (backward-char)
|
|
|
|
|
(looking-at "[;{}]"))
|
|
|
|
|
(if (or (= here last)
|
|
|
|
|
(= (char-after last) ?}))
|
|
|
|
|
(if (and (= (char-before) ?})
|
|
|
|
|
(= (char-after) ?\;))
|
|
|
|
|
(backward-char))
|
|
|
|
|
(goto-char last)
|
|
|
|
|
(throw 'done t)))
|
|
|
|
|
((or (= (char-syntax (char-after)) ?\))
|
|
|
|
|
(= (char-syntax (char-after)) ?\"))
|
|
|
|
|
(forward-char)
|
|
|
|
|
(backward-sexp))
|
|
|
|
|
))))
|
|
|
|
|
(error
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
t))
|
|
|
|
|
(setq count (1- count)))
|
|
|
|
|
(if (condition-case nil
|
|
|
|
|
;; Stop before `{' and `}' and after `;', `}' and
|
|
|
|
|
;; `};'. Also stop after `{', but only to catch
|
|
|
|
|
;; comments. Move by sexps and move into `{ }', but
|
|
|
|
|
;; not into any other other type of paren.
|
|
|
|
|
(catch 'done
|
|
|
|
|
(let (last)
|
|
|
|
|
(while t
|
|
|
|
|
(setq last (point))
|
|
|
|
|
(c-forward-syntactic-ws)
|
|
|
|
|
(cond ((= (char-after) ?{)
|
|
|
|
|
(if (= here last)
|
|
|
|
|
(progn (forward-char)
|
|
|
|
|
(throw 'done nil))
|
|
|
|
|
(goto-char last)
|
|
|
|
|
(throw 'done t)))
|
|
|
|
|
((and (= (char-after) ?})
|
|
|
|
|
(/= here last))
|
|
|
|
|
(goto-char last)
|
|
|
|
|
(throw 'done t))
|
|
|
|
|
((looking-at ";\\|};?")
|
|
|
|
|
(goto-char (match-end 0))
|
|
|
|
|
(throw 'done t))
|
|
|
|
|
((or (= (char-syntax (char-after)) ?\()
|
|
|
|
|
(= (char-syntax (char-after)) ?\"))
|
|
|
|
|
(forward-sexp))
|
|
|
|
|
(t
|
|
|
|
|
(forward-char))
|
|
|
|
|
))))
|
|
|
|
|
(error
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
t))
|
|
|
|
|
(setq count (1+ count)))))
|
|
|
|
|
;; If we haven't moved we're near a buffer limit.
|
|
|
|
|
(when (= (point) here)
|
|
|
|
|
(goto-char (if (> count 0) (point-min) (point-max)))
|
|
|
|
|
(setq count 0)))
|
1997-07-10 07:54:06 +00:00
|
|
|
|
;; its possible we've been left up-buf of lim
|
(c-beginning-of-statement)
(c-end-of-statement): Do not move by sentence in strings.
(c-beginning-of-statement): Major rewrite.
(c-beginning-of-defun, c-indent-defun):
Use (c-point 'bod) instead of beginning-of-defun directly.
(c-beginning-of-defun, c-end-of-defun): New commands.
(c-beginning-of-statement): When moving forward by sentences, because
we're either inside or at the start of a comment, be sure to limit
movement to only within the extent of the comment.
(c-electric-colon): Don't insert newlines before or after scope
operators, regardless of the value of c-hanging-colons.
(c-electric-brace): namespace-open and namespace-close braces can hang.
(c-comment-line-break-function): When breaking a
line-oriented comment, copy the comment leader from the previous
line instead of hardcoding it to "// ". This ensures that
whitespace between the slashes and the text is preserved.
(c-electric-pound, c-electric-brace)
(c-electric-slash, c-electric-star, c-electric-semi&comma)
(c-electric-colon, c-electric-lt-gt, c-scope-operator)
(c-electric-backspace, c-electric-delete)
(c-indent-command, c-indent-exp, c-indent-defun)
(c-backslash-region, c-fill-paragraph): Add "*" to interactive spec.
(c-fill-paragraph): regexp-quote the
fill-prefix when search forward for the end of line oriented comments.
(c-backslash-region): Do not preserve the zmacs region (XEmacs).
1998-02-17 07:04:48 +00:00
|
|
|
|
(if lim (goto-char (max (point) lim))))
|
1997-07-10 07:54:06 +00:00
|
|
|
|
(c-keep-region-active))
|
|
|
|
|
|
|
|
|
|
(defun c-end-of-statement (&optional count lim sentence-flag)
|
|
|
|
|
"Go to the end of the innermost C statement.
|
(c-beginning-of-statement)
(c-end-of-statement): Do not move by sentence in strings.
(c-beginning-of-statement): Major rewrite.
(c-beginning-of-defun, c-indent-defun):
Use (c-point 'bod) instead of beginning-of-defun directly.
(c-beginning-of-defun, c-end-of-defun): New commands.
(c-beginning-of-statement): When moving forward by sentences, because
we're either inside or at the start of a comment, be sure to limit
movement to only within the extent of the comment.
(c-electric-colon): Don't insert newlines before or after scope
operators, regardless of the value of c-hanging-colons.
(c-electric-brace): namespace-open and namespace-close braces can hang.
(c-comment-line-break-function): When breaking a
line-oriented comment, copy the comment leader from the previous
line instead of hardcoding it to "// ". This ensures that
whitespace between the slashes and the text is preserved.
(c-electric-pound, c-electric-brace)
(c-electric-slash, c-electric-star, c-electric-semi&comma)
(c-electric-colon, c-electric-lt-gt, c-scope-operator)
(c-electric-backspace, c-electric-delete)
(c-indent-command, c-indent-exp, c-indent-defun)
(c-backslash-region, c-fill-paragraph): Add "*" to interactive spec.
(c-fill-paragraph): regexp-quote the
fill-prefix when search forward for the end of line oriented comments.
(c-backslash-region): Do not preserve the zmacs region (XEmacs).
1998-02-17 07:04:48 +00:00
|
|
|
|
With prefix arg, go forward N - 1 statements. Move forward to the end
|
|
|
|
|
of the next statement if already at end, and move into nested blocks
|
|
|
|
|
\(use \\[forward-sexp] to skip over a block). If within a comment, or
|
|
|
|
|
next to a comment (only whitespace between), move by sentences instead
|
|
|
|
|
of statements.
|
1997-07-10 07:54:06 +00:00
|
|
|
|
|
|
|
|
|
When called from a program, this function takes 3 optional args: the
|
|
|
|
|
repetition count, a buffer position limit which is the farthest back
|
|
|
|
|
to search, and a flag saying whether to do sentence motion when in a
|
|
|
|
|
comment."
|
|
|
|
|
(interactive (list (prefix-numeric-value current-prefix-arg)
|
|
|
|
|
nil t))
|
|
|
|
|
(c-beginning-of-statement (- (or count 1)) lim sentence-flag)
|
|
|
|
|
(c-keep-region-active))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; set up electric character functions to work with pending-del,
|
|
|
|
|
;; (a.k.a. delsel) mode. All symbols get the t value except
|
1997-07-18 02:10:48 +00:00
|
|
|
|
;; the functions which delete, which gets 'supersede.
|
1997-07-10 07:54:06 +00:00
|
|
|
|
(mapcar
|
|
|
|
|
(function
|
|
|
|
|
(lambda (sym)
|
|
|
|
|
(put sym 'delete-selection t) ; for delsel (Emacs)
|
|
|
|
|
(put sym 'pending-delete t))) ; for pending-del (XEmacs)
|
|
|
|
|
'(c-electric-pound
|
|
|
|
|
c-electric-brace
|
|
|
|
|
c-electric-slash
|
|
|
|
|
c-electric-star
|
|
|
|
|
c-electric-semi&comma
|
|
|
|
|
c-electric-lt-gt
|
|
|
|
|
c-electric-colon))
|
1997-07-18 02:10:48 +00:00
|
|
|
|
(put 'c-electric-delete 'delete-selection 'supersede) ; delsel
|
|
|
|
|
(put 'c-electric-delete 'pending-delete 'supersede) ; pending-del
|
|
|
|
|
(put 'c-electric-backspace 'delete-selection 'supersede) ; delsel
|
|
|
|
|
(put 'c-electric-backspace 'pending-delete 'supersede) ; pending-del
|
1997-07-10 07:54:06 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; This is used by indent-for-comment to decide how much to indent a
|
|
|
|
|
;; comment in C code based on its context.
|
|
|
|
|
(defun c-comment-indent ()
|
|
|
|
|
(if (looking-at (concat "^\\(" c-comment-start-regexp "\\)"))
|
|
|
|
|
0 ;Existing comment at bol stays there.
|
|
|
|
|
(let ((opoint (point))
|
|
|
|
|
placeholder)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(beginning-of-line)
|
|
|
|
|
(cond
|
|
|
|
|
;; CASE 1: A comment following a solitary close-brace should
|
|
|
|
|
;; have only one space.
|
|
|
|
|
((looking-at (concat "[ \t]*}[ \t]*\\($\\|"
|
|
|
|
|
c-comment-start-regexp
|
|
|
|
|
"\\)"))
|
|
|
|
|
(search-forward "}")
|
|
|
|
|
(1+ (current-column)))
|
|
|
|
|
;; CASE 2: 2 spaces after #endif
|
|
|
|
|
((or (looking-at "^#[ \t]*endif[ \t]*")
|
|
|
|
|
(looking-at "^#[ \t]*else[ \t]*"))
|
|
|
|
|
7)
|
|
|
|
|
;; CASE 3: when comment-column is nil, calculate the offset
|
|
|
|
|
;; according to c-offsets-alist. E.g. identical to hitting
|
|
|
|
|
;; TAB.
|
|
|
|
|
((and c-indent-comments-syntactically-p
|
|
|
|
|
(save-excursion
|
|
|
|
|
(skip-chars-forward " \t")
|
|
|
|
|
(or (looking-at comment-start)
|
|
|
|
|
(eolp))))
|
|
|
|
|
(let ((syntax (c-guess-basic-syntax)))
|
|
|
|
|
;; BOGOSITY ALERT: if we're looking at the eol, its
|
|
|
|
|
;; because indent-for-comment hasn't put the comment-start
|
|
|
|
|
;; in the buffer yet. this will screw up the syntactic
|
|
|
|
|
;; analysis so we kludge in the necessary info. Another
|
|
|
|
|
;; kludge is that if we're at the bol, then we really want
|
|
|
|
|
;; to ignore any anchoring as specified by
|
|
|
|
|
;; c-comment-only-line-offset since it doesn't apply here.
|
|
|
|
|
(if (save-excursion
|
|
|
|
|
(beginning-of-line)
|
|
|
|
|
(skip-chars-forward " \t")
|
|
|
|
|
(eolp))
|
|
|
|
|
(c-add-syntax 'comment-intro))
|
|
|
|
|
(let ((c-comment-only-line-offset
|
|
|
|
|
(if (consp c-comment-only-line-offset)
|
|
|
|
|
c-comment-only-line-offset
|
|
|
|
|
(cons c-comment-only-line-offset
|
|
|
|
|
c-comment-only-line-offset))))
|
|
|
|
|
(apply '+ (mapcar 'c-get-offset syntax)))))
|
|
|
|
|
;; CASE 4: use comment-column if previous line is a
|
|
|
|
|
;; comment-only line indented to the left of comment-column
|
|
|
|
|
((save-excursion
|
|
|
|
|
(beginning-of-line)
|
|
|
|
|
(and (not (bobp))
|
|
|
|
|
(forward-line -1))
|
|
|
|
|
(skip-chars-forward " \t")
|
|
|
|
|
(prog1
|
|
|
|
|
(looking-at c-comment-start-regexp)
|
|
|
|
|
(setq placeholder (point))))
|
|
|
|
|
(goto-char placeholder)
|
|
|
|
|
(if (< (current-column) comment-column)
|
|
|
|
|
comment-column
|
|
|
|
|
(current-column)))
|
|
|
|
|
;; CASE 5: If comment-column is 0, and nothing but space
|
|
|
|
|
;; before the comment, align it at 0 rather than 1.
|
|
|
|
|
((progn
|
|
|
|
|
(goto-char opoint)
|
|
|
|
|
(skip-chars-backward " \t")
|
|
|
|
|
(and (= comment-column 0) (bolp)))
|
|
|
|
|
0)
|
|
|
|
|
;; CASE 6: indent at comment column except leave at least one
|
|
|
|
|
;; space.
|
|
|
|
|
(t (max (1+ (current-column))
|
|
|
|
|
comment-column))
|
|
|
|
|
)))))
|
|
|
|
|
|
1997-09-08 03:20:02 +00:00
|
|
|
|
|
1997-08-11 22:09:45 +00:00
|
|
|
|
;; for proposed new variable comment-line-break-function
|
|
|
|
|
(defun c-comment-line-break-function (&optional soft)
|
|
|
|
|
;; we currently don't do anything with soft line breaks
|
1997-10-23 07:48:34 +00:00
|
|
|
|
(let ((literal (c-in-literal))
|
|
|
|
|
at-comment-col)
|
1997-09-08 03:20:02 +00:00
|
|
|
|
(cond
|
|
|
|
|
((eq literal 'string))
|
|
|
|
|
((or (not c-comment-continuation-stars)
|
|
|
|
|
(not literal))
|
|
|
|
|
(indent-new-comment-line soft))
|
|
|
|
|
(t (let ((here (point))
|
|
|
|
|
(leader c-comment-continuation-stars))
|
|
|
|
|
(back-to-indentation)
|
1997-10-23 07:48:34 +00:00
|
|
|
|
;; comment could be hanging
|
|
|
|
|
(if (not (c-in-literal))
|
|
|
|
|
(progn
|
|
|
|
|
(forward-line 1)
|
|
|
|
|
(forward-comment -1)
|
|
|
|
|
(setq at-comment-col (= (current-column) comment-column))))
|
1997-09-08 03:20:02 +00:00
|
|
|
|
;; are we looking at a block or lines style comment?
|
|
|
|
|
(if (and (looking-at (concat "\\(" c-comment-start-regexp
|
|
|
|
|
"\\)[ \t]+"))
|
|
|
|
|
(string-equal (match-string 1) "//"))
|
|
|
|
|
;; line style
|
(c-beginning-of-statement)
(c-end-of-statement): Do not move by sentence in strings.
(c-beginning-of-statement): Major rewrite.
(c-beginning-of-defun, c-indent-defun):
Use (c-point 'bod) instead of beginning-of-defun directly.
(c-beginning-of-defun, c-end-of-defun): New commands.
(c-beginning-of-statement): When moving forward by sentences, because
we're either inside or at the start of a comment, be sure to limit
movement to only within the extent of the comment.
(c-electric-colon): Don't insert newlines before or after scope
operators, regardless of the value of c-hanging-colons.
(c-electric-brace): namespace-open and namespace-close braces can hang.
(c-comment-line-break-function): When breaking a
line-oriented comment, copy the comment leader from the previous
line instead of hardcoding it to "// ". This ensures that
whitespace between the slashes and the text is preserved.
(c-electric-pound, c-electric-brace)
(c-electric-slash, c-electric-star, c-electric-semi&comma)
(c-electric-colon, c-electric-lt-gt, c-scope-operator)
(c-electric-backspace, c-electric-delete)
(c-indent-command, c-indent-exp, c-indent-defun)
(c-backslash-region, c-fill-paragraph): Add "*" to interactive spec.
(c-fill-paragraph): regexp-quote the
fill-prefix when search forward for the end of line oriented comments.
(c-backslash-region): Do not preserve the zmacs region (XEmacs).
1998-02-17 07:04:48 +00:00
|
|
|
|
(setq leader (match-string 0)))
|
1997-09-08 03:20:02 +00:00
|
|
|
|
(goto-char here)
|
|
|
|
|
(delete-region (progn (skip-chars-backward " \t") (point))
|
|
|
|
|
(progn (skip-chars-forward " \t") (point)))
|
|
|
|
|
(newline)
|
|
|
|
|
;; to avoid having an anchored comment that c-indent-line will
|
|
|
|
|
;; trip up on
|
|
|
|
|
(insert " " leader)
|
1997-10-23 07:48:34 +00:00
|
|
|
|
(if at-comment-col
|
|
|
|
|
(indent-for-comment))
|
1997-09-08 03:20:02 +00:00
|
|
|
|
(c-indent-line))))))
|
1997-08-11 22:09:45 +00:00
|
|
|
|
|
|
|
|
|
;; advice for indent-new-comment-line for older Emacsen
|
|
|
|
|
(if (boundp 'comment-line-break-function)
|
|
|
|
|
nil
|
|
|
|
|
(require 'advice)
|
|
|
|
|
(defadvice indent-new-comment-line (around c-line-break-advice activate)
|
|
|
|
|
(if (or (not c-buffer-is-cc-mode)
|
1997-08-16 03:40:20 +00:00
|
|
|
|
(not (c-in-literal))
|
1997-08-11 22:09:45 +00:00
|
|
|
|
(not c-comment-continuation-stars))
|
|
|
|
|
ad-do-it
|
|
|
|
|
(c-comment-line-break-function (ad-get-arg 0)))))
|
|
|
|
|
|
1997-07-10 07:54:06 +00:00
|
|
|
|
;; used by outline-minor-mode
|
|
|
|
|
(defun c-outline-level ()
|
|
|
|
|
(save-excursion
|
|
|
|
|
(skip-chars-forward "\t ")
|
|
|
|
|
(current-column)))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(defun c-up-conditional (count)
|
|
|
|
|
"Move back to the containing preprocessor conditional, leaving mark behind.
|
|
|
|
|
A prefix argument acts as a repeat count. With a negative argument,
|
|
|
|
|
move forward to the end of the containing preprocessor conditional.
|
|
|
|
|
When going backwards, `#elif' is treated like `#else' followed by
|
|
|
|
|
`#if'. When going forwards, `#elif' is ignored."
|
|
|
|
|
(interactive "p")
|
|
|
|
|
(c-forward-conditional (- count) t)
|
|
|
|
|
(c-keep-region-active))
|
|
|
|
|
|
|
|
|
|
(defun c-backward-conditional (count &optional up-flag)
|
|
|
|
|
"Move back across a preprocessor conditional, leaving mark behind.
|
|
|
|
|
A prefix argument acts as a repeat count. With a negative argument,
|
|
|
|
|
move forward across a preprocessor conditional."
|
|
|
|
|
(interactive "p")
|
|
|
|
|
(c-forward-conditional (- count) up-flag)
|
|
|
|
|
(c-keep-region-active))
|
|
|
|
|
|
|
|
|
|
(defun c-forward-conditional (count &optional up-flag)
|
|
|
|
|
"Move forward across a preprocessor conditional, leaving mark behind.
|
|
|
|
|
A prefix argument acts as a repeat count. With a negative argument,
|
|
|
|
|
move backward across a preprocessor conditional."
|
|
|
|
|
(interactive "p")
|
|
|
|
|
(let* ((forward (> count 0))
|
|
|
|
|
(increment (if forward -1 1))
|
|
|
|
|
(search-function (if forward 're-search-forward 're-search-backward))
|
|
|
|
|
(new))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(while (/= count 0)
|
|
|
|
|
(let ((depth (if up-flag 0 -1)) found)
|
|
|
|
|
(save-excursion
|
|
|
|
|
;; Find the "next" significant line in the proper direction.
|
|
|
|
|
(while (and (not found)
|
|
|
|
|
;; Rather than searching for a # sign that
|
|
|
|
|
;; comes at the beginning of a line aside from
|
|
|
|
|
;; whitespace, search first for a string
|
|
|
|
|
;; starting with # sign. Then verify what
|
|
|
|
|
;; precedes it. This is faster on account of
|
|
|
|
|
;; the fastmap feature of the regexp matcher.
|
|
|
|
|
(funcall search-function
|
|
|
|
|
"#[ \t]*\\(if\\|elif\\|endif\\)"
|
|
|
|
|
nil t))
|
|
|
|
|
(beginning-of-line)
|
|
|
|
|
;; Now verify it is really a preproc line.
|
|
|
|
|
(if (looking-at "^[ \t]*#[ \t]*\\(if\\|elif\\|endif\\)")
|
|
|
|
|
(let ((prev depth))
|
|
|
|
|
;; Update depth according to what we found.
|
|
|
|
|
(beginning-of-line)
|
|
|
|
|
(cond ((looking-at "[ \t]*#[ \t]*endif")
|
|
|
|
|
(setq depth (+ depth increment)))
|
|
|
|
|
((looking-at "[ \t]*#[ \t]*elif")
|
|
|
|
|
(if (and forward (= depth 0))
|
|
|
|
|
(setq found (point))))
|
|
|
|
|
(t (setq depth (- depth increment))))
|
|
|
|
|
;; If we are trying to move across, and we find an
|
|
|
|
|
;; end before we find a beginning, get an error.
|
|
|
|
|
(if (and (< prev 0) (< depth prev))
|
|
|
|
|
(error (if forward
|
|
|
|
|
"No following conditional at this level"
|
|
|
|
|
"No previous conditional at this level")))
|
|
|
|
|
;; When searching forward, start from next line so
|
|
|
|
|
;; that we don't find the same line again.
|
|
|
|
|
(if forward (forward-line 1))
|
|
|
|
|
;; If this line exits a level of conditional, exit
|
|
|
|
|
;; inner loop.
|
|
|
|
|
(if (< depth 0)
|
|
|
|
|
(setq found (point))))
|
|
|
|
|
;; else
|
|
|
|
|
(if forward (forward-line 1))
|
|
|
|
|
)))
|
|
|
|
|
(or found
|
|
|
|
|
(error "No containing preprocessor conditional"))
|
|
|
|
|
(goto-char (setq new found)))
|
|
|
|
|
(setq count (+ count increment))))
|
|
|
|
|
(push-mark)
|
|
|
|
|
(goto-char new))
|
|
|
|
|
(c-keep-region-active))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; commands to indent lines, regions, defuns, and expressions
|
|
|
|
|
(defun c-indent-command (&optional whole-exp)
|
|
|
|
|
"Indent current line as C code, and/or insert some whitespace.
|
|
|
|
|
|
|
|
|
|
If `c-tab-always-indent' is t, always just indent the current line.
|
|
|
|
|
If nil, indent the current line only if point is at the left margin or
|
|
|
|
|
in the line's indentation; otherwise insert some whitespace[*]. If
|
|
|
|
|
other than nil or t, then some whitespace[*] is inserted only within
|
|
|
|
|
literals (comments and strings) and inside preprocessor directives,
|
|
|
|
|
but the line is always reindented.
|
|
|
|
|
|
|
|
|
|
A numeric argument, regardless of its value, means indent rigidly all
|
|
|
|
|
the lines of the expression starting after point so that this line
|
|
|
|
|
becomes properly indented. The relative indentation among the lines
|
|
|
|
|
of the expression are preserved.
|
|
|
|
|
|
|
|
|
|
[*] The amount and kind of whitespace inserted is controlled by the
|
|
|
|
|
variable `c-insert-tab-function', which is called to do the actual
|
|
|
|
|
insertion of whitespace. Normally the function in this variable
|
|
|
|
|
just inserts a tab character, or the equivalent number of spaces,
|
|
|
|
|
depending on the variable `indent-tabs-mode'."
|
|
|
|
|
|
(c-beginning-of-statement)
(c-end-of-statement): Do not move by sentence in strings.
(c-beginning-of-statement): Major rewrite.
(c-beginning-of-defun, c-indent-defun):
Use (c-point 'bod) instead of beginning-of-defun directly.
(c-beginning-of-defun, c-end-of-defun): New commands.
(c-beginning-of-statement): When moving forward by sentences, because
we're either inside or at the start of a comment, be sure to limit
movement to only within the extent of the comment.
(c-electric-colon): Don't insert newlines before or after scope
operators, regardless of the value of c-hanging-colons.
(c-electric-brace): namespace-open and namespace-close braces can hang.
(c-comment-line-break-function): When breaking a
line-oriented comment, copy the comment leader from the previous
line instead of hardcoding it to "// ". This ensures that
whitespace between the slashes and the text is preserved.
(c-electric-pound, c-electric-brace)
(c-electric-slash, c-electric-star, c-electric-semi&comma)
(c-electric-colon, c-electric-lt-gt, c-scope-operator)
(c-electric-backspace, c-electric-delete)
(c-indent-command, c-indent-exp, c-indent-defun)
(c-backslash-region, c-fill-paragraph): Add "*" to interactive spec.
(c-fill-paragraph): regexp-quote the
fill-prefix when search forward for the end of line oriented comments.
(c-backslash-region): Do not preserve the zmacs region (XEmacs).
1998-02-17 07:04:48 +00:00
|
|
|
|
(interactive "*P")
|
1997-07-10 07:54:06 +00:00
|
|
|
|
(let ((bod (c-point 'bod)))
|
|
|
|
|
(if whole-exp
|
|
|
|
|
;; If arg, always indent this line as C
|
|
|
|
|
;; and shift remaining lines of expression the same amount.
|
|
|
|
|
(let ((shift-amt (c-indent-line))
|
|
|
|
|
beg end)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(if (eq c-tab-always-indent t)
|
|
|
|
|
(beginning-of-line))
|
|
|
|
|
(setq beg (point))
|
|
|
|
|
(forward-sexp 1)
|
|
|
|
|
(setq end (point))
|
|
|
|
|
(goto-char beg)
|
|
|
|
|
(forward-line 1)
|
|
|
|
|
(setq beg (point)))
|
|
|
|
|
(if (> end beg)
|
|
|
|
|
(indent-code-rigidly beg end (- shift-amt) "#")))
|
|
|
|
|
;; No arg supplied, use c-tab-always-indent to determine
|
|
|
|
|
;; behavior
|
|
|
|
|
(cond
|
|
|
|
|
;; CASE 1: indent when at column zero or in lines indentation,
|
|
|
|
|
;; otherwise insert a tab
|
|
|
|
|
((not c-tab-always-indent)
|
|
|
|
|
(if (save-excursion
|
|
|
|
|
(skip-chars-backward " \t")
|
|
|
|
|
(not (bolp)))
|
|
|
|
|
(funcall c-insert-tab-function)
|
|
|
|
|
(c-indent-line)))
|
|
|
|
|
;; CASE 2: just indent the line
|
|
|
|
|
((eq c-tab-always-indent t)
|
|
|
|
|
(c-indent-line))
|
|
|
|
|
;; CASE 3: if in a literal, insert a tab, but always indent the
|
|
|
|
|
;; line
|
|
|
|
|
(t
|
|
|
|
|
(if (c-in-literal bod)
|
|
|
|
|
(funcall c-insert-tab-function))
|
|
|
|
|
(c-indent-line)
|
|
|
|
|
)))))
|
|
|
|
|
|
|
|
|
|
(defun c-indent-exp (&optional shutup-p)
|
|
|
|
|
"Indent each line in balanced expression following point.
|
|
|
|
|
Optional SHUTUP-P if non-nil, inhibits message printing and error checking."
|
(c-beginning-of-statement)
(c-end-of-statement): Do not move by sentence in strings.
(c-beginning-of-statement): Major rewrite.
(c-beginning-of-defun, c-indent-defun):
Use (c-point 'bod) instead of beginning-of-defun directly.
(c-beginning-of-defun, c-end-of-defun): New commands.
(c-beginning-of-statement): When moving forward by sentences, because
we're either inside or at the start of a comment, be sure to limit
movement to only within the extent of the comment.
(c-electric-colon): Don't insert newlines before or after scope
operators, regardless of the value of c-hanging-colons.
(c-electric-brace): namespace-open and namespace-close braces can hang.
(c-comment-line-break-function): When breaking a
line-oriented comment, copy the comment leader from the previous
line instead of hardcoding it to "// ". This ensures that
whitespace between the slashes and the text is preserved.
(c-electric-pound, c-electric-brace)
(c-electric-slash, c-electric-star, c-electric-semi&comma)
(c-electric-colon, c-electric-lt-gt, c-scope-operator)
(c-electric-backspace, c-electric-delete)
(c-indent-command, c-indent-exp, c-indent-defun)
(c-backslash-region, c-fill-paragraph): Add "*" to interactive spec.
(c-fill-paragraph): regexp-quote the
fill-prefix when search forward for the end of line oriented comments.
(c-backslash-region): Do not preserve the zmacs region (XEmacs).
1998-02-17 07:04:48 +00:00
|
|
|
|
(interactive "*P")
|
1997-07-10 07:54:06 +00:00
|
|
|
|
(let ((here (point))
|
|
|
|
|
end progress-p)
|
|
|
|
|
(unwind-protect
|
|
|
|
|
(let ((c-echo-syntactic-information-p nil) ;keep quiet for speed
|
|
|
|
|
(start (progn
|
|
|
|
|
;; try to be smarter about finding the range of
|
|
|
|
|
;; lines to indent. skip all following
|
|
|
|
|
;; whitespace. failing that, try to find any
|
|
|
|
|
;; opening brace on the current line
|
|
|
|
|
(skip-chars-forward " \t\n")
|
|
|
|
|
(if (memq (char-after) '(?\( ?\[ ?\{))
|
|
|
|
|
(point)
|
|
|
|
|
(let ((state (parse-partial-sexp (point)
|
|
|
|
|
(c-point 'eol))))
|
|
|
|
|
(and (nth 1 state)
|
|
|
|
|
(goto-char (nth 1 state))
|
|
|
|
|
(memq (char-after) '(?\( ?\[ ?\{))
|
|
|
|
|
(point)))))))
|
|
|
|
|
;; find balanced expression end
|
|
|
|
|
(setq end (and (c-safe (progn (forward-sexp 1) t))
|
|
|
|
|
(point-marker)))
|
|
|
|
|
;; sanity check
|
|
|
|
|
(and (not start)
|
|
|
|
|
(not shutup-p)
|
|
|
|
|
(error "Cannot find start of balanced expression to indent."))
|
|
|
|
|
(and (not end)
|
|
|
|
|
(not shutup-p)
|
|
|
|
|
(error "Cannot find end of balanced expression to indent."))
|
|
|
|
|
(c-progress-init start end 'c-indent-exp)
|
|
|
|
|
(setq progress-p t)
|
|
|
|
|
(goto-char start)
|
|
|
|
|
(beginning-of-line)
|
|
|
|
|
(while (< (point) end)
|
|
|
|
|
(if (not (looking-at "[ \t]*$"))
|
|
|
|
|
(c-indent-line))
|
|
|
|
|
(c-progress-update)
|
|
|
|
|
(forward-line 1)))
|
|
|
|
|
;; make sure marker is deleted
|
|
|
|
|
(and end
|
|
|
|
|
(set-marker end nil))
|
|
|
|
|
(and progress-p
|
|
|
|
|
(c-progress-fini 'c-indent-exp))
|
|
|
|
|
(goto-char here))))
|
|
|
|
|
|
|
|
|
|
(defun c-indent-defun ()
|
|
|
|
|
"Re-indents the current top-level function def, struct or class declaration."
|
(c-beginning-of-statement)
(c-end-of-statement): Do not move by sentence in strings.
(c-beginning-of-statement): Major rewrite.
(c-beginning-of-defun, c-indent-defun):
Use (c-point 'bod) instead of beginning-of-defun directly.
(c-beginning-of-defun, c-end-of-defun): New commands.
(c-beginning-of-statement): When moving forward by sentences, because
we're either inside or at the start of a comment, be sure to limit
movement to only within the extent of the comment.
(c-electric-colon): Don't insert newlines before or after scope
operators, regardless of the value of c-hanging-colons.
(c-electric-brace): namespace-open and namespace-close braces can hang.
(c-comment-line-break-function): When breaking a
line-oriented comment, copy the comment leader from the previous
line instead of hardcoding it to "// ". This ensures that
whitespace between the slashes and the text is preserved.
(c-electric-pound, c-electric-brace)
(c-electric-slash, c-electric-star, c-electric-semi&comma)
(c-electric-colon, c-electric-lt-gt, c-scope-operator)
(c-electric-backspace, c-electric-delete)
(c-indent-command, c-indent-exp, c-indent-defun)
(c-backslash-region, c-fill-paragraph): Add "*" to interactive spec.
(c-fill-paragraph): regexp-quote the
fill-prefix when search forward for the end of line oriented comments.
(c-backslash-region): Do not preserve the zmacs region (XEmacs).
1998-02-17 07:04:48 +00:00
|
|
|
|
(interactive "*")
|
1997-07-10 07:54:06 +00:00
|
|
|
|
(let ((here (point-marker))
|
|
|
|
|
(c-echo-syntactic-information-p nil)
|
|
|
|
|
(brace (c-least-enclosing-brace (c-parse-state))))
|
(c-beginning-of-statement)
(c-end-of-statement): Do not move by sentence in strings.
(c-beginning-of-statement): Major rewrite.
(c-beginning-of-defun, c-indent-defun):
Use (c-point 'bod) instead of beginning-of-defun directly.
(c-beginning-of-defun, c-end-of-defun): New commands.
(c-beginning-of-statement): When moving forward by sentences, because
we're either inside or at the start of a comment, be sure to limit
movement to only within the extent of the comment.
(c-electric-colon): Don't insert newlines before or after scope
operators, regardless of the value of c-hanging-colons.
(c-electric-brace): namespace-open and namespace-close braces can hang.
(c-comment-line-break-function): When breaking a
line-oriented comment, copy the comment leader from the previous
line instead of hardcoding it to "// ". This ensures that
whitespace between the slashes and the text is preserved.
(c-electric-pound, c-electric-brace)
(c-electric-slash, c-electric-star, c-electric-semi&comma)
(c-electric-colon, c-electric-lt-gt, c-scope-operator)
(c-electric-backspace, c-electric-delete)
(c-indent-command, c-indent-exp, c-indent-defun)
(c-backslash-region, c-fill-paragraph): Add "*" to interactive spec.
(c-fill-paragraph): regexp-quote the
fill-prefix when search forward for the end of line oriented comments.
(c-backslash-region): Do not preserve the zmacs region (XEmacs).
1998-02-17 07:04:48 +00:00
|
|
|
|
(goto-char (or brace (c-point 'bod)))
|
1997-07-10 07:54:06 +00:00
|
|
|
|
;; if we're sitting at b-o-b, it might be because there was no
|
|
|
|
|
;; least enclosing brace and we were sitting on the defun's open
|
|
|
|
|
;; brace.
|
|
|
|
|
(if (and (bobp) (not (eq (char-after) ?\{)))
|
|
|
|
|
(goto-char here))
|
|
|
|
|
;; if defun-prompt-regexp is non-nil, b-o-d might not leave us at
|
|
|
|
|
;; the open brace. I consider this an Emacs bug.
|
|
|
|
|
(and (boundp 'defun-prompt-regexp)
|
|
|
|
|
defun-prompt-regexp
|
|
|
|
|
(looking-at defun-prompt-regexp)
|
|
|
|
|
(goto-char (match-end 0)))
|
|
|
|
|
;; catch all errors in c-indent-exp so we can 1. give more
|
|
|
|
|
;; meaningful error message, and 2. restore point
|
|
|
|
|
(unwind-protect
|
|
|
|
|
(c-indent-exp)
|
|
|
|
|
(goto-char here)
|
|
|
|
|
(set-marker here nil))))
|
|
|
|
|
|
|
|
|
|
(defun c-indent-region (start end)
|
|
|
|
|
;; Indent every line whose first char is between START and END inclusive.
|
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char start)
|
|
|
|
|
;; Advance to first nonblank line.
|
|
|
|
|
(skip-chars-forward " \t\n")
|
|
|
|
|
(beginning-of-line)
|
|
|
|
|
(let (endmark)
|
|
|
|
|
(unwind-protect
|
|
|
|
|
(let ((c-tab-always-indent t)
|
|
|
|
|
;; shut up any echo msgs on indiv lines
|
|
|
|
|
(c-echo-syntactic-information-p nil)
|
|
|
|
|
fence)
|
|
|
|
|
(c-progress-init start end 'c-indent-region)
|
|
|
|
|
(setq endmark (copy-marker end))
|
|
|
|
|
(while (and (bolp)
|
|
|
|
|
(not (eobp))
|
|
|
|
|
(< (point) endmark))
|
|
|
|
|
;; update progress
|
|
|
|
|
(c-progress-update)
|
|
|
|
|
;; Indent one line as with TAB.
|
|
|
|
|
(let (nextline sexpend sexpbeg)
|
|
|
|
|
;; skip blank lines
|
|
|
|
|
(skip-chars-forward " \t\n")
|
|
|
|
|
(beginning-of-line)
|
|
|
|
|
;; indent the current line
|
|
|
|
|
(c-indent-line)
|
|
|
|
|
(setq fence (point))
|
|
|
|
|
(if (save-excursion
|
|
|
|
|
(beginning-of-line)
|
|
|
|
|
(looking-at "[ \t]*#"))
|
|
|
|
|
(forward-line 1)
|
|
|
|
|
(save-excursion
|
|
|
|
|
;; Find beginning of following line.
|
|
|
|
|
(setq nextline (c-point 'bonl))
|
|
|
|
|
;; Find first beginning-of-sexp for sexp extending past
|
|
|
|
|
;; this line.
|
|
|
|
|
(beginning-of-line)
|
|
|
|
|
(while (< (point) nextline)
|
|
|
|
|
(condition-case nil
|
|
|
|
|
(progn
|
|
|
|
|
(forward-sexp 1)
|
|
|
|
|
(setq sexpend (point)))
|
|
|
|
|
(error (setq sexpend nil)
|
|
|
|
|
(goto-char nextline)))
|
|
|
|
|
(c-forward-syntactic-ws))
|
|
|
|
|
(if sexpend
|
|
|
|
|
(progn
|
|
|
|
|
;; make sure the sexp we found really starts on the
|
|
|
|
|
;; current line and extends past it
|
|
|
|
|
(goto-char sexpend)
|
|
|
|
|
(setq sexpend (point-marker))
|
|
|
|
|
(c-safe (backward-sexp 1))
|
|
|
|
|
(setq sexpbeg (point))))
|
|
|
|
|
(if (and sexpbeg (< sexpbeg fence))
|
|
|
|
|
(setq sexpbeg fence)))
|
|
|
|
|
;; check to see if the next line starts a
|
|
|
|
|
;; comment-only line
|
|
|
|
|
(save-excursion
|
|
|
|
|
(forward-line 1)
|
|
|
|
|
(skip-chars-forward " \t")
|
|
|
|
|
(if (looking-at c-comment-start-regexp)
|
|
|
|
|
(setq sexpbeg (c-point 'bol))))
|
|
|
|
|
;; If that sexp ends within the region, indent it all at
|
|
|
|
|
;; once, fast.
|
|
|
|
|
(condition-case nil
|
|
|
|
|
(if (and sexpend
|
|
|
|
|
(> sexpend nextline)
|
|
|
|
|
(<= sexpend endmark))
|
|
|
|
|
(progn
|
|
|
|
|
(goto-char sexpbeg)
|
|
|
|
|
(c-indent-exp 'shutup)
|
|
|
|
|
(c-progress-update)
|
|
|
|
|
(goto-char sexpend)))
|
|
|
|
|
(error
|
|
|
|
|
(goto-char sexpbeg)
|
|
|
|
|
(c-indent-line)))
|
|
|
|
|
;; Move to following line and try again.
|
|
|
|
|
(and sexpend
|
|
|
|
|
(markerp sexpend)
|
|
|
|
|
(set-marker sexpend nil))
|
|
|
|
|
(forward-line 1)
|
|
|
|
|
(setq fence (point))))))
|
|
|
|
|
(set-marker endmark nil)
|
|
|
|
|
(c-progress-fini 'c-indent-region)
|
|
|
|
|
(c-echo-parsing-error)
|
|
|
|
|
))))
|
|
|
|
|
|
|
|
|
|
(defun c-mark-function ()
|
|
|
|
|
"Put mark at end of a C, C++, or Objective-C defun, point at beginning."
|
|
|
|
|
(interactive)
|
|
|
|
|
(let ((here (point))
|
|
|
|
|
;; there should be a c-point position for 'eod
|
|
|
|
|
(eod (save-excursion (end-of-defun) (point)))
|
|
|
|
|
(state (c-parse-state))
|
|
|
|
|
brace)
|
|
|
|
|
(while state
|
|
|
|
|
(setq brace (car state))
|
|
|
|
|
(if (consp brace)
|
|
|
|
|
(goto-char (cdr brace))
|
|
|
|
|
(goto-char brace))
|
|
|
|
|
(setq state (cdr state)))
|
|
|
|
|
(if (eq (char-after) ?{)
|
|
|
|
|
(progn
|
|
|
|
|
(forward-line -1)
|
|
|
|
|
(while (not (or (bobp)
|
|
|
|
|
(looking-at "[ \t]*$")))
|
|
|
|
|
(forward-line -1)))
|
|
|
|
|
(forward-line 1)
|
|
|
|
|
(skip-chars-forward " \t\n"))
|
|
|
|
|
(push-mark here)
|
|
|
|
|
(push-mark eod nil t)))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; for progress reporting
|
|
|
|
|
(defvar c-progress-info nil)
|
|
|
|
|
|
|
|
|
|
(defun c-progress-init (start end context)
|
1997-10-23 07:48:34 +00:00
|
|
|
|
(cond
|
|
|
|
|
;; Be silent
|
|
|
|
|
((not c-progress-interval))
|
|
|
|
|
;; Start the progress update messages. If this Emacs doesn't have
|
|
|
|
|
;; a built-in timer, just be dumb about it.
|
|
|
|
|
((not (fboundp 'current-time))
|
|
|
|
|
(message "indenting region... (this may take a while)"))
|
|
|
|
|
;; If progress has already been initialized, do nothing. otherwise
|
|
|
|
|
;; initialize the counter with a vector of:
|
|
|
|
|
;; [start end lastsec context]
|
|
|
|
|
(c-progress-info)
|
|
|
|
|
(t (setq c-progress-info (vector start
|
1997-07-10 07:54:06 +00:00
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char end)
|
|
|
|
|
(point-marker))
|
|
|
|
|
(nth 1 (current-time))
|
|
|
|
|
context))
|
1997-10-23 07:48:34 +00:00
|
|
|
|
(message "indenting region..."))
|
|
|
|
|
))
|
1997-07-10 07:54:06 +00:00
|
|
|
|
|
|
|
|
|
(defun c-progress-update ()
|
|
|
|
|
;; update progress
|
|
|
|
|
(if (not (and c-progress-info c-progress-interval))
|
|
|
|
|
nil
|
|
|
|
|
(let ((now (nth 1 (current-time)))
|
|
|
|
|
(start (aref c-progress-info 0))
|
|
|
|
|
(end (aref c-progress-info 1))
|
|
|
|
|
(lastsecs (aref c-progress-info 2)))
|
|
|
|
|
;; should we update? currently, update happens every 2 seconds,
|
|
|
|
|
;; what's the right value?
|
|
|
|
|
(if (< c-progress-interval (- now lastsecs))
|
|
|
|
|
(progn
|
|
|
|
|
(message "indenting region... (%d%% complete)"
|
|
|
|
|
(/ (* 100 (- (point) start)) (- end start)))
|
|
|
|
|
(aset c-progress-info 2 now)))
|
|
|
|
|
)))
|
|
|
|
|
|
|
|
|
|
(defun c-progress-fini (context)
|
|
|
|
|
;; finished
|
1997-10-23 07:48:34 +00:00
|
|
|
|
(if (not c-progress-interval)
|
|
|
|
|
nil
|
|
|
|
|
(if (or (eq context (aref c-progress-info 3))
|
|
|
|
|
(eq context t))
|
|
|
|
|
(progn
|
|
|
|
|
(set-marker (aref c-progress-info 1) nil)
|
|
|
|
|
(setq c-progress-info nil)
|
|
|
|
|
(message "indenting region...done")))))
|
1997-07-10 07:54:06 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; This page handles insertion and removal of backslashes for C macros.
|
|
|
|
|
|
|
|
|
|
(defun c-backslash-region (from to delete-flag)
|
|
|
|
|
"Insert, align, or delete end-of-line backslashes on the lines in the region.
|
|
|
|
|
With no argument, inserts backslashes and aligns existing backslashes.
|
|
|
|
|
With an argument, deletes the backslashes.
|
|
|
|
|
|
|
|
|
|
This function does not modify blank lines at the start of the region.
|
|
|
|
|
If the region ends at the start of a line, it always deletes the
|
|
|
|
|
backslash (if any) at the end of the previous line.
|
|
|
|
|
|
|
|
|
|
You can put the region around an entire macro definition and use this
|
|
|
|
|
command to conveniently insert and align the necessary backslashes."
|
(c-beginning-of-statement)
(c-end-of-statement): Do not move by sentence in strings.
(c-beginning-of-statement): Major rewrite.
(c-beginning-of-defun, c-indent-defun):
Use (c-point 'bod) instead of beginning-of-defun directly.
(c-beginning-of-defun, c-end-of-defun): New commands.
(c-beginning-of-statement): When moving forward by sentences, because
we're either inside or at the start of a comment, be sure to limit
movement to only within the extent of the comment.
(c-electric-colon): Don't insert newlines before or after scope
operators, regardless of the value of c-hanging-colons.
(c-electric-brace): namespace-open and namespace-close braces can hang.
(c-comment-line-break-function): When breaking a
line-oriented comment, copy the comment leader from the previous
line instead of hardcoding it to "// ". This ensures that
whitespace between the slashes and the text is preserved.
(c-electric-pound, c-electric-brace)
(c-electric-slash, c-electric-star, c-electric-semi&comma)
(c-electric-colon, c-electric-lt-gt, c-scope-operator)
(c-electric-backspace, c-electric-delete)
(c-indent-command, c-indent-exp, c-indent-defun)
(c-backslash-region, c-fill-paragraph): Add "*" to interactive spec.
(c-fill-paragraph): regexp-quote the
fill-prefix when search forward for the end of line oriented comments.
(c-backslash-region): Do not preserve the zmacs region (XEmacs).
1998-02-17 07:04:48 +00:00
|
|
|
|
(interactive "*r\nP")
|
1997-07-10 07:54:06 +00:00
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char from)
|
|
|
|
|
(let ((column c-backslash-column)
|
|
|
|
|
(endmark (make-marker)))
|
|
|
|
|
(move-marker endmark to)
|
|
|
|
|
;; Compute the smallest column number past the ends of all the lines.
|
|
|
|
|
(if (not delete-flag)
|
|
|
|
|
(while (< (point) to)
|
|
|
|
|
(end-of-line)
|
|
|
|
|
(if (eq (char-before) ?\\)
|
|
|
|
|
(progn (forward-char -1)
|
|
|
|
|
(skip-chars-backward " \t")))
|
|
|
|
|
(setq column (max column (1+ (current-column))))
|
|
|
|
|
(forward-line 1)))
|
|
|
|
|
;; Adjust upward to a tab column, if that doesn't push past the margin.
|
|
|
|
|
(if (> (% column tab-width) 0)
|
|
|
|
|
(let ((adjusted (* (/ (+ column tab-width -1) tab-width) tab-width)))
|
|
|
|
|
(if (< adjusted (window-width))
|
|
|
|
|
(setq column adjusted))))
|
|
|
|
|
;; Don't modify blank lines at start of region.
|
|
|
|
|
(goto-char from)
|
|
|
|
|
(while (and (< (point) endmark) (eolp))
|
|
|
|
|
(forward-line 1))
|
|
|
|
|
;; Add or remove backslashes on all the lines.
|
|
|
|
|
(while (< (point) endmark)
|
|
|
|
|
(if (and (not delete-flag)
|
|
|
|
|
;; Un-backslashify the last line
|
|
|
|
|
;; if the region ends right at the start of the next line.
|
|
|
|
|
(save-excursion
|
|
|
|
|
(forward-line 1)
|
|
|
|
|
(< (point) endmark)))
|
|
|
|
|
(c-append-backslash column)
|
|
|
|
|
(c-delete-backslash))
|
|
|
|
|
(forward-line 1))
|
(c-beginning-of-statement)
(c-end-of-statement): Do not move by sentence in strings.
(c-beginning-of-statement): Major rewrite.
(c-beginning-of-defun, c-indent-defun):
Use (c-point 'bod) instead of beginning-of-defun directly.
(c-beginning-of-defun, c-end-of-defun): New commands.
(c-beginning-of-statement): When moving forward by sentences, because
we're either inside or at the start of a comment, be sure to limit
movement to only within the extent of the comment.
(c-electric-colon): Don't insert newlines before or after scope
operators, regardless of the value of c-hanging-colons.
(c-electric-brace): namespace-open and namespace-close braces can hang.
(c-comment-line-break-function): When breaking a
line-oriented comment, copy the comment leader from the previous
line instead of hardcoding it to "// ". This ensures that
whitespace between the slashes and the text is preserved.
(c-electric-pound, c-electric-brace)
(c-electric-slash, c-electric-star, c-electric-semi&comma)
(c-electric-colon, c-electric-lt-gt, c-scope-operator)
(c-electric-backspace, c-electric-delete)
(c-indent-command, c-indent-exp, c-indent-defun)
(c-backslash-region, c-fill-paragraph): Add "*" to interactive spec.
(c-fill-paragraph): regexp-quote the
fill-prefix when search forward for the end of line oriented comments.
(c-backslash-region): Do not preserve the zmacs region (XEmacs).
1998-02-17 07:04:48 +00:00
|
|
|
|
(move-marker endmark nil))))
|
1997-07-10 07:54:06 +00:00
|
|
|
|
|
|
|
|
|
(defun c-append-backslash (column)
|
|
|
|
|
(end-of-line)
|
|
|
|
|
(if (eq (char-before) ?\\)
|
|
|
|
|
(progn (forward-char -1)
|
|
|
|
|
(delete-horizontal-space)
|
|
|
|
|
(indent-to column))
|
|
|
|
|
(indent-to column)
|
|
|
|
|
(insert "\\")))
|
|
|
|
|
|
|
|
|
|
(defun c-delete-backslash ()
|
|
|
|
|
(end-of-line)
|
|
|
|
|
(or (bolp)
|
|
|
|
|
(progn
|
|
|
|
|
(forward-char -1)
|
|
|
|
|
(if (looking-at "\\\\")
|
|
|
|
|
(delete-region (1+ (point))
|
|
|
|
|
(progn (skip-chars-backward " \t") (point)))))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(defun c-fill-paragraph (&optional arg)
|
|
|
|
|
"Like \\[fill-paragraph] but handles C and C++ style comments.
|
|
|
|
|
If any of the current line is a comment or within a comment,
|
|
|
|
|
fill the comment or the paragraph of it that point is in,
|
|
|
|
|
preserving the comment indentation or line-starting decorations.
|
|
|
|
|
|
1998-03-08 06:50:21 +00:00
|
|
|
|
If point is inside multiline string literal, fill it. This currently
|
|
|
|
|
does not respect escaped newlines, except for the special case when it
|
|
|
|
|
is the very first thing in the string. The intended use for this rule
|
|
|
|
|
is in situations like the following:
|
|
|
|
|
|
|
|
|
|
char description[] = \"\\
|
|
|
|
|
A very long description of something that you want to fill to make
|
|
|
|
|
nicely formatted output.\"\;
|
|
|
|
|
|
|
|
|
|
If point is in any other situation, i.e. in normal code, do nothing.
|
|
|
|
|
|
1997-07-10 07:54:06 +00:00
|
|
|
|
Optional prefix ARG means justify paragraph as well."
|
(c-beginning-of-statement)
(c-end-of-statement): Do not move by sentence in strings.
(c-beginning-of-statement): Major rewrite.
(c-beginning-of-defun, c-indent-defun):
Use (c-point 'bod) instead of beginning-of-defun directly.
(c-beginning-of-defun, c-end-of-defun): New commands.
(c-beginning-of-statement): When moving forward by sentences, because
we're either inside or at the start of a comment, be sure to limit
movement to only within the extent of the comment.
(c-electric-colon): Don't insert newlines before or after scope
operators, regardless of the value of c-hanging-colons.
(c-electric-brace): namespace-open and namespace-close braces can hang.
(c-comment-line-break-function): When breaking a
line-oriented comment, copy the comment leader from the previous
line instead of hardcoding it to "// ". This ensures that
whitespace between the slashes and the text is preserved.
(c-electric-pound, c-electric-brace)
(c-electric-slash, c-electric-star, c-electric-semi&comma)
(c-electric-colon, c-electric-lt-gt, c-scope-operator)
(c-electric-backspace, c-electric-delete)
(c-indent-command, c-indent-exp, c-indent-defun)
(c-backslash-region, c-fill-paragraph): Add "*" to interactive spec.
(c-fill-paragraph): regexp-quote the
fill-prefix when search forward for the end of line oriented comments.
(c-backslash-region): Do not preserve the zmacs region (XEmacs).
1998-02-17 07:04:48 +00:00
|
|
|
|
(interactive "*P")
|
1998-03-08 06:50:21 +00:00
|
|
|
|
(let* ((point-save (point-marker))
|
|
|
|
|
limits
|
|
|
|
|
comment-start-place
|
1997-07-10 07:54:06 +00:00
|
|
|
|
(first-line
|
|
|
|
|
;; Check for obvious entry to comment.
|
|
|
|
|
(save-excursion
|
|
|
|
|
(beginning-of-line)
|
1998-03-08 06:50:21 +00:00
|
|
|
|
(skip-chars-forward " \t")
|
1997-07-10 07:54:06 +00:00
|
|
|
|
(and (looking-at comment-start-skip)
|
|
|
|
|
(setq comment-start-place (point)))))
|
1998-03-08 06:50:21 +00:00
|
|
|
|
(re1 "\\|\\([ \t]*/\\*[ \t]*\\|[ \t]*\\*/[ \t]*\\|[ \t/*]*\\)"))
|
1997-08-16 03:40:20 +00:00
|
|
|
|
(if (save-excursion
|
|
|
|
|
(beginning-of-line)
|
|
|
|
|
(looking-at ".*//"))
|
1997-07-10 07:54:06 +00:00
|
|
|
|
(let ((fill-prefix fill-prefix)
|
|
|
|
|
;; Lines containing just a comment start or just an end
|
|
|
|
|
;; should not be filled into paragraphs they are next
|
|
|
|
|
;; to.
|
1998-03-08 06:50:21 +00:00
|
|
|
|
(paragraph-start (concat paragraph-start re1 "$"))
|
|
|
|
|
(paragraph-separate (concat paragraph-separate re1 "$")))
|
1997-07-10 07:54:06 +00:00
|
|
|
|
(save-excursion
|
|
|
|
|
(beginning-of-line)
|
|
|
|
|
;; Move up to first line of this comment.
|
|
|
|
|
(while (and (not (bobp))
|
|
|
|
|
(looking-at "[ \t]*//[ \t]*[^ \t\n]"))
|
|
|
|
|
(forward-line -1))
|
|
|
|
|
(if (not (looking-at ".*//[ \t]*[^ \t\n]"))
|
|
|
|
|
(forward-line 1))
|
|
|
|
|
;; Find the comment start in this line.
|
|
|
|
|
(re-search-forward "[ \t]*//[ \t]*")
|
|
|
|
|
;; Set the fill-prefix to be what all lines except the first
|
|
|
|
|
;; should start with. But do not alter a user set fill-prefix.
|
|
|
|
|
(if (null fill-prefix)
|
|
|
|
|
(setq fill-prefix (buffer-substring (match-beginning 0)
|
|
|
|
|
(match-end 0))))
|
|
|
|
|
(save-restriction
|
|
|
|
|
;; Narrow down to just the lines of this comment.
|
|
|
|
|
(narrow-to-region (c-point 'bol)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(forward-line 1)
|
(c-beginning-of-statement)
(c-end-of-statement): Do not move by sentence in strings.
(c-beginning-of-statement): Major rewrite.
(c-beginning-of-defun, c-indent-defun):
Use (c-point 'bod) instead of beginning-of-defun directly.
(c-beginning-of-defun, c-end-of-defun): New commands.
(c-beginning-of-statement): When moving forward by sentences, because
we're either inside or at the start of a comment, be sure to limit
movement to only within the extent of the comment.
(c-electric-colon): Don't insert newlines before or after scope
operators, regardless of the value of c-hanging-colons.
(c-electric-brace): namespace-open and namespace-close braces can hang.
(c-comment-line-break-function): When breaking a
line-oriented comment, copy the comment leader from the previous
line instead of hardcoding it to "// ". This ensures that
whitespace between the slashes and the text is preserved.
(c-electric-pound, c-electric-brace)
(c-electric-slash, c-electric-star, c-electric-semi&comma)
(c-electric-colon, c-electric-lt-gt, c-scope-operator)
(c-electric-backspace, c-electric-delete)
(c-indent-command, c-indent-exp, c-indent-defun)
(c-backslash-region, c-fill-paragraph): Add "*" to interactive spec.
(c-fill-paragraph): regexp-quote the
fill-prefix when search forward for the end of line oriented comments.
(c-backslash-region): Do not preserve the zmacs region (XEmacs).
1998-02-17 07:04:48 +00:00
|
|
|
|
(while
|
|
|
|
|
(looking-at (regexp-quote fill-prefix))
|
1997-07-10 07:54:06 +00:00
|
|
|
|
(forward-line 1))
|
|
|
|
|
(point)))
|
1998-03-08 06:50:21 +00:00
|
|
|
|
(or (c-safe
|
|
|
|
|
;; fill-paragraph sometimes fails to detect when we
|
|
|
|
|
;; are between paragraphs.
|
|
|
|
|
(beginning-of-line)
|
|
|
|
|
(search-forward fill-prefix (c-point 'eol))
|
|
|
|
|
(looking-at paragraph-separate))
|
|
|
|
|
;; Avoids recursion
|
|
|
|
|
(let (fill-paragraph-function)
|
|
|
|
|
(fill-paragraph arg))))))
|
1997-07-10 07:54:06 +00:00
|
|
|
|
;; else C style comments
|
|
|
|
|
(if (or first-line
|
|
|
|
|
;; t if we enter a comment between start of function and
|
|
|
|
|
;; this line.
|
1998-03-08 06:50:21 +00:00
|
|
|
|
(save-excursion
|
|
|
|
|
(setq limits (c-literal-limits))
|
|
|
|
|
(and (consp limits)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char (car limits))
|
|
|
|
|
(looking-at c-comment-start-regexp))))
|
1997-07-10 07:54:06 +00:00
|
|
|
|
;; t if this line contains a comment starter.
|
|
|
|
|
(setq first-line
|
|
|
|
|
(save-excursion
|
|
|
|
|
(beginning-of-line)
|
|
|
|
|
(prog1
|
|
|
|
|
(re-search-forward comment-start-skip
|
|
|
|
|
(save-excursion (end-of-line)
|
|
|
|
|
(point))
|
|
|
|
|
t)
|
1998-03-08 06:50:21 +00:00
|
|
|
|
(setq comment-start-place (point)))))
|
|
|
|
|
;; t if we're in the whitespace after a comment ender
|
|
|
|
|
;; which ends its line.
|
|
|
|
|
(and (not limits)
|
|
|
|
|
(when (and (looking-at "[ \t]*$")
|
|
|
|
|
(save-excursion
|
|
|
|
|
(beginning-of-line)
|
|
|
|
|
(looking-at ".*\\*/[ \t]*$")))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(forward-comment -1)
|
|
|
|
|
(setq comment-start-place (point)))
|
|
|
|
|
t)))
|
1997-07-10 07:54:06 +00:00
|
|
|
|
;; Inside a comment: fill one comment paragraph.
|
|
|
|
|
(let ((fill-prefix
|
|
|
|
|
;; The prefix for each line of this paragraph
|
|
|
|
|
;; is the appropriate part of the start of this line,
|
|
|
|
|
;; up to the column at which text should be indented.
|
|
|
|
|
(save-excursion
|
|
|
|
|
(beginning-of-line)
|
1998-03-08 06:50:21 +00:00
|
|
|
|
(if (looking-at ".*/\\*.*\\*/")
|
1997-07-10 07:54:06 +00:00
|
|
|
|
(progn (re-search-forward comment-start-skip)
|
|
|
|
|
(make-string (current-column) ?\ ))
|
1998-03-08 06:50:21 +00:00
|
|
|
|
(if first-line
|
|
|
|
|
(forward-line 1)
|
|
|
|
|
(if (and (looking-at "[ \t]*\\*/")
|
|
|
|
|
(not (save-excursion
|
|
|
|
|
(forward-line -1)
|
|
|
|
|
(looking-at ".*/\\*"))))
|
|
|
|
|
(forward-line -1)))
|
1997-07-10 07:54:06 +00:00
|
|
|
|
|
|
|
|
|
(let ((line-width (progn (end-of-line) (current-column))))
|
|
|
|
|
(beginning-of-line)
|
|
|
|
|
(prog1
|
|
|
|
|
(buffer-substring
|
|
|
|
|
(point)
|
|
|
|
|
|
|
|
|
|
;; How shall we decide where the end of the
|
|
|
|
|
;; fill-prefix is?
|
|
|
|
|
(progn
|
|
|
|
|
(skip-chars-forward " \t*" (c-point 'eol))
|
|
|
|
|
;; kludge alert, watch out for */, in
|
|
|
|
|
;; which case fill-prefix should *not*
|
|
|
|
|
;; be "*"!
|
|
|
|
|
(if (and (eq (char-after) ?/)
|
|
|
|
|
(eq (char-before) ?*))
|
|
|
|
|
(forward-char -1))
|
|
|
|
|
(point)))
|
|
|
|
|
|
|
|
|
|
;; If the comment is only one line followed
|
|
|
|
|
;; by a blank line, calling move-to-column
|
|
|
|
|
;; above may have added some spaces and tabs
|
|
|
|
|
;; to the end of the line; the fill-paragraph
|
|
|
|
|
;; function will then delete it and the
|
|
|
|
|
;; newline following it, so we'll lose a
|
|
|
|
|
;; blank line when we shouldn't. So delete
|
|
|
|
|
;; anything move-to-column added to the end
|
|
|
|
|
;; of the line. We record the line width
|
|
|
|
|
;; instead of the position of the old line
|
|
|
|
|
;; end because move-to-column might break a
|
|
|
|
|
;; tab into spaces, and the new characters
|
|
|
|
|
;; introduced there shouldn't be deleted.
|
|
|
|
|
|
|
|
|
|
;; If you can see a better way to do this,
|
|
|
|
|
;; please make the change. This seems very
|
|
|
|
|
;; messy to me.
|
|
|
|
|
(delete-region (progn (move-to-column line-width)
|
|
|
|
|
(point))
|
|
|
|
|
(progn (end-of-line) (point))))))))
|
|
|
|
|
|
|
|
|
|
;; Lines containing just a comment start or just an end
|
|
|
|
|
;; should not be filled into paragraphs they are next
|
|
|
|
|
;; to.
|
1998-03-08 06:50:21 +00:00
|
|
|
|
(paragraph-start (if (eq major-mode 'java-mode)
|
|
|
|
|
(concat paragraph-start
|
|
|
|
|
re1 "\\("
|
|
|
|
|
c-Java-javadoc-paragraph-start
|
|
|
|
|
"\\|$\\)")
|
|
|
|
|
(concat paragraph-start re1 "$")))
|
|
|
|
|
(paragraph-separate (concat paragraph-separate re1 "$"))
|
1997-07-10 07:54:06 +00:00
|
|
|
|
(chars-to-delete 0)
|
|
|
|
|
)
|
|
|
|
|
(save-restriction
|
|
|
|
|
;; Don't fill the comment together with the code
|
|
|
|
|
;; following it. So temporarily exclude everything
|
|
|
|
|
;; before the comment start, and everything after the
|
|
|
|
|
;; line where the comment ends. If comment-start-place
|
|
|
|
|
;; is non-nil, the comment starter is there. Otherwise,
|
|
|
|
|
;; point is inside the comment.
|
|
|
|
|
(narrow-to-region (save-excursion
|
|
|
|
|
(if comment-start-place
|
|
|
|
|
(goto-char comment-start-place)
|
|
|
|
|
(search-backward "/*"))
|
|
|
|
|
(if (and (not c-hanging-comment-starter-p)
|
|
|
|
|
(looking-at
|
|
|
|
|
(concat c-comment-start-regexp
|
|
|
|
|
"[ \t]*$")))
|
|
|
|
|
(forward-line 1))
|
|
|
|
|
;; Protect text before the comment
|
|
|
|
|
;; start by excluding it. Add
|
|
|
|
|
;; spaces to bring back proper
|
|
|
|
|
;; indentation of that point.
|
|
|
|
|
(let ((column (current-column)))
|
|
|
|
|
(prog1 (point)
|
|
|
|
|
(setq chars-to-delete column)
|
|
|
|
|
(insert-char ?\ column))))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(if comment-start-place
|
|
|
|
|
(goto-char (+ comment-start-place 2)))
|
|
|
|
|
(search-forward "*/" nil 'move)
|
1998-03-08 06:50:21 +00:00
|
|
|
|
(if (and (not c-hanging-comment-ender-p)
|
|
|
|
|
(save-excursion
|
|
|
|
|
(beginning-of-line)
|
|
|
|
|
(looking-at "[ \t]*\\*/")))
|
|
|
|
|
(beginning-of-line)
|
|
|
|
|
(forward-line 1))
|
1997-07-10 07:54:06 +00:00
|
|
|
|
(point)))
|
1998-03-08 06:50:21 +00:00
|
|
|
|
(or (c-safe
|
|
|
|
|
;; fill-paragraph sometimes fails to detect when we
|
|
|
|
|
;; are between paragraphs.
|
|
|
|
|
(beginning-of-line)
|
|
|
|
|
(search-forward fill-prefix (c-point 'eol))
|
|
|
|
|
(looking-at paragraph-separate))
|
|
|
|
|
;; Avoids recursion
|
|
|
|
|
(let (fill-paragraph-function)
|
|
|
|
|
(fill-paragraph arg)))
|
1997-07-10 07:54:06 +00:00
|
|
|
|
(save-excursion
|
|
|
|
|
;; Delete the chars we inserted to avoid clobbering
|
|
|
|
|
;; the stuff before the comment start.
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(if (> chars-to-delete 0)
|
|
|
|
|
(delete-region (point) (+ (point) chars-to-delete)))
|
|
|
|
|
;; Find the comment ender (should be on last line of
|
|
|
|
|
;; buffer, given the narrowing) and don't leave it on
|
|
|
|
|
;; its own line, unless that's the style that's desired.
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
(forward-line -1)
|
|
|
|
|
(search-forward "*/" nil 'move)
|
|
|
|
|
(beginning-of-line)
|
|
|
|
|
(if (and c-hanging-comment-ender-p
|
|
|
|
|
(looking-at "[ \t]*\\*/"))
|
|
|
|
|
;(delete-indentation)))))
|
|
|
|
|
(let ((fill-column (+ fill-column 9999)))
|
|
|
|
|
(forward-line -1)
|
1998-03-08 06:50:21 +00:00
|
|
|
|
(fill-region-as-paragraph (point) (point-max))
|
|
|
|
|
;; If fill-prefix ended with a `*', it may be
|
|
|
|
|
;; taken away from the comment ender. We got to
|
|
|
|
|
;; check this and put it back if that is the
|
|
|
|
|
;; case.
|
|
|
|
|
(goto-char (- (point-max) 2))
|
|
|
|
|
(if (not (= (char-before) ?*))
|
|
|
|
|
(insert ?*))
|
|
|
|
|
)))))
|
|
|
|
|
;; Else maybe a string. Fill it if it's a multiline string.
|
|
|
|
|
;; FIXME: This currently doesn't handle escaped newlines.
|
|
|
|
|
;; Doing that correctly is a bit tricky.
|
|
|
|
|
(if (and limits
|
|
|
|
|
(eq (char-syntax (char-after (car limits))) ?\")
|
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char (car limits))
|
|
|
|
|
(end-of-line)
|
|
|
|
|
(< (point) (cdr limits))))
|
|
|
|
|
(let (fill-prefix
|
|
|
|
|
fill-paragraph-function)
|
|
|
|
|
(save-restriction
|
|
|
|
|
(narrow-to-region (save-excursion
|
|
|
|
|
(goto-char (1+ (car limits)))
|
|
|
|
|
(if (looking-at "\\\\$")
|
|
|
|
|
;; Some DWIM: Leave the start
|
|
|
|
|
;; line if it's nothing but an
|
|
|
|
|
;; escaped newline.
|
|
|
|
|
(1+ (match-end 0))
|
|
|
|
|
(point)))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(goto-char (1- (cdr limits)))
|
|
|
|
|
;; Inserting a newline and
|
|
|
|
|
;; removing it again after
|
|
|
|
|
;; fill-paragraph makes it more
|
|
|
|
|
;; predictable.
|
|
|
|
|
(insert ?\n)
|
|
|
|
|
(point)))
|
|
|
|
|
;; Do not compensate for the narrowed column. This
|
|
|
|
|
;; way the literal will always be filled at the same
|
|
|
|
|
;; column internally.
|
|
|
|
|
(fill-paragraph arg)
|
|
|
|
|
(goto-char (1- (point-max)))
|
|
|
|
|
(delete-char 1)))
|
|
|
|
|
)))
|
|
|
|
|
(goto-char (marker-position point-save))
|
|
|
|
|
(set-marker point-save nil)
|
|
|
|
|
;; Always return t. This has the effect that if filling isn't
|
|
|
|
|
;; done above, it isn't done at all, and it's therefore
|
|
|
|
|
;; effectively disabled in normal code.
|
|
|
|
|
t))
|
1997-07-10 07:54:06 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(provide 'cc-cmds)
|
|
|
|
|
;;; cc-cmds.el ends here
|