xemacs-beta: lisp/prim/simple.el comparison

comparison lisp/prim/simple.el @ 110:fe104dbd9147 r20-1b7

Import from CVS: tag r20-1b7

author	cvs
date	Mon, 13 Aug 2007 09:19:45 +0200
parents	360340f9fd5f
children	cca96a509cfe

comparison

equal deleted inserted replaced

-:e183fc049578
+:fe104dbd9147
 ;; push a mark) have been altered to call exchange-point-and-mark with an
 ;; argument, meaning "don't activate the region".  These commands  only use
 ;; exchange-point-and-mark to position the newly-pushed mark correctly, so
 ;; this isn't a user-visible change.  These functions have also been altered
 ;; to use (mark t) for the same reason.
+;; 97/3/14 Jareth Hein (jhod@po.iijnet.or.jp) added kinsoku processing (support
+;; for filling of Asian text) into the fill code. This was ripped bleeding from
+;; Mule-2.3, and could probably use some feature additions (like additional wrap
+;; styles, etc)
 ;;; Code:
 (defun newline (&optional arg)
 "Insert a newline, and move to left margin of the new line if it's blank.
 	  ;; Determine where to split the line.
 	  (let ((fill-prefix fill-prefix)
 		(fill-point
 		 (let ((opoint (point))
 		       bounce
+		       ;; 97/3/14 jhod: Kinsoku
+		       (re-break-point (if (featurep 'mule)
+					    (concat "[ \t\n]\\|" word-across-newline)
+					"[ \t\n]"))
+		       ;; end patch
 		       (first t))
 		   (save-excursion
 		     (move-to-column (1+ fill-column))
 		     ;; Move back to a word boundary.
 		     (while (or first
 				     sentence-end-double-space
 				     (save-excursion (forward-char -1)
 						     (and (looking-at "\\. ")
 							  (not (looking-at "\\.  "))))))
 		       (setq first nil)
-		       (skip-chars-backward "^ \t\n")
+		       ;; 97/3/14 jhod: Kinsoku
+		       ; (skip-chars-backward "^ \t\n"))
+		       (fill-move-backward-to-break-point re-break-point)
+		       ;; end patch
 		       ;; If we find nowhere on the line to break it,
 		       ;; break after one word.  Set bounce to t
 		       ;; so we will not keep going in this while loop.
 		       (if (bolp)
 			   (progn
-			     (re-search-forward "[ \t]" opoint t)
+			     ;; 97/3/14 jhod: Kinsoku
+			     ; (re-search-forward "[ \t]" opoint t)
+			     (fill-move-forward-to-break-point re-break-point
+							       opoint)
+			     ;; end patch
 			     (setq bounce t)))
 		       (skip-chars-backward " \t"))
+		     (if (and (featurep 'mule)
+			      (or bounce (bolp))) (kinsoku-process)) ;; 97/3/14 jhod: Kinsoku
 		     ;; Let fill-point be set to the place where we end up.
 		     (point)))))
 	    ;; I'm not sure why Stig made this change but it breaks
 	    ;; auto filling in at least C mode so I'm taking it back
 	    ;; If that place is not the beginning of the line,
 	    ;; break the line there.
 	    (if (save-excursion
 		  (goto-char fill-point)
-		  (not (bolp)))
+		  (not (or (bolp) (eolp)))) ; 97/3/14 jhod: during kinsoku processing it is possible to move beyond
 		(let ((prev-column (current-column)))
 		  ;; If point is at the fill-point, do not `save-excursion'.
 		  ;; Otherwise, if a comment prefix or fill-prefix is inserted,
 		  ;; point will end up before it rather than after it.
 		  (if (save-excursion
 			(skip-chars-backward " \t")
 			(= (point) fill-point))
-		      (indent-new-comment-line)
+		      ;; 97/3/14 jhod: Kinsoku processing
+		      ;(indent-new-comment-line)
+		      (let ((spacep (memq (preceding-char) '(?\  ?\t))))
+			(indent-new-comment-line)
+			;; if user type space explicitly, leave SPC
+			;; even if there is no WAN.
+			(if spacep
+			    (save-excursion
+			      (goto-char fill-point)
+			      ;; put SPC except that there is SPC
+			      ;; already or there is sentence end.
+			      (or (memq (following-char) '(?\  ?\t))
+				  (fill-end-of-sentence-p)
+				  (insert ?\ )))))
 		    (save-excursion
 		      (goto-char fill-point)
 		      (indent-new-comment-line)))
 		  ;; If making the new line didn't reduce the hpos of
 		  ;; the end of the line, then give up now;
 (defun turn-on-auto-fill ()
 "Unconditionally turn on Auto Fill mode."
 (auto-fill-mode 1))
 (defun set-fill-column (arg)
-"Set `fill-column' to current column, or to argument if given.
+"Set `fill-column' to specified argument.
+Just \\[universal-argument] as argument means to use the current column
 The variable `fill-column' has a separate value for each buffer."
 (interactive "_P") ; XEmacs
 (cond ((integerp arg)
 	 (setq fill-column arg))
 	((consp arg)
 The inserted newline is marked hard if `use-hard-newlines' is true,
 unless optional argument SOFT is non-nil."
 (interactive)
 (let (comcol comstart)
 (skip-chars-backward " \t")
+;; 97/3/14 jhod: Kinsoku processing
+(if (featurep 'mule)
+	(kinsoku-process))
 (delete-region (point)
 		   (progn (skip-chars-forward " \t")
 			  (point)))
 (if soft (insert ?\n) (newline 1))
 (if fill-prefix
 	  (insert fill-prefix))
 ;; #### - Eric Eide reverts to v18 semantics for this function in
 ;; fa-extras, which I'm not gonna do.  His changes are to (1) execute
 ;; the save-excursion below unconditionally, and (2) uncomment the check
 ;; for (not comment-multi-line) further below.  --Stig
+;;### jhod: probably need to fix this for kinsoku processing
 (if (not comment-multi-line)
 	  (save-excursion
 	    (if (and comment-start-skip
 		     (let ((opoint (point)))
 		       (forward-line -1)

Mercurial > hg > xemacs-beta

comparison lisp/prim/simple.el @ 110:fe104dbd9147 r20-1b7