X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Ffill.el;h=748cba413ebe9d52c8f78e223ae8031ec3bae291;hb=061dcc1d21944cff40c1f971e6931a9f3bcceb02;hp=f76a017c20946e8d3ce98ed0ec36d459b4e083d3;hpb=6883ee56ec887c2c48abe5b06b5e66aa74031910;p=chise%2Fxemacs-chise.git

diff --git a/lisp/fill.el b/lisp/fill.el
index f76a017..748cba4 100644
--- a/lisp/fill.el
+++ b/lisp/fill.el
@@ -226,9 +226,10 @@ first line, insist it must match FIRST-LINE-REGEXP."
       ;; XEmacs change
       (if (not dont-skip-first)
 	  (forward-line 1))
-      (if (>= (point) to)
-	  (goto-char firstline)
-	(setq at-second t))
+      (cond ((>= (point) to)
+	     (goto-char firstline))
+	    ((/= (point) from)
+	     (setq at-second t)))
       (move-to-left-margin)
       ;; XEmacs change
       (let ((start (point))
@@ -236,7 +237,7 @@ first line, insist it must match FIRST-LINE-REGEXP."
 	    ;(eol (save-excursion (end-of-line) (point)))
 	    )
 	(setq result
-	      (if (not (looking-at paragraph-start))
+	      (if (or dont-skip-first (not (looking-at paragraph-start)))
 		  (cond ((and adaptive-fill-regexp (looking-at adaptive-fill-regexp))
 			 (buffer-substring-no-properties start (match-end 0)))
 			(adaptive-fill-function (funcall adaptive-fill-function)))))
@@ -384,6 +385,7 @@ space does not end a sentence, so don't break a line there."
 	  ;;; 97/3/14 jhod: Kinsoku change
 	  ;; Spacing is not necessary for charcters of no word-separater.
 	  ;; The regexp word-across-newline is used for this check.
+	  (defvar word-across-newline)
 	  (if (not (and (featurep 'mule)
 			(stringp word-across-newline)))
 	      (subst-char-in-region from (point-max) ?\n ?\ )
@@ -428,7 +430,8 @@ space does not end a sentence, so don't break a line there."
 	  ;; This is the actual filling loop.
 	  (let ((prefixcol 0) linebeg
 		(re-break-point (if (featurep 'mule)
-				    (concat "[ \n\t]\\|" word-across-newline)
+				    (concat "[ \n\t]\\|" word-across-newline
+					    ".\\|." word-across-newline)
 				  "[ \n\t]")))
 	    (while (not (eobp))
 	      (setq linebeg (point))
@@ -782,7 +785,7 @@ If the mark is not active, this applies to the current paragraph."
 
 ;; 97/3/14 jhod: This functions are added for Kinsoku support
 (defun find-space-insertable-point ()
- "Search backward for a permissable point for inserting justification spaces"
+ "Search backward for a permissible point for inserting justification spaces"
  (if (boundp 'space-insertable)
      (if (re-search-backward space-insertable nil t)
 	 (progn (forward-char 1)