Mercurial > hg > xemacs-beta
comparison lisp/coding.el @ 4551:6812571bfcb9
Fix some bugs.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Thu, 13 Mar 2008 10:21:01 +0100 |
parents | 68d1ca56cffa |
children | 75654496fa0e |
comparison
equal
deleted
inserted
replaced
4550:1217f19ce196 | 4551:6812571bfcb9 |
---|---|
297 (check-argument-type #'coding-system-p | 297 (check-argument-type #'coding-system-p |
298 (setq coding-system (find-coding-system coding-system))) | 298 (setq coding-system (find-coding-system coding-system))) |
299 (check-argument-type #'integer-or-marker-p begin) | 299 (check-argument-type #'integer-or-marker-p begin) |
300 (check-argument-type #'integer-or-marker-p end) | 300 (check-argument-type #'integer-or-marker-p end) |
301 (let* ((safe-charsets | 301 (let* ((safe-charsets |
302 (coding-system-get coding-system 'safe-charsets)) | 302 (or (coding-system-get coding-system 'safe-charsets) |
303 (safe-chars (coding-system-get coding-system 'safe-chars)) | 303 (coding-system-get (coding-system-base coding-system) |
304 'safe-charsets))) | |
305 (safe-chars | |
306 (or (coding-system-get coding-system 'safe-chars) | |
307 (coding-system-get (coding-system-base coding-system) | |
308 'safe-chars))) | |
304 (skip-chars-arg | 309 (skip-chars-arg |
305 (gethash safe-charsets | 310 (gethash safe-charsets |
306 default-query-coding-region-safe-charset-skip-chars-map)) | 311 default-query-coding-region-safe-charset-skip-chars-map)) |
307 (ranges (make-range-table)) | 312 (ranges (make-range-table)) |
308 fail-range-start fail-range-end previous-fail char-after | 313 fail-range-start fail-range-end previous-fail char-after |
311 (setq skip-chars-arg | 316 (setq skip-chars-arg |
312 (puthash safe-charsets | 317 (puthash safe-charsets |
313 (mapconcat #'charset-skip-chars-string | 318 (mapconcat #'charset-skip-chars-string |
314 safe-charsets "") | 319 safe-charsets "") |
315 default-query-coding-region-safe-charset-skip-chars-map))) | 320 default-query-coding-region-safe-charset-skip-chars-map))) |
321 (when highlightp | |
322 (map-extents #'(lambda (extent ignored-arg) | |
323 (when (eq 'query-coding-warning-face | |
324 (extent-face extent)) | |
325 (delete-extent extent))) buffer begin end)) | |
316 (if (and (zerop (length skip-chars-arg)) (null safe-chars)) | 326 (if (and (zerop (length skip-chars-arg)) (null safe-chars)) |
317 (progn | 327 (progn |
318 ;; Uh-oh, nothing known about this coding system. Fail. | 328 ;; Uh-oh, nothing known about this coding system. Fail. |
319 (when errorp | 329 (when errorp |
320 (error 'text-conversion-error | 330 (error 'text-conversion-error |