From 2c35f1ede03bd5abb13e101b7563d0cfc730dc4b Mon Sep 17 00:00:00 2001 From: yamaoka Date: Fri, 15 Jul 2005 09:22:33 +0000 Subject: [PATCH] Synch to No Gnus 200507150922. --- lisp/ChangeLog | 17 +++++++++++++++++ lisp/gnus-art.el | 8 ++++---- lisp/gnus-score.el | 10 +++++++--- lisp/gnus-util.el | 20 ++++++++++++++++++++ lisp/lpath.el | 6 ++++-- 5 files changed, 52 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 87a61a4..a7fa3e4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,20 @@ +2005-07-15 Katsumi Yamaoka + + * gnus-art.el (gnus-article-next-page): Use gnus-end-of-window. + (gnus-article-next-page-1): Use gnus-beginning-of-window. + (gnus-article-prev-page): Ditto. + + * gnus-util.el (gnus-beginning-of-window): New function. + (gnus-end-of-window): New function. + + * lpath.el: Bind header-line-format and scroll-margin for XEmacs. + +2005-07-14 Hiroshi Fujishima (tiny change) + + * gnus-score.el (gnus-score-edit-all-score): Set + gnus-score-edit-exit-function to gnus-score-edit-done and call + gnus-message. + 2005-07-13 Katsumi Yamaoka * gnus-salt.el (gnus-pick-mode): Remove the 5th arg of diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index 64d03fb..761d88d 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -5516,7 +5516,7 @@ If given a numerical ARG, move forward ARG pages." If end of article, return non-nil. Otherwise return nil. Argument LINES specifies lines to be scrolled up." (interactive "p") - (move-to-window-line (max (- -1 scroll-margin) (- -1 (window-body-height)))) + (gnus-end-of-window) (if (save-excursion (end-of-line) (and (pos-visible-in-window-p) ;Not continuation line. @@ -5545,13 +5545,13 @@ Argument LINES specifies lines to be scrolled up." (end-of-buffer ;; Long lines may cause an end-of-buffer error. (goto-char (point-max))))) - (move-to-window-line (min scroll-margin (window-body-height)))) + (gnus-beginning-of-window)) (defun gnus-article-prev-page (&optional lines) "Show previous page of current article. Argument LINES specifies lines to be scrolled down." (interactive "p") - (move-to-window-line (min scroll-margin (window-body-height))) + (gnus-beginning-of-window) (if (and gnus-page-broken (bobp) (not (save-restriction (widen) (bobp)))) ;Real beginning-of-buffer? @@ -5565,7 +5565,7 @@ Argument LINES specifies lines to be scrolled down." (scroll-down lines) (beginning-of-buffer (goto-char (point-min)))) - (move-to-window-line (min scroll-margin (window-body-height))))))) + (gnus-beginning-of-window))))) (defun gnus-article-only-boring-p () "Decide whether there is only boring text remaining in the article. diff --git a/lisp/gnus-score.el b/lisp/gnus-score.el index 3f13ade..3a2bbf2 100644 --- a/lisp/gnus-score.el +++ b/lisp/gnus-score.el @@ -1,6 +1,6 @@ ;;; gnus-score.el --- scoring code for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005 Free Software Foundation, Inc. ;; Author: Per Abrahamsen ;; Lars Magne Ingebrigtsen @@ -1138,7 +1138,11 @@ EXTRA is the possible non-standard header." "Edit the all.SCORE file." (interactive) (find-file (gnus-score-file-name "all")) - (gnus-score-mode)) + (gnus-score-mode) + (setq gnus-score-edit-exit-function 'gnus-score-edit-done) + (gnus-message + 4 (substitute-command-keys + "\\\\[gnus-score-edit-exit] to save edits"))) (defun gnus-score-edit-file (file) "Edit a score file." diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el index 4c1b32e..7fc874c 100644 --- a/lisp/gnus-util.el +++ b/lisp/gnus-util.el @@ -1602,6 +1602,26 @@ empty directories from OLD-PATH." (defalias 'gnus-set-process-query-on-exit-flag 'process-kill-without-query)) +(defun gnus-beginning-of-window () + "Move point to the beginning of the window." + (move-to-window-line + (if (featurep 'xemacs) + 0 + (min scroll-margin + (max 1 (- (window-height) + (if mode-line-format 1 0) + (if header-line-format 1 0))))))) + +(defun gnus-end-of-window () + "Move point to the end of the window." + (move-to-window-line + (if (featurep 'xemacs) + -1 + (max (- -1 scroll-margin) + (- -1 (max 1 (- (window-height) + (if mode-line-format 1 0) + (if header-line-format 1 0)))))))) + (provide 'gnus-util) ;;; gnus-util.el ends here diff --git a/lisp/lpath.el b/lisp/lpath.el index 1daee79..86b8e5c 100644 --- a/lisp/lpath.el +++ b/lisp/lpath.el @@ -45,9 +45,11 @@ current-language-environment default-enable-multibyte-characters enable-multibyte-characters gnus-agent-expire-current-dirs - language-info-alist mark-active mouse-selection-click-count + header-line-format language-info-alist mark-active + mouse-selection-click-count mouse-selection-click-count-buffer pgg-parse-crc24 - temporary-file-directory transient-mark-mode))) + scroll-margin temporary-file-directory + transient-mark-mode))) (maybe-fbind '(bbdb-complete-name delete-annotation delete-extent device-connection dfw-device events-to-keys font-lock-set-defaults frame-device -- 1.7.10.4