carbon2-commit: Fix some bugs.

changeset: 4590:6812571bfcb938954b94aa30c3013e8c02209dea user: Aidan Kehoe <kehoea(a)parhasard.net&gt; date: Thu Mar 13 10:21:01 2008 +0100 files: lisp/coding.el lisp/mule/mule-coding.el lisp/unicode.el description: Fix some bugs. diff -r 1217f19ce196e19eacbf0bf10bb7a3c0e7031b9f -r 6812571bfcb938954b94aa30c3013e8c02209dea lisp/coding.el --- a/lisp/coding.el Mon Jan 21 22:54:43 2008 +0100 +++ b/lisp/coding.el Thu Mar 13 10:21:01 2008 +0100 ＠＠ -299,8 +299,13 ＠＠ addition, characters that can be safely (check-argument-type #'integer-or-marker-p begin) (check-argument-type #'integer-or-marker-p end) (let* ((safe-charsets - (coding-system-get coding-system 'safe-charsets)) - (safe-chars (coding-system-get coding-system 'safe-chars)) + (or (coding-system-get coding-system 'safe-charsets) + (coding-system-get (coding-system-base coding-system) + 'safe-charsets))) + (safe-chars + (or (coding-system-get coding-system 'safe-chars) + (coding-system-get (coding-system-base coding-system) + 'safe-chars))) (skip-chars-arg (gethash safe-charsets default-query-coding-region-safe-charset-skip-chars-map)) ＠＠ -313,6 +318,11 ＠＠ addition, characters that can be safely (mapconcat #'charset-skip-chars-string safe-charsets "") default-query-coding-region-safe-charset-skip-chars-map))) + (when highlightp + (map-extents #'(lambda (extent ignored-arg) + (when (eq 'query-coding-warning-face + (extent-face extent)) + (delete-extent extent))) buffer begin end)) (if (and (zerop (length skip-chars-arg)) (null safe-chars)) (progn ;; Uh-oh, nothing known about this coding system. Fail. diff -r 1217f19ce196e19eacbf0bf10bb7a3c0e7031b9f -r 6812571bfcb938954b94aa30c3013e8c02209dea lisp/mule/mule-coding.el --- a/lisp/mule/mule-coding.el Mon Jan 21 22:54:43 2008 +0100 +++ b/lisp/mule/mule-coding.el Thu Mar 13 10:21:01 2008 +0100 ＠＠ -553,15 +553,24 ＠＠ See that the documentation of `query-cod (check-argument-type #'integer-or-marker-p begin) (check-argument-type #'integer-or-marker-p end) (let ((from-unicode - (coding-system-get coding-system '8-bit-fixed-query-from-unicode)) + (or (coding-system-get coding-system '8-bit-fixed-query-from-unicode) + (coding-system-get (coding-system-base coding-system) + '8-bit-fixed-query-from-unicode))) (skip-chars-arg - (coding-system-get coding-system '8-bit-fixed-query-skip-chars)) + (or (coding-system-get coding-system '8-bit-fixed-query-skip-chars) + (coding-system-get (coding-system-base coding-system) + '8-bit-fixed-query-skip-chars))) (ranges (make-range-table)) char-after fail-range-start fail-range-end previous-fail extent failed) (check-type from-unicode hash-table) (check-type skip-chars-arg string) (save-excursion + (when highlightp + (map-extents #'(lambda (extent ignored-arg) + (when (eq 'query-coding-warning-face + (extent-face extent)) + (delete-extent extent))) buffer begin end)) (goto-char begin buffer) (skip-chars-forward skip-chars-arg end buffer) (while (< (point buffer) end) ＠＠ -588,7 +597,7 ＠＠ See that the documentation of `query-cod (when errorp (error 'text-conversion-error (format "Cannot encode %s using coding system" - (buffer-substring fail-range-start (point buffeR) + (buffer-substring fail-range-start (point buffer) buffer)) (coding-system-name coding-system))) (put-range-table fail-range-start ＠＠ -603,8 +612,8 ＠＠ See that the documentation of `query-cod (setq extent (make-extent fail-range-start fail-range-end buffer)) (set-extent-priority extent (+ mouse-highlight-priority 2)) (set-extent-face extent 'query-coding-warning-face)) - (skip-chars-forward skip-chars-arg end buffer)) - (message "about to give the result, ranges %S" ranges)) + (skip-chars-forward skip-chars-arg end buffer))) + (message "about to give the result, ranges %S" ranges) (if failed (values nil ranges) (values t nil))))) diff -r 1217f19ce196e19eacbf0bf10bb7a3c0e7031b9f -r 6812571bfcb938954b94aa30c3013e8c02209dea lisp/unicode.el --- a/lisp/unicode.el Mon Jan 21 22:54:43 2008 +0100 +++ b/lisp/unicode.el Thu Mar 13 10:21:01 2008 +0100 ＠＠ -624,15 +624,20 ＠＠ mapping from the error sequences to the (let* ((skip-chars-arg unicode-query-coding-skip-chars-arg) (ranges (make-range-table)) (looking-at-arg (concat "[" skip-chars-arg "]")) - fail-range-start fail-range-end previous-fail char-after - failed extent) + fail-range-start fail-range-end previous-fail char-after failed + extent) (save-excursion + (when highlightp + (map-extents #'(lambda (extent ignored-arg) + (when (eq 'query-coding-warning-face + (extent-face extent)) + (delete-extent extent))) buffer begin end)) (goto-char begin buffer) (skip-chars-forward skip-chars-arg end buffer) (while (< (point buffer) end) - (message - "fail-range-start is %S, previous-fail %S, point is %S, end is %S" - fail-range-start previous-fail (point buffer) end) +; (message +; "fail-range-start is %S, previous-fail %S, point is %S, end is %S" +; fail-range-start previous-fail (point buffer) end) (setq char-after (char-after (point buffer) buffer) fail-range-start (point buffer)) (while (and ＠＠ -646,7 +651,7 ＠＠ mapping from the error sequences to the (if (= fail-range-start (point buffer)) ;; The character can actually be encoded by the coding ;; system; check the characters past it. - (forward-char 1 buffer) + (forward-char 1 buffer) ;; Can't be encoded; note this. (when errorp (error 'text-conversion-error _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches