[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/progmodes/cc-cmds.el,v
From: |
Alan Mackenzie |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/progmodes/cc-cmds.el,v |
Date: |
Wed, 03 Jan 2007 20:19:29 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Alan Mackenzie <acmacm> 07/01/03 20:19:29
Index: cc-cmds.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/progmodes/cc-cmds.el,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- cc-cmds.el 2 Jan 2007 20:54:10 -0000 1.48
+++ cc-cmds.el 3 Jan 2007 20:19:29 -0000 1.49
@@ -3836,8 +3836,13 @@
(setq apply-outside-literal t))
((eq c-lit-type 'c) ; Block comment.
- (when (and (>= end (cdr c-lit-limits))
- (> (point-max) (cdr c-lit-limits)))
+ (when
+ (or (> end (cdr c-lit-limits))
+ (and (= end (cdr c-lit-limits))
+ (eq (char-before end) ?/)
+ (eq (char-before (1- end)) ?*)
+ ;; disallow "/*/"
+ (> (- (cdr c-lit-limits) (car c-lit-limits)) 3)))
;; There is a comment ender, and the region includes it. If
;; it's on its own line, it stays on its own line. If it's got
;; company on the line, it keeps (at least one word of) it.
- [Emacs-diffs] Changes to emacs/lisp/progmodes/cc-cmds.el,v, Alan Mackenzie, 2007/01/01
- [Emacs-diffs] Changes to emacs/lisp/progmodes/cc-cmds.el,v, Alan Mackenzie, 2007/01/02
- [Emacs-diffs] Changes to emacs/lisp/progmodes/cc-cmds.el,v,
Alan Mackenzie <=
- [Emacs-diffs] Changes to emacs/lisp/progmodes/cc-cmds.el,v, Alan Mackenzie, 2007/01/20
- [Emacs-diffs] Changes to emacs/lisp/progmodes/cc-cmds.el,v, Glenn Morris, 2007/01/20
- [Emacs-diffs] Changes to emacs/lisp/progmodes/cc-cmds.el,v, Alan Mackenzie, 2007/01/21