;; return t when moving backwards at bob.
- (if (let (open-paren-in-column-0-is-defun-start)
+ (if (let (open-paren-in-column-0-is-defun-start moved-comment)
+ (and (not (setq moved-comment (forward-comment -1)))
+ ;; Cope specifically with ^M^J here -
+ ;; forward-comment sometimes gets stuck after ^Ms,
+ ;; sometimes after ^M^J.
+ (when (eq (char-before) ?\r)
+ (when (and (eq (char-before) ?\n)
+ (eq (char-before (1- (point))) ?\r))
;; Emacs <= 20 and XEmacs move back over the
;; closer of a block comment that lacks an opener.