diff options
| author | Kenichi Handa | 2011-01-28 21:36:18 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2011-01-28 21:36:18 +0900 |
| commit | 10339fa90363cf20a9e379c083df83405718302d (patch) | |
| tree | bbb9ead7b5605a7aeece27ecc25c9362d4ba9e5c | |
| parent | 9e269017e71b8a8208cd2d51c90d8fc61e69182d (diff) | |
| parent | 584cbd9e0f31199f589addde5bab5af821afd74c (diff) | |
| download | emacs-10339fa90363cf20a9e379c083df83405718302d.tar.gz emacs-10339fa90363cf20a9e379c083df83405718302d.zip | |
merge trunk
| -rw-r--r-- | lisp/gnus/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/gnus/gnus-group.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 36175a174b6..33f160826a9 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-01-28 Julien Danjou <julien@danjou.info> | ||
| 2 | |||
| 3 | * gnus-group.el (gnus-group-jump-to-group): Set must match to t. | ||
| 4 | |||
| 1 | 2011-01-28 Lars Ingebrigtsen <larsi@gnus.org> | 5 | 2011-01-28 Lars Ingebrigtsen <larsi@gnus.org> |
| 2 | 6 | ||
| 3 | * gnus-int.el (gnus-request-marks): Call *-request-marks instead of the | 7 | * gnus-int.el (gnus-request-marks): Call *-request-marks instead of the |
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el index 77a4994adfd..66bf70bed05 100644 --- a/lisp/gnus/gnus-group.el +++ b/lisp/gnus/gnus-group.el | |||
| @@ -2467,7 +2467,7 @@ If PROMPT (the prefix) is a number, use the prompt specified in | |||
| 2467 | `gnus-group-jump-to-group-prompt'." | 2467 | `gnus-group-jump-to-group-prompt'." |
| 2468 | (interactive | 2468 | (interactive |
| 2469 | (list (gnus-group-completing-read | 2469 | (list (gnus-group-completing-read |
| 2470 | nil nil (gnus-read-active-file-p) | 2470 | nil nil t |
| 2471 | (if current-prefix-arg | 2471 | (if current-prefix-arg |
| 2472 | (cdr (assq current-prefix-arg gnus-group-jump-to-group-prompt)) | 2472 | (cdr (assq current-prefix-arg gnus-group-jump-to-group-prompt)) |
| 2473 | (or (and (stringp gnus-group-jump-to-group-prompt) | 2473 | (or (and (stringp gnus-group-jump-to-group-prompt) |