[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 5669878: * lisp/gnus/gnus-start.el (gnus-group-change-level): Sim
From: |
Stefan Monnier |
Subject: |
master 5669878: * lisp/gnus/gnus-start.el (gnus-group-change-level): Simplify |
Date: |
Sat, 4 Jan 2020 18:09:57 -0500 (EST) |
branch: master
commit 5669878d7fb9e8080f408ae66e657e28e059cf4c
Author: Stefan Monnier <address@hidden>
Commit: Stefan Monnier <address@hidden>
* lisp/gnus/gnus-start.el (gnus-group-change-level): Simplify
* lisp/gnus/gnus-group.el (gnus-group-unsubscribe-group): Simplify.
---
lisp/gnus/gnus-group.el | 10 +++++-----
lisp/gnus/gnus-start.el | 18 +++++++++---------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index b89f040..da7db58 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -3761,10 +3761,10 @@ group line."
(newsrc
;; Toggle subscription flag.
(gnus-group-change-level
- newsrc (if level level (if (<= (gnus-info-level (nth 1 newsrc))
- gnus-level-subscribed)
- (1+ gnus-level-subscribed)
- gnus-level-default-subscribed)))
+ newsrc (or level (if (<= (gnus-info-level (nth 1 newsrc))
+ gnus-level-subscribed)
+ (1+ gnus-level-subscribed)
+ gnus-level-default-subscribed)))
(unless silent
(gnus-group-update-group group)))
((and (stringp group)
@@ -3773,7 +3773,7 @@ group line."
;; Add new newsgroup.
(gnus-group-change-level
group
- (if level level gnus-level-default-subscribed)
+ (or level gnus-level-default-subscribed)
(or (and (member group gnus-zombie-list)
gnus-level-zombie)
gnus-level-killed)
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index 6131926..1fd2575 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -1256,19 +1256,19 @@ INFO-LIST), otherwise it's a list in the format of the
`gnus-newsrc-hashtb' entries. LEVEL is the new level of the
group, OLDLEVEL is the old level and PREVIOUS is the group (a
string name) to insert this group before."
- (let (group info active num)
- ;; Glean what info we can from the arguments.
- (if (consp entry)
- (setq group (if fromkilled (nth 1 entry) (car (nth 1 entry))))
- (setq group entry))
+ ;; Glean what info we can from the arguments.
+ (let ((group (if (consp entry)
+ (if fromkilled (nth 1 entry) (car (nth 1 entry)))
+ entry))
+ info active num)
(when (and (stringp entry)
oldlevel
(< oldlevel gnus-level-zombie))
(setq entry (gnus-group-entry entry)))
- (if (and (not oldlevel)
- (consp entry))
- (setq oldlevel (gnus-info-level (nth 1 entry)))
- (setq oldlevel (or oldlevel gnus-level-killed)))
+ (setq oldlevel (if (and (not oldlevel)
+ (consp entry))
+ (gnus-info-level (nth 1 entry))
+ (or oldlevel gnus-level-killed)))
;; This table is used for completion, so put a dummy entry there.
(unless (gethash group gnus-active-hashtb)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 5669878: * lisp/gnus/gnus-start.el (gnus-group-change-level): Simplify,
Stefan Monnier <=