@@ -2549,37 +2549,33 @@ If PROMPT (the prefix) is a number, use the prompt specified in
2549
2549
(gnus-group-position-point )))
2550
2550
2551
2551
(defun gnus-group-goto-group (group &optional far test-marked )
2552
- " Goto to newsgroup GROUP.
2552
+ " Go to newsgroup GROUP.
2553
2553
If FAR, it is likely that the group is not on the current line.
2554
- If TEST-MARKED, the line must be marked."
2554
+ If TEST-MARKED, the line must be marked.
2555
+
2556
+ Return nil if GROUP is not found."
2555
2557
(when group
2556
- (let ((start (point ))
2557
- (active (and (or
2558
- ; ; Some kind of group may be only there.
2559
- (gnus-active group)
2560
- ; ; All groups (but with exception) are there.
2561
- (gnus-group-entry group))
2562
- group)))
2558
+ (let ((start (point )))
2563
2559
(beginning-of-line )
2564
2560
(cond
2565
2561
; ; It's quite likely that we are on the right line, so
2566
2562
; ; we check the current line first.
2567
2563
((and (not far)
2568
- (equal (get-text-property (point ) 'gnus-group ) active )
2564
+ (equal (get-text-property (point ) 'gnus-group ) group )
2569
2565
(or (not test-marked) (gnus-group-mark-line-p)))
2570
2566
(point ))
2571
2567
; ; Previous and next line are also likely, so we check them as well.
2572
2568
((and (not far)
2573
2569
(save-excursion
2574
2570
(forward-line -1 )
2575
- (and (equal (get-text-property (point ) 'gnus-group ) active )
2571
+ (and (equal (get-text-property (point ) 'gnus-group ) group )
2576
2572
(or (not test-marked) (gnus-group-mark-line-p)))))
2577
2573
(forward-line -1 )
2578
2574
(point ))
2579
2575
((and (not far)
2580
2576
(save-excursion
2581
2577
(forward-line 1 )
2582
- (and (equal (get-text-property (point ) 'gnus-group ) active )
2578
+ (and (equal (get-text-property (point ) 'gnus-group ) group )
2583
2579
(or (not test-marked) (gnus-group-mark-line-p)))))
2584
2580
(forward-line 1 )
2585
2581
(point ))
@@ -2588,15 +2584,15 @@ If TEST-MARKED, the line must be marked."
2588
2584
(let (found)
2589
2585
(while (and (not found)
2590
2586
(gnus-text-property-search
2591
- 'gnus-group active 'forward 'goto ))
2587
+ 'gnus-group group 'forward 'goto ))
2592
2588
(if (gnus-group-mark-line-p)
2593
2589
(setq found t )
2594
2590
(forward-line 1 )))
2595
2591
found))
2596
2592
(t
2597
2593
; ; Search through the entire buffer.
2598
2594
(if (gnus-text-property-search
2599
- 'gnus-group active nil 'goto )
2595
+ 'gnus-group group nil 'goto )
2600
2596
(point )
2601
2597
(goto-char start)
2602
2598
nil ))))))
0 commit comments