diff options
| author | Richard M. Stallman | 2002-09-23 00:20:26 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2002-09-23 00:20:26 +0000 |
| commit | d775b378ef01921aca715271d06f26a1d3a754c8 (patch) | |
| tree | bdbe1f66229d4aae351d8afac4cdda9c5393b6ef | |
| parent | c86237b26e214f8fc651298e8fe405cde658aeb0 (diff) | |
| download | emacs-d775b378ef01921aca715271d06f26a1d3a754c8.tar.gz emacs-d775b378ef01921aca715271d06f26a1d3a754c8.zip | |
(select-safe-coding-system): Cope if default-coding-system gives nil
which was then used in `min'.
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/international/mule-cmds.el | 5 |
2 files changed, 11 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0f71c5c6d2d..0b4a17dc047 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,11 @@ | |||
| 1 | 2002-09-22 Richard M. Stallman <rms@gnu.org> | ||
| 2 | |||
| 3 | * international/mule-cmds.el (select-safe-coding-system): Cope if | ||
| 4 | default-coding-system gives nil which was then used in `min'. | ||
| 5 | |||
| 6 | * mail/sendmail.el (sendmail-send-it): If user's buffer | ||
| 7 | is unibyte, make tembuf unibyte. | ||
| 8 | |||
| 1 | 2002-09-22 Kai Gro,b_(Bjohann <grossjoh@ls6.informatik.uni-dortmund.de> | 9 | 2002-09-22 Kai Gro,b_(Bjohann <grossjoh@ls6.informatik.uni-dortmund.de> |
| 2 | 10 | ||
| 3 | * net/tramp.el: Version 2.0.22 released. | 11 | * net/tramp.el: Version 2.0.22 released. |
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index 4eaf6184a91..1f657700fc8 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el | |||
| @@ -723,9 +723,10 @@ and TO is ignored." | |||
| 723 | (let ((window-configuration (current-window-configuration))) | 723 | (let ((window-configuration (current-window-configuration))) |
| 724 | (save-excursion | 724 | (save-excursion |
| 725 | ;; Make sure the offending buffer is displayed. | 725 | ;; Make sure the offending buffer is displayed. |
| 726 | (when (and default-coding-system (not (stringp from))) | 726 | (when (and (consp default-coding-system) (not (stringp from))) |
| 727 | (pop-to-buffer bufname) | 727 | (pop-to-buffer bufname) |
| 728 | (goto-char (apply 'min (mapcar #'(lambda (x) (car (cadr x))) | 728 | ;; The `or' is because sometimes (car (cadr x)) is nil. |
| 729 | (goto-char (apply 'min (mapcar #'(lambda (x) (or (car (cadr x)) (point-max))) | ||
| 729 | default-coding-system)))) | 730 | default-coding-system)))) |
| 730 | ;; Then ask users to select one from CODINGS. | 731 | ;; Then ask users to select one from CODINGS. |
| 731 | (with-output-to-temp-buffer "*Warning*" | 732 | (with-output-to-temp-buffer "*Warning*" |