mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-11 05:51:21 -08:00
Code Issues Projects Releases Wiki Activity

Don't use charset property

Browse source 
`fill-find-break-point-function'.
(fill-find-break-point-function-table): New variable.
(fill-find-break-point): Lookup
fill-find-break-point-function-table.
This commit is contained in:
Kenichi Handa 2006-10-23 01:56:24 +00:00
parent 60d0b84b73
commit bc2ec97dfb
1 changed files with 15 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

33
lisp/textmodes/fill.el
View file

@ -368,15 +368,18 @@ and `fill-nobreak-invisible'."
(looking-at paragraph-start))))
(run-hook-with-args-until-success 'fill-nobreak-predicate)))))
;; Put `fill-find-break-point-function' property to charsets which
;; require special functions to find line breaking point.
(dolist (pair '((katakana-jisx0201 . kinsoku)
(chinese-gb2312 . kinsoku)
(japanese-jisx0208 . kinsoku)
(japanese-jisx0212 . kinsoku)
(chinese-big5-1 . kinsoku)
(chinese-big5-2 . kinsoku)))
(put-charset-property (car pair) 'fill-find-break-point-function (cdr pair)))
(defvar fill-find-break-point-function-table
(let ((table (make-char-table nil)))
;; Register `kinsoku' for scripts HAN, KANA, BOPOMPFO, and CJK-MISS.
(map-char-table #'(lambda (key val)
(if (memq val '(han kana bopomofo cjk-misc))
(set-char-table-range table key 'kinsoku)))
char-script-table)
;; Register `kinsoku" also for full width characters.
(set-char-table-range table '(#xFF01 . #xFF61) 'kinsoku)
(set-char-table-range table '(#xFFE0 . #xFFE6) 'kinsoku)
table)
"Char-table of special functions to find line breaking point.")
(defun fill-find-break-point (limit)
"Move point to a proper line breaking position of the current line.
@ -387,15 +390,9 @@ after or before a non-ASCII character. If the charset of the
character has the property `fill-find-break-point-function', this
function calls the property value as a function with one arg LINEBEG.
If the charset has no such property, do nothing."
(let* ((ch (following-char))
(charset (char-charset ch))
func)
(if (eq charset 'ascii)
(setq ch (preceding-char)
charset (char-charset ch)))
(if (charsetp charset)
(setq func
(get-charset-property charset 'fill-find-break-point-function)))
(let ((func (or
(aref fill-find-break-point-function-table (following-char))
(aref fill-find-break-point-function-table (preceding-char)))))
(if (and func (fboundp func))
(funcall func limit))))