[Emacs-diffs] Changes to emacs/lisp/textmodes/po.el

[Juanma Barranquero]

Index: emacs/lisp/textmodes/po.el
diff -c emacs/lisp/textmodes/po.el:1.9 emacs/lisp/textmodes/po.el:1.10
*** emacs/lisp/textmodes/po.el:1.9      Mon Sep  1 15:45:40 2003
--- emacs/lisp/textmodes/po.el  Fri May  6 19:25:10 2005
***************
*** 80,93 ****
            assoc)
         (list (cond
              ((setq assoc
!                    (assoc-ignore-case charset
!                                       po-content-type-charset-alist))
               (cdr assoc))
!             ((or (setq assoc (assoc-ignore-case charset coding-system-alist))
                   (setq assoc
!                        (assoc-ignore-case (subst-char-in-string ?_ ?-
!                                                                 charset)
!                                           coding-system-alist)))
               (intern (car assoc)))
              ;; In principle we should also check the `mime-charset'
              ;; property of everything in the base coding system
--- 80,94 ----
            assoc)
         (list (cond
              ((setq assoc
!                    (assoc-string charset
!                                    po-content-type-charset-alist
!                                    t))
               (cdr assoc))
!             ((or (setq assoc (assoc-string charset coding-system-alist t))
                   (setq assoc
!                        (assoc-string (subst-char-in-string ?_ ?-
!                                                              charset)
!                                        coding-system-alist t)))
               (intern (car assoc)))
              ;; In principle we should also check the `mime-charset'
              ;; property of everything in the base coding system
***************
*** 101,110 ****
               ;; to require it initially?
               (require 'code-pages nil t)
               (if (or
!                   (setq assoc (assoc-ignore-case charset coding-system-alist))
!                   (setq assoc (assoc-ignore-case (subst-char-in-string
!                                                   ?_ ?- charset)
!                                                  coding-system-alist)))
                   (intern (car assoc))
                 'raw-text))))))))
  
--- 102,111 ----
               ;; to require it initially?
               (require 'code-pages nil t)
               (if (or
!                   (setq assoc (assoc-string charset coding-system-alist t))
!                   (setq assoc (assoc-string (subst-char-in-string
!                                                ?_ ?- charset)
!                                               coding-system-alist t)))
                   (intern (car assoc))
                 'raw-text))))))))