(all): Make `indicate-buffer-boundaries' display values set outside

[bpt/emacs.git] / lisp / ps-mule.el

diff --git a/lisp/ps-mule.el b/lisp/ps-mule.el
index 3f66ba2..e57e030 100644 (file)
--- a/lisp/ps-mule.el
+++ b/lisp/ps-mule.el
@@ -24,8 +24,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -511,7 +511,10 @@ element of the list."
 
 (defsubst ps-mule-printable-p (charset)
   "Non-nil if characters in CHARSET is printable."
-  (ps-mule-get-font-spec charset 'normal))
+  ;; ASCII and Latin-1 are always printable.
+  (or (eq charset 'ascii)
+      (eq charset 'latin-iso8859-1)
+      (ps-mule-get-font-spec charset 'normal)))
 
 (defconst ps-mule-external-libraries
   '((builtin nil nil
@@ -1036,9 +1039,12 @@ the sequence."
            /BOTTOM LLY def
            currentfont /RelativeCompose known {
                /relative currentfont /RelativeCompose get def
+               relative false eq {
+                   %% Disable relative composition by setting sufficiently low
+                   %% and high positions.
+                   /relative [ -100000 100000 ] def
+               } if
            } {
-               %% Disable relative composition by setting sufficiently low
-               %% and high positions.
                /relative [ -100000 100000 ] def
            } ifelse
            [ elt 0 0 ]
@@ -1233,7 +1239,7 @@ NewBitmapDict
        } ifelse
        /FirstCode -1 store
 
-       bmp 0 get SpaceWidthRatio ratio div mul size div 0      % wx wy
+       bmp 0 get size div 0            % wx wy
        setcharwidth                    % We can't use setcachedevice here.
 
        bmp 1 get 0 gt bmp 2 get 0 gt and {
@@ -1399,6 +1405,7 @@ FONTTAG should be a string \"/h0\" or \"/h1\"."
 (defun ps-mule-show-warning (charsets from to header-footer-list)
   (let ((table (make-category-table))
        (buf (current-buffer))
+       (max-unprintable-chars 15)
        char-pos-list)
     (define-category ?u "Unprintable charset" table)
     (dolist (cs charsets)
@@ -1406,19 +1413,22 @@ FONTTAG should be a string \"/h0\" or \"/h1\"."
     (with-category-table table
       (save-excursion
        (goto-char from)
-       (while (and (< (length char-pos-list) 20)
+       (while (and (<= (length char-pos-list) max-unprintable-chars)
                    (re-search-forward "\\cu" to t))
-         (push (cons (preceding-char) (1- (point))) char-pos-list))
-       (setq char-pos-list (nreverse char-pos-list))))
+         (push (cons (preceding-char) (1- (point))) char-pos-list))))
     (with-output-to-temp-buffer "*Warning*"
       (with-current-buffer standard-output
        (when char-pos-list
          (let ((func #'(lambda (buf pos)
                          (when (buffer-live-p buf)
                            (pop-to-buffer buf)
-                           (goto-char pos)))))
+                           (goto-char pos))))
+               (more nil))
+           (if (>= (length char-pos-list) max-unprintable-chars)
+               (setq char-pos-list (cdr char-pos-list)
+                     more t))
            (insert "These characters in the buffer can't be printed:\n")
-           (dolist (elt char-pos-list)
+           (dolist (elt (nreverse char-pos-list))
              (insert " ")
              (insert-text-button (string (car elt))
                                  :type 'help-xref
@@ -1427,8 +1437,10 @@ FONTTAG should be a string \"/h0\" or \"/h1\"."
                                  'help-function func
                                  'help-args (list buf (cdr elt)))
              (insert ","))
-           ;; Delete the last comma.
-           (delete-char -1)
+           (if more
+               (insert " and more...")
+             ;; Delete the last comma.
+             (delete-char -1))
            (insert "\nClick them to jump to the buffer position,\n"
                    (substitute-command-keys "\
 or \\[universal-argument] \\[what-cursor-position] will give information about them.\n"))))