[Emacs-diffs] Changes to emacs/lisp/international/kinsoku.el [lexbind]

[Miles Bader]

Index: emacs/lisp/international/kinsoku.el
diff -c emacs/lisp/international/kinsoku.el:1.9.8.1 
emacs/lisp/international/kinsoku.el:1.9.8.2
*** emacs/lisp/international/kinsoku.el:1.9.8.1 Fri Apr  4 01:20:22 2003
--- emacs/lisp/international/kinsoku.el Tue Oct 14 19:39:23 2003
***************
*** 121,131 ****
  
  ;; 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)))))
      (if (or (<= kinsoku-limit 0)
            (< (cdr pos-and-column) (+ (current-fill-column) kinsoku-limit)))
        (goto-char (car pos-and-column)))))
--- 121,137 ----
  
  ;; Try to resolve `kinsoku' restriction by making the current line longer.
  (defun kinsoku-longer ()
!   (let ((pos-and-column
!        (save-excursion
!          (forward-char 1)
!          (while (and (not (eobp))
!                      (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,143 ****
  (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)) ?>)))
                 (forward-char -1))
               (point))))
      (if (< linebeg pos)
--- 141,154 ----
  (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)) ?>)
!                          ;; protect non-kinsoku words
!                          (not (or (eq (preceding-char) ? )
!                                   (aref (char-category-set (preceding-char))
!                                         ?|)))))
                 (forward-char -1))
               (point))))
      (if (< linebeg pos)
***************
*** 170,173 ****
--- 181,185 ----
              (aref (char-category-set (preceding-char)) ?<))
          (kinsoku-shorter linebeg))))
  
+ ;;; arch-tag: e6b036bc-9e5b-4e9f-a22c-4ed04e37777e
  ;;; kinsoku.el ends here