[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/descr-text.el
From: |
Kenichi Handa |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/descr-text.el |
Date: |
Wed, 07 Dec 2005 20:38:50 -0500 |
Index: emacs/lisp/descr-text.el
diff -c emacs/lisp/descr-text.el:1.42 emacs/lisp/descr-text.el:1.43
*** emacs/lisp/descr-text.el:1.42 Sun Nov 20 15:25:35 2005
--- emacs/lisp/descr-text.el Thu Dec 8 01:38:50 2005
***************
*** 464,469 ****
--- 464,472 ----
(single-key-description char)
(string-to-multibyte
(char-to-string char)))))
+ (orig-buf (current-buffer))
+ (help-buf (if (eq orig-buf (get-buffer "*Help*"))
+ "*Help-2*" "*Help*"))
item-list max-width unicode)
(if (or (< char 256)
***************
*** 616,622 ****
(setq max-width (apply #'max (mapcar #'(lambda (x)
(if (cadr x) (length (car x)) 0))
item-list)))
! (with-output-to-temp-buffer "*Help*"
(with-current-buffer standard-output
(set-buffer-multibyte multibyte-p)
(let ((formatter (format "%%%ds:" max-width)))
--- 619,625 ----
(setq max-width (apply #'max (mapcar #'(lambda (x)
(if (cadr x) (length (car x)) 0))
item-list)))
! (with-output-to-temp-buffer help-buf
(with-current-buffer standard-output
(set-buffer-multibyte multibyte-p)
(let ((formatter (format "%%%ds:" max-width)))
***************
*** 636,653 ****
(insert " " clm)))
(insert "\n"))))
! (save-excursion
! (goto-char (point-min))
! (re-search-forward "character:[ \t\n]+")
! (setq pos (point)))
! (let ((end (+ pos (length char-description))))
! (if overlays
(mapc #'(lambda (props)
! (let ((o (make-overlay pos end)))
(while props
(overlay-put o (car props) (nth 1 props))
(setq props (cddr props)))))
! overlays)))
(when disp-vector
(insert
--- 639,655 ----
(insert " " clm)))
(insert "\n"))))
! (when overlays
! (save-excursion
! (goto-char (point-min))
! (re-search-forward "character:[ \t\n]+")
! (let* ((end (+ (point) (length char-description))))
(mapc #'(lambda (props)
! (let ((o (make-overlay (point) end)))
(while props
(overlay-put o (car props) (nth 1 props))
(setq props (cddr props)))))
! overlays))))
(when disp-vector
(insert
***************
*** 720,726 ****
(insert "\nSee the variable `reference-point-alist' for "
"the meaning of the rule.\n"))
! (describe-text-properties pos (current-buffer))
(describe-text-mode)))))
(defalias 'describe-char-after 'describe-char)
--- 722,730 ----
(insert "\nSee the variable `reference-point-alist' for "
"the meaning of the rule.\n"))
! (save-excursion
! (set-buffer orig-buf)
! (describe-text-properties pos help-buf))
(describe-text-mode)))))
(defalias 'describe-char-after 'describe-char)
- [Emacs-diffs] Changes to emacs/lisp/descr-text.el,
Kenichi Handa <=
- [Emacs-diffs] Changes to emacs/lisp/descr-text.el, Stefan Monnier, 2005/12/12
- [Emacs-diffs] Changes to emacs/lisp/descr-text.el, Juri Linkov, 2005/12/14
- [Emacs-diffs] Changes to emacs/lisp/descr-text.el, Nick Roberts, 2005/12/22
- [Emacs-diffs] Changes to emacs/lisp/descr-text.el, Nick Roberts, 2005/12/26
- [Emacs-diffs] Changes to emacs/lisp/descr-text.el, Nick Roberts, 2005/12/26
- [Emacs-diffs] Changes to emacs/lisp/descr-text.el, Nick Roberts, 2005/12/27
- [Emacs-diffs] Changes to emacs/lisp/descr-text.el, Juri Linkov, 2005/12/27