;;; 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
;;; Code:
;; Make sure the help-xref button type is defined.
-(require 'help-fns)
+(require 'help-mode)
;;; General utility function
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
'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
(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))
(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)))))))
\f
;;; CODING-SYSTEM
(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))
(insert "\n ---<fallback to the default of the default fontset>---")
(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))
(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))))
(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.
(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
(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) ""))))))))
\f
;;; DIAGNOSIS
(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
(provide 'mule-diag)
-;; arch-tag: cd3b607c-2893-45a0-a4fa-a6535754dbee
;;; mule-diag.el ends here