xemacs-beta: lisp/gnus/gnus-salt.el comparison

comparison lisp/gnus/gnus-salt.el @ 167:85ec50267440 r20-3b10

Import from CVS: tag r20-3b10

author	cvs
date	Mon, 13 Aug 2007 09:45:46 +0200
parents	43dd3413c7c7
children	8eaf7971accc

comparison

equal deleted inserted replaced

-:7a77eb660975
+:85ec50267440
 ;;;
 (defvar gnus-pick-mode nil
 "Minor mode for providing a pick-and-read interface in Gnus summary buffers.")
-(defvar gnus-pick-display-summary nil
+(defcustom gnus-pick-display-summary nil
-"*Display summary while reading.")
+"*Display summary while reading."
+:type 'boolean
-(defvar gnus-pick-mode-hook nil
+:group 'gnus-summary-pick)
-"Hook run in summary pick mode buffers.")
+(defcustom gnus-pick-mode-hook nil
-(defvar gnus-mark-unpicked-articles-as-read nil
+"Hook run in summary pick mode buffers."
-"*If non-nil, mark all unpicked articles as read.")
+:type 'hook
+:group 'gnus-summary-pick)
-(defvar gnus-pick-elegant-flow t
-"If non-nil, gnus-pick-start-reading will run gnus-summary-next-group when no articles have been picked.")
+(defcustom gnus-mark-unpicked-articles-as-read nil
+"*If non-nil, mark all unpicked articles as read."
-(defvar gnus-summary-pick-line-format
+:type 'boolean
+:group 'gnus-summary-pick)
+(defcustom gnus-pick-elegant-flow t
+"If non-nil, gnus-pick-start-reading will run gnus-summary-next-group when no articles have been picked."
+:type 'boolean
+:group 'gnus-summary-pick)
+(defcustom gnus-summary-pick-line-format
 "%-5P %U\%R\%z\%I\%(%[%4L: %-20,20n%]%) %s\n"
 "*The format specification of the lines in pick buffers.
-It accepts the same format specs that `gnus-summary-line-format' does.")
+It accepts the same format specs that `gnus-summary-line-format' does."
+:type 'string
+:group 'gnus-summary-pick)
 ;;; Internal variables.
 (defvar gnus-pick-mode-map nil)
 ;;;
 ;;; gnus-tree-mode
 ;;;
-(defvar gnus-tree-line-format "%(%[%3,3n%]%)"
+(defcustom gnus-tree-line-format "%(%[%3,3n%]%)"
-"Format of tree elements.")
+"Format of tree elements."
+:type 'string
-(defvar gnus-tree-minimize-window t
+:group 'gnus-summary-tree)
+(defcustom gnus-tree-minimize-window t
 "If non-nil, minimize the tree buffer window.
 If a number, never let the tree buffer grow taller than that number of
-lines.")
+lines."
+:type 'boolean
-(defvar gnus-selected-tree-face 'modeline
+:group 'gnus-summary-tree)
-"*Face used for highlighting selected articles in the thread tree.")
+(defcustom gnus-selected-tree-face 'modeline
+"*Face used for highlighting selected articles in the thread tree."
+:type 'face
+:group 'gnus-summary-tree)
 (defvar gnus-tree-brackets '((?\[ . ?\]) (?\( . ?\))
 			     (?\{ . ?\}) (?< . ?>))
 "Brackets used in tree nodes.")
 (defvar gnus-tree-parent-child-edges '(?- ?\\ ?|)
 "Characters used to connect parents with children.")
-(defvar gnus-tree-mode-line-format "Gnus: %%b %S %Z"
+(defcustom gnus-tree-mode-line-format "Gnus: %%b %S %Z"
-"*The format specification for the tree mode line.")
+"*The format specification for the tree mode line."
+:type 'string
-(defvar gnus-generate-tree-function 'gnus-generate-vertical-tree
+:group 'gnus-summary-tree)
+(defcustom gnus-generate-tree-function 'gnus-generate-vertical-tree
 "*Function for generating a thread tree.
 Two predefined functions are available:
-`gnus-generate-horizontal-tree' and `gnus-generate-vertical-tree'.")
+`gnus-generate-horizontal-tree' and `gnus-generate-vertical-tree'."
+:type '(radio (function-item gnus-generate-vertical-tree)
-(defvar gnus-tree-mode-hook nil
+		(function-item gnus-generate-horizontal-tree)
-"*Hook run in tree mode buffers.")
+		(function :tag "Other" nil))
+:group 'gnus-summary-tree)
+(defcustom gnus-tree-mode-hook nil
+"*Hook run in tree mode buffers."
+:type 'hook
+:group 'gnus-summary-tree)
 ;;; Internal variables.
 (defvar gnus-tree-line-format-alist
 `((?n gnus-tmp-name ?s)
 (gnus-define-keys
 gnus-tree-mode-map
 "\r" gnus-tree-select-article
 gnus-mouse-2 gnus-tree-pick-article
 "\C-?" gnus-tree-read-summary-keys
+"h" gnus-tree-show-summary
 "\C-c\C-i" gnus-info-find-node)
 (substitute-key-definition
 'undefined 'gnus-tree-read-summary-keys gnus-tree-mode-map))
 (when (setq win (get-buffer-window buf))
 (select-window win)
 (when gnus-selected-tree-overlay
 	(goto-char (or (gnus-overlay-end gnus-selected-tree-overlay) 1)))
 (gnus-tree-minimize))))
+(defun gnus-tree-show-summary ()
+"Reconfigure windows to show summary buffer."
+(interactive)
+(if (not (gnus-buffer-live-p gnus-summary-buffer))
+(error "There is no summary buffer for this tree buffer")
+(gnus-configure-windows 'article)
+(gnus-summary-goto-subject gnus-current-article)))
 (defun gnus-tree-select-article (article)
 "Select the article under point, if any."
 (interactive (list (gnus-tree-article-number)))
 (let ((buf (current-buffer)))
 (defun gnus-generate-horizontal-tree (thread level &optional dummyp adopted)
 "Generate a horizontal tree."
 (let* ((dummy (stringp (car thread)))
 	 (do (or dummy
-		 (memq (mail-header-number (car thread)) gnus-tmp-limit)))
+		 (and (car thread)
+		      (memq (mail-header-number (car thread))
+			    gnus-tmp-limit))))
 	 col beg)
 (if (not do)
 	;; We don't want this article.
 	(setq thread (cdr thread))
 (if (not (bolp))
 	  (gnus-tree-forward-line (1- (* 2 level)))
 	  (gnus-tree-indent-vertical)
 	  (delete-char -1)
 	  (insert (cadr gnus-tree-parent-child-edges))
 	  (setq beg (point))
+	  (forward-char -1)
 	  ;; Draw "-" lines leftwards.
-	  (while (progn
+	  (while (= (char-after (1- (point))) ? )
-		   (unless (bolp)
+	    (delete-char -1)
-		     (forward-char -2))
+	    (insert (car gnus-tree-parent-child-edges))
-		   (= (following-char) ? ))
+	    (forward-char -1))
-	    (delete-char 1)
-	    (insert (car gnus-tree-parent-child-edges)))
 	  (goto-char beg)
 	  (gnus-tree-forward-line 1)))
 (setq dummyp nil)
 ;; Insert the article node.
 (gnus-tree-indent-vertical)

Mercurial > hg > xemacs-beta

comparison lisp/gnus/gnus-salt.el @ 167:85ec50267440 r20-3b10