From f682ca49976c30bb5756eba44a563a2f288c9533 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Wed, 30 May 2001 22:29:04 +0000 Subject: [PATCH] Synch with Oort Gnus. * gnus-clfns.el (find-cl-run-time-functions): Remove an useless non-global var; scroll the output window automatically. --- ChangeLog | 5 +++++ lisp/ChangeLog | 8 ++++++++ lisp/gnus-clfns.el | 17 ++++++++++------- lisp/mm-view.el | 3 ++- 4 files changed, 25 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1817ec6..05e5760 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-05-30 Katsumi Yamaoka + + * lisp/gnus-clfns.el (find-cl-run-time-functions): Remove an + useless non-global var; scroll the output window automatically. + 2001-05-31 TSUCHIYA Masatoshi * lisp/nnshimbun.el (nnshimbun-header-xref): Removed. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 39ff987..d0b962a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2001-05-30 Kai Gro,A_(Bjohann + + * mm-view.el (mm-inline-image-xemacs): Insert newline, then move + back, then insert glyph. (Before, the glyph was inserted first, + then the newline.) This works around a behavior in XEmacs where + it is not possible to insert a character after a glyph which is at + the end of a buffer. Patch by Lloyd Zusman . + 2001-05-28 Kai Gro,A_(Bjohann From Jaap-Henk Hoepman (jhh@xs4all.nl). diff --git a/lisp/gnus-clfns.el b/lisp/gnus-clfns.el index f3ee463..8e2ba3f 100644 --- a/lisp/gnus-clfns.el +++ b/lisp/gnus-clfns.el @@ -213,8 +213,8 @@ Emacs will not be reported." current-prefix-arg)) (unless (interactive-p) (error "You should invoke `M-x find-cl-run-time-functions' interactively")) - (let (files clfns working giveup file lines forms fns pt form fn buffer - buffer-file-format format-alist + (let (files clfns working file lines forms fns pt form fn buffer + window height buffer-file-format format-alist insert-file-contents-post-hook insert-file-contents-pre-hook) (cond ((file-directory-p file-or-directory) (prog1 @@ -242,8 +242,7 @@ Emacs will not be reported." (let (emacs-lisp-mode-hook) (emacs-lisp-mode)) (while files - (setq giveup nil - file (pop files) + (setq file (pop files) lines (list nil 1)) (message "Searching for CL run-time functions in: %s..." (file-name-nondirectory file)) @@ -312,17 +311,18 @@ Emacs will not be reported." form)) forms)))) (goto-char (point-max)) - (setq giveup t - lines (list (cadr lines) + (setq lines (list (cadr lines) (count-lines (point-min) (point))) fns '("Couldn't parse, check this file manually.")))) - (when (or fns giveup) + (when fns (if buffer (set-buffer buffer) (display-buffer (setq buffer (get-buffer-create (concat "*CL run-time functions in: " file-or-directory "*")))) + (setq window (get-buffer-window buffer t) + height (window-height window)) (set-buffer buffer) (erase-buffer)) (when file @@ -338,6 +338,9 @@ Emacs will not be reported." (insert "\n ") (end-of-line)) (insert "\n") + (when (zerop (forward-line (- 0 height -2))) + (set-window-start window (point))) + (goto-char (point-max)) (sit-for 0) (set-buffer working)))) (kill-buffer working) diff --git a/lisp/mm-view.el b/lisp/mm-view.el index 976cdff..4a92e80 100644 --- a/lisp/mm-view.el +++ b/lisp/mm-view.el @@ -49,10 +49,11 @@ `(lambda () (remove-images ,b (1+ ,b)))))) (defun mm-inline-image-xemacs (handle) + (insert "\n") + (forward-char -1) (let ((b (point)) (annot (make-annotation (mm-get-image handle) nil 'text)) buffer-read-only) - (insert "\n") (mm-handle-set-undisplayer handle `(lambda () -- 1.7.10.4