X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fgnus.el;h=f412e7aa4954d9651b23c384f15676c303c164dd;hb=505a1c2ee29dfbeaa008c4cd257c60103b07cade;hp=9681dd39092e7fab8b9bcf8ef1897d3b3d540716;hpb=4c4087aa9651092d5624e8e3263f1287ae9c5b56;p=elisp%2Fgnus.git- diff --git a/lisp/gnus.el b/lisp/gnus.el index 9681dd3..f412e7a 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -31,7 +31,6 @@ (eval '(run-hooks 'gnus-load-hook)) (eval-when-compile (require 'cl)) -(require 'mm-util) (require 'custom) (eval-and-compile @@ -265,13 +264,13 @@ is restarted, and sometimes reloaded." (defconst gnus-product-name "T-gnus" "Product name of this version of gnus.") -(defconst gnus-version-number "6.10.062" +(defconst gnus-version-number "6.10.072" "Version number for this version of gnus.") -(defconst gnus-revision-number "00" +(defconst gnus-revision-number "01" "Revision number for this version of gnus.") -(defconst gnus-original-version-number "0.80" +(defconst gnus-original-version-number "0.95" "Version number for this version of Gnus.") (provide 'running-pterodactyl-gnus-0_73-or-later) @@ -1431,59 +1430,6 @@ face." :group 'gnus-visual :type 'face) -(defcustom gnus-article-display-hook - (if (and (string-match "XEmacs" emacs-version) - (featurep 'xface)) - '(gnus-article-hide-headers-if-wanted - gnus-article-hide-boring-headers - gnus-article-treat-overstrike - gnus-article-maybe-highlight - gnus-article-display-x-face) - '(gnus-article-hide-headers-if-wanted - gnus-article-hide-boring-headers - gnus-article-treat-overstrike - gnus-article-maybe-highlight)) - "*Controls how the article buffer will look. - -If you leave the list empty, the article will appear exactly as it is -stored on the disk. The list entries will hide or highlight various -parts of the article, making it easier to find the information you -want." - :group 'gnus-article-highlight - :group 'gnus-visual - :type 'hook - :options '(gnus-article-add-buttons - gnus-article-add-buttons-to-head - gnus-article-emphasize - gnus-article-fill-cited-article - gnus-article-remove-cr - gnus-summary-stop-page-breaking - ;; gnus-summary-caesar-message - ;; gnus-summary-verbose-headers - gnus-summary-toggle-mime - gnus-article-hide - gnus-article-hide-headers - gnus-article-hide-boring-headers - gnus-article-hide-signature - gnus-article-hide-citation - gnus-article-hide-pgp - gnus-article-hide-pem - gnus-article-highlight - gnus-article-highlight-headers - gnus-article-highlight-citation - gnus-article-highlight-signature - gnus-article-date-ut - gnus-article-date-local - gnus-article-date-lapsed - gnus-article-date-original - gnus-article-remove-trailing-blank-lines - gnus-article-strip-leading-blank-lines - gnus-article-strip-multiple-blank-lines - gnus-article-strip-blank-lines - gnus-article-treat-overstrike - gnus-article-display-x-face - gnus-smiley-display)) - (defcustom gnus-article-save-directory gnus-directory "*Name of the directory articles will be saved in (default \"~/News\")." :group 'gnus-article-saving @@ -1667,6 +1613,11 @@ gnus-newsrc-hashtb should be kept so that both hold the same information.") (defvar gnus-dead-summary nil) +(defvar gnus-article-display-hook nil + "Controls how the article buffer will look. This is an obsolete variable; +use the article treating faculties instead. Is is described in Info node +`Customizing Articles'.") + ;;; End of variables. ;; Define some autoload functions Gnus might use. @@ -1785,8 +1736,7 @@ gnus-newsrc-hashtb should be kept so that both hold the same information.") gnus-summary-post-forward gnus-summary-wide-reply-with-original gnus-summary-post-forward) ("gnus-picon" :interactive t gnus-article-display-picons - gnus-group-display-picons gnus-picons-article-display-x-face - gnus-picons-display-x-face) + gnus-group-display-picons) ("gnus-picon" gnus-picons-buffer-name) ("gnus-gl" bbb-login bbb-logout bbb-grouplens-group-p gnus-grouplens-mode) @@ -1814,7 +1764,7 @@ gnus-newsrc-hashtb should be kept so that both hold the same information.") gnus-article-delete-invisible-text gnus-treat-article) ("gnus-art" :interactive t gnus-article-hide-headers gnus-article-hide-boring-headers - gnus-article-treat-overstrike gnus-article-word-wrap + gnus-article-treat-overstrike gnus-article-remove-cr gnus-article-remove-trailing-blank-lines gnus-article-display-x-face gnus-article-hide-pgp @@ -1824,7 +1774,8 @@ gnus-newsrc-hashtb should be kept so that both hold the same information.") gnus-article-show-all-headers gnus-article-edit-mode gnus-article-edit-article gnus-article-edit-done article-decode-encoded-words - gnus-start-date-timer gnus-stop-date-timer) + gnus-start-date-timer gnus-stop-date-timer + gnus-article-toggle-headers) ("gnus-int" gnus-request-type) ("gnus-start" gnus-newsrc-parse-options gnus-1 gnus-no-server-1 gnus-dribble-enter gnus-read-init-file gnus-dribble-touch) @@ -1860,7 +1811,10 @@ gnus-newsrc-hashtb should be kept so that both hold the same information.") gnus-unplugged gnus-agentize gnus-agent-batch) ("gnus-vm" :interactive t gnus-summary-save-in-vm gnus-summary-save-article-vm) - ("gnus-draft" :interactive t gnus-draft-mode gnus-group-send-drafts)))) + ("gnus-draft" :interactive t gnus-draft-mode gnus-group-send-drafts) + ("gnus-mlspl" gnus-group-split gnus-group-split-fancy) + ("gnus-mlspl" :interactive t gnus-group-split-setup + gnus-group-split-update)))) ;;; gnus-sum.el thingies @@ -2553,12 +2507,14 @@ You should probably use `gnus-find-method-for-group' instead." (defun gnus-method-simplify (method) "Return the shortest uniquely identifying string or method for METHOD." - (cond ((gnus-native-method-p method) - nil) - ((gnus-secondary-method-p method) - (format "%s:%s" (nth 0 method) (nth 1 method))) - (t - method))) + (cond ((stringp method) + method) + ((gnus-native-method-p method) + nil) + ((gnus-secondary-method-p method) + (format "%s:%s" (nth 0 method) (nth 1 method))) + (t + method))) (defun gnus-groups-from-server (server) "Return a list of all groups that are fetched from SERVER." @@ -2659,7 +2615,6 @@ If SCORE is nil, add 1 to the score of GROUP." (when info (gnus-info-set-score info (+ (gnus-info-score info) (or score 1)))))) -;; Function written by Stainless Steel Rat (defun gnus-short-group-name (group &optional levels) "Collapse GROUP name LEVELS. Select methods are stripped and any remote host name is stripped down to @@ -2669,6 +2624,7 @@ just the host name." (depth 0) (skip 1) (levels (or levels + gnus-group-uncollapsed-levels (progn (while (string-match "\\." group skip) (setq skip (match-end 0) @@ -2908,16 +2864,42 @@ As opposed to `gnus', this command will not connect to the local server." (interactive "P") (gnus arg nil 'slave)) +(defcustom gnus-frame-properties nil + "The properties of the frame in which gnus is displayed. Under XEmacs, +the variable `toolbar-news-frame-plist' will be refered instead." + :type '(repeat (cons :format "%v" + (symbol :tag "Parameter") + (sexp :tag "Value"))) + :group 'gnus) + +(defvar gnus-frame nil + "The frame in which gnus is displayed. It is not used under XEmacs.") + ;;;###autoload (defun gnus-other-frame (&optional arg) "Pop up a frame to read news." (interactive "P") - (let ((window (get-buffer-window gnus-group-buffer))) - (cond (window - (select-frame (window-frame window))) - (t - (other-frame 1)))) - (gnus arg)) + (if (featurep 'xemacs) + (let ((toolbar-news-use-separate-frame t)) + (toolbar-gnus)) + (if (frame-live-p gnus-frame) + (raise-frame gnus-frame) + (setq gnus-frame (make-frame gnus-frame-properties)) + (if (and (gnus-buffer-live-p gnus-group-buffer) + (save-current-buffer + (set-buffer gnus-group-buffer) + (eq 'gnus-group-mode major-mode))) + (progn + (select-frame gnus-frame) + (switch-to-buffer gnus-group-buffer)) + (add-hook 'gnus-exit-gnus-hook + (lambda () + (when (and (frame-live-p gnus-frame) + (cdr (frame-list))) + (delete-frame gnus-frame)) + (setq gnus-frame nil))) + (select-frame gnus-frame) + (gnus arg))))) ;;;###autoload (defun gnus (&optional arg dont-connect slave)