diff options
Diffstat (limited to 'lisp/progmodes')
| -rw-r--r-- | lisp/progmodes/c-mode.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/cplus-md.el | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lisp/progmodes/c-mode.el b/lisp/progmodes/c-mode.el index 0bc02b473e2..fc784d71518 100644 --- a/lisp/progmodes/c-mode.el +++ b/lisp/progmodes/c-mode.el @@ -1034,7 +1034,7 @@ ENDPOS is encountered." The arguments are a string representing the desired style and a flag which, if non-nil, means to set the style globally. \(Interactively, the flag comes from the prefix argument.) -Available styles are GNU, K&R, BSD and Whitesmith. +Available styles are GNU, K&R, BSD and Whitesmith." (interactive (list (completing-read "Use which C indentation style? " c-style-alist nil t) current-prefix-arg)) diff --git a/lisp/progmodes/cplus-md.el b/lisp/progmodes/cplus-md.el index fa8979a11bd..ace790cb80d 100644 --- a/lisp/progmodes/cplus-md.el +++ b/lisp/progmodes/cplus-md.el @@ -99,7 +99,7 @@ (define-key c++-mode-map "\177" 'backward-delete-char-untabify) (define-key c++-mode-map "\t" 'c++-indent-command) ;; (define-key c++-mode-map "\C-c\C-i" 'c++-insert-header) - (define-key c++-mode-map "\C-c\C-\\" 'c-backslash-region) + (define-key c++-mode-map "\C-c\C-\\" 'c-backslash-region)) ;; (define-key c++-mode-map "\e\C-a" 'c++-beginning-of-defun) ;; (define-key c++-mode-map "\e\C-e" 'c++-end-of-defun) ;; (define-key c++-mode-map "\e\C-x" 'c++-indent-defun)) @@ -582,7 +582,7 @@ Returns nil if line starts inside a string, t if in a comment." (contain-stack (list (point))) (case-fold-search nil) restart outer-loop-done inner-loop-done state ostate - this-indent last-sexp + this-indent last-sexp last-depth at-else at-brace (opoint (point)) (next-depth 0)) @@ -596,8 +596,8 @@ Returns nil if line starts inside a string, t if in a comment." ;; plus enough other lines to get to one that ;; does not end inside a comment or string. ;; Meanwhile, do appropriate indentation on comment lines. - (setq innerloop-done nil) - (while (and (not innerloop-done) + (setq inner-loop-done nil) + (while (and (not inner-loop-done) (not (and (eobp) (setq outer-loop-done t)))) (setq ostate state) (setq state (parse-partial-sexp (point) (progn (end-of-line) (point)) @@ -610,7 +610,7 @@ Returns nil if line starts inside a string, t if in a comment." (c++-indent-line)) (if (or (nth 3 state)) (forward-line 1) - (setq innerloop-done t))) + (setq inner-loop-done t))) (if (<= next-depth 0) (setq outer-loop-done t)) (if outer-loop-done |