Mercurial > emacs

comparison lisp/textmodes/fill.el @ 92360:4054054dd212

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--rel--22 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1090
author Miles Bader <miles@gnu.org>
date Sat, 01 Mar 2008 01:28:31 +0000
parents 606f2d163a64 d2d9530e9b45
children 73a01bf5cb80
comparison
equal deleted inserted replaced
92359:1af6d6eab2e9 92360:4054054dd212
853 (when (setq comstart (comment-search-forward (line-end-position) t)) 853 (when (setq comstart (comment-search-forward (line-end-position) t))
854 (setq comin (point)) 854 (setq comin (point))
855 (goto-char comstart) (skip-chars-backward " \t") 855 (goto-char comstart) (skip-chars-backward " \t")
856 (setq has-code-and-comment (not (bolp))))) 856 (setq has-code-and-comment (not (bolp)))))
857 857
858 (if (not comstart) 858 (if (not (and comstart
859 ;; Make sure the comment-start mark we found is accepted by
860 ;; comment-start-skip. If not, all bets are off, and
861 ;; we'd better not mess with it.
862 (string-match comment-start-skip
863 (buffer-substring comstart comin))))
864
859 ;; Return nil, so the normal filling will take place. 865 ;; Return nil, so the normal filling will take place.
860 nil 866 nil
861 867
862 ;; Narrow to include only the comment, and then fill the region. 868 ;; Narrow to include only the comment, and then fill the region.
863 (let* ((fill-prefix fill-prefix) 869 (let* ((fill-prefix fill-prefix)