[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: |
Tue, 02 Jan 2007 20:54:11 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Alan Mackenzie <acmacm> 07/01/02 20:54:11
Index: cc-cmds.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/progmodes/cc-cmds.el,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- cc-cmds.el 1 Jan 2007 22:11:27 -0000 1.47
+++ cc-cmds.el 2 Jan 2007 20:54:10 -0000 1.48
@@ -3750,7 +3750,7 @@
;; Note that this function does not do any hidden buffer changes.
(let (fill
- ;; beg and end limits the region to narrow. end is a marker.
+ ;; beg and end limit the region to narrow. end is a marker.
beg end
;; tmp-pre and tmp-post mark strings that are temporarily
;; inserted at the start and end of the region. tmp-pre is a
@@ -3836,12 +3836,13 @@
(setq apply-outside-literal t))
((eq c-lit-type 'c) ; Block comment.
- (when (>= end (cdr c-lit-limits))
- ;; The region includes the comment ender. 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. "=====*/" counts
- ;; as a comment ender here, but "===== */" doesn't and "foo*/"
- ;; doesn't.
+ (when (and (>= end (cdr c-lit-limits))
+ (> (point-max) (cdr c-lit-limits)))
+ ;; 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.
+ ;; "=====*/" counts as a comment ender here, but "===== */"
+ ;; doesn't and "foo*/" doesn't.
(unless
(save-excursion
(goto-char (cdr c-lit-limits))
- [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 <=
- [Emacs-diffs] Changes to emacs/lisp/progmodes/cc-cmds.el,v, Alan Mackenzie, 2007/01/03
- [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