Merged from emacs@sv.gnu.org

[gnu-emacs] / lisp / international / kinsoku.el

diff --git a/lisp/international/kinsoku.el b/lisp/international/kinsoku.el
index b551161a6f3c1e4cc0b3312a12e1fb42bbd41c60..2b5ba1de6500431a218dffb98a7ea5b0d4cee4e2 100644 (file)
--- a/lisp/international/kinsoku.el
+++ b/lisp/international/kinsoku.el
@@ -1,7 +1,11 @@
 ;;; kinsoku.el --- `Kinsoku' processing funcs -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
-;; Licensed to the Free Software Foundation.
+;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 
 ;; Keywords: mule, kinsoku
 
@@ -19,8 +23,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -107,7 +111,7 @@ The value 0 means there's no limitation.")
 \e$A!.!0#"#(!2!4!6!8!:!<!>!c!d!e#@!f!l\e(B"
         ;; Chinese GB2312
         "\e$A(E(F(G(H(I(J(K(L(M(N(O(P(Q(R(S(T(U(V(W(X(Y(h\e(B\
-\e$(0!>!@!B!D!F!H!J!L!N!P!R!T!V!X!Z!\!^!`!b\e(B"
+\\e$(0!>!@!B!D!F!H!J!L!N!P!R!T!V!X!Z!\!^!`!b\e(B"
         ;; Chinese BIG5
         "\e$(0!d!f!h!j!k!q!p"i"j"k"n"x$u$v$w$x$y$z${\e(B\
 \e$(0$|$}$~%!%"%#%$%%%&%'%(%)%*%+%:\e(B"))
@@ -121,11 +125,17 @@ The value 0 means there's no limitation.")
 
 ;; Try to resolve `kinsoku' restriction by making the current line longer.
 (defun kinsoku-longer ()
-  (let ((pos-and-column (save-excursion
-                         (forward-char 1)
-                         (while (aref (char-category-set (following-char)) ?>)
-                           (forward-char 1))
-                         (cons (point) (current-column)))))
+  (let ((pos-and-column
+        (save-excursion
+          (forward-char 1)
+          (while (and (not (eolp))
+                      (or (aref (char-category-set (following-char)) ?>)
+                          ;; protect non-kinsoku words
+                          (not (or (eq (preceding-char) ? )
+                                   (aref (char-category-set (preceding-char))
+                                         ?|)))))
+            (forward-char 1))
+          (cons (point) (current-column)))))
     (if (or (<= kinsoku-limit 0)
            (< (cdr pos-and-column) (+ (current-fill-column) kinsoku-limit)))
        (goto-char (car pos-and-column)))))
@@ -135,9 +145,14 @@ The value 0 means there's no limitation.")
 (defun kinsoku-shorter (linebeg)
   (let ((pos (save-excursion
               (forward-char -1)
-              (while (and (< linebeg (point))
-                          (or (aref (char-category-set (preceding-char)) ?<)
-                              (aref (char-category-set (following-char)) ?>)))
+              (while (and
+                      (< linebeg (point))
+                      (or (aref (char-category-set (preceding-char)) ?<)
+                          (aref (char-category-set (following-char)) ?>)
+                          ;; protect non-kinsoku words
+                          (not (or (eq (preceding-char) ? )
+                                   (aref (char-category-set (preceding-char))
+                                         ?|)))))
                 (forward-char -1))
               (point))))
     (if (< linebeg pos)
@@ -170,4 +185,5 @@ the context of text formatting."
              (aref (char-category-set (preceding-char)) ?<))
          (kinsoku-shorter linebeg))))
 
+;;; arch-tag: e6b036bc-9e5b-4e9f-a22c-4ed04e37777e
 ;;; kinsoku.el ends here