X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/b90caf50d04d2c51742054bb6b0e836f6d425203..acaf905b1130aae80fa59d2c861ffd4c8eb75486:/lisp/international/mule-diag.el diff --git a/lisp/international/mule-diag.el b/lisp/international/mule-diag.el index 8417a7c114..bd7257bbc0 100644 --- a/lisp/international/mule-diag.el +++ b/lisp/international/mule-diag.el @@ -1,9 +1,8 @@ ;;; mule-diag.el --- show diagnosis of multilingual environment (Mule) -;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006, -;; 2007, 2008, 2009 Free Software Foundation, Inc. +;; Copyright (C) 1997-1998, 2000-2012 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009 +;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 ;; Copyright (C) 2003 @@ -32,7 +31,7 @@ ;;; Code: ;; Make sure the help-xref button type is defined. -(require 'help-fns) +(require 'help-mode) ;;; General utility function @@ -67,7 +66,8 @@ ISO-2022-based coding systems. With prefix ARG, the output format gets more cryptic, but still shows the full information." (interactive "P") - (help-setup-xref (list #'list-character-sets arg) (interactive-p)) + (help-setup-xref (list #'list-character-sets arg) + (called-interactively-p 'interactive)) (with-output-to-temp-buffer "*Character Set List*" (with-current-buffer standard-output (if arg @@ -158,7 +158,7 @@ SORT-KEY should be `name' or `iso-spec' (default `name')." 'type 'help-info 'help-args '("(emacs)Charsets")) (insert " -------------- -Character sets for defining another charset or obsolete now +Character sets for defining other charsets, or for backward compatibility ")) (insert-text-button (symbol-name (car elt)) ; NAME :type 'list-charset-chars @@ -314,7 +314,8 @@ meanings of these arguments." (interactive (list (read-charset "Charset: "))) (or (charsetp charset) (error "Invalid charset: %S" charset)) - (help-setup-xref (list #'describe-character-set charset) (interactive-p)) + (help-setup-xref (list #'describe-character-set charset) + (called-interactively-p 'interactive)) (with-output-to-temp-buffer (help-buffer) (with-current-buffer standard-output (insert "Character set: " (symbol-name charset)) @@ -366,7 +367,8 @@ meanings of these arguments." (when val (if (cadr elt) (insert (cadr elt))) (if (nth 2 elt) - (insert (funcall (nth 2 elt) val))) + (let ((print-length 10) (print-level 2)) + (princ (funcall (nth 2 elt) val) (current-buffer)))) (insert ?\n))))))) ;;; CODING-SYSTEM @@ -419,7 +421,7 @@ meanings of these arguments." (if (null coding-system) (describe-current-coding-system) (help-setup-xref (list #'describe-coding-system coding-system) - (interactive-p)) + (called-interactively-p 'interactive)) (with-output-to-temp-buffer (help-buffer) (print-coding-system-briefly coding-system 'doc-string) (let ((type (coding-system-type coding-system)) @@ -956,7 +958,7 @@ the current buffer." (insert "\n ------") (put-text-property (line-beginning-position) (point) 'face 'highlight))) (if (and start1 end2) - ;; Reoder the printed information to match with the font + ;; Reorder the printed information to match with the font ;; searching strategy; i.e. FONTSET, the default fontset, ;; default of FONTSET, default of the default fontset. (transpose-regions start1 end1 start2 end2)) @@ -983,7 +985,8 @@ This shows which font is used for which character(s)." (if (= (length fontset) 0) (setq fontset (face-attribute 'default :fontset)) (setq fontset (query-fontset fontset))) - (help-setup-xref (list #'describe-fontset fontset) (interactive-p)) + (help-setup-xref (list #'describe-fontset fontset) + (called-interactively-p 'interactive)) (with-output-to-temp-buffer (help-buffer) (with-current-buffer standard-output (print-fontset fontset t)))) @@ -999,7 +1002,8 @@ see the function `describe-fontset' for the format of the list." (interactive "P") (if (not (and window-system (fboundp 'fontset-list))) (error "No fontsets being used") - (help-setup-xref (list #'list-fontsets arg) (interactive-p)) + (help-setup-xref (list #'list-fontsets arg) + (called-interactively-p 'interactive)) (with-output-to-temp-buffer (help-buffer) (with-current-buffer standard-output ;; This code is duplicated near the end of mule-diag. @@ -1018,7 +1022,8 @@ see the function `describe-fontset' for the format of the list." (defun list-input-methods () "Display information about all input methods." (interactive) - (help-setup-xref '(list-input-methods) (interactive-p)) + (help-setup-xref '(list-input-methods) + (called-interactively-p 'interactive)) (with-output-to-temp-buffer (help-buffer) (list-input-methods-1) (with-current-buffer standard-output @@ -1051,7 +1056,10 @@ installed LEIM (Libraries of Emacs Input Methods).") (if (and (consp title) (stringp (car title))) (car title) title)) - (nth 4 elt))))))) + ;; If the doc is multi-line, indent all + ;; non-blank lines. (Bug#8066) + (replace-regexp-in-string "\n\\(.\\)" "\n \\1" + (or (nth 4 elt) "")))))))) ;;; DIAGNOSIS @@ -1131,7 +1139,8 @@ system which uses fontsets)." (insert "Fontset-Name\t\t\t\t\t\t WDxHT Style\n") (insert "------------\t\t\t\t\t\t ----- -----\n") (dolist (fontset (fontset-list)) - (print-fontset fontset t))) + (print-fontset fontset t) + (insert "\n"))) (help-print-return-message)))) ;;;###autoload @@ -1163,5 +1172,4 @@ The default is 20. If LIMIT is negative, do not limit the listing." (provide 'mule-diag) -;; arch-tag: cd3b607c-2893-45a0-a4fa-a6535754dbee ;;; mule-diag.el ends here