branch: master
commit f67d9172bdcedb65576f16e4b64660c888447b3d
Author: Eric Abrahamsen <e...@ericabrahamsen.net>
Commit: Eric Abrahamsen <e...@ericabrahamsen.net>
[gnorb] Random unimportant pokings-about
Cosmetic things, remove unnecessary :group statements on customization
options, etc.
---
packages/gnorb/gnorb-bbdb.el | 11 +----------
packages/gnorb/gnorb-gnus.el | 16 ----------------
packages/gnorb/gnorb-org.el | 6 ------
packages/gnorb/gnorb-utils.el | 10 ++++------
packages/gnorb/nngnorb.el | 3 ---
5 files changed, 5 insertions(+), 41 deletions(-)
diff --git a/packages/gnorb/gnorb-bbdb.el b/packages/gnorb/gnorb-bbdb.el
index 53c9379..e961152 100644
--- a/packages/gnorb/gnorb-bbdb.el
+++ b/packages/gnorb/gnorb-bbdb.el
@@ -53,7 +53,6 @@
(defcustom gnorb-bbdb-org-tag-field 'org-tags
"The name (as a symbol) of the field to use for org tags."
- :group 'gnorb-bbdb
:type 'symbol)
(when (boundp 'bbdb-separator-alist) ;Allow compilation if BBDB is absent!
@@ -68,13 +67,11 @@ messages from this record are stored.
will not collect links to messages: you have to call
\"\\[gnorb-bbdb-open-link]\" on the record once -- after that,
message links will be collected and updated automatically."
- :group 'gnorb-bbdb
:type 'symbol)
(defcustom gnorb-bbdb-collect-N-messages 5
"For records with a `gnorb-bbdb-messages-field' defined,
collect links to a maximum of this many messages."
- :group 'gnorb-bbdb
:type 'integer)
(defcustom gnorb-bbdb-define-recent 'seen
@@ -88,7 +85,6 @@ In other words, if this variable is set to `received', and a
record's messages field is already full of recently-received
messages, opening a five-year-old message (for instance) from
this record will not push a link to the message into the field."
- :group 'gnorb-bbdb
:type '(choice (const :tag "Most recently seen" 'seen)
(const :tag "Most recently received" 'received)))
@@ -101,7 +97,6 @@ date, and the message's count in the list, as an integer.
You can
access subject and count using the %:subject and %:count escapes.
The message date can be formatted using any of the escapes
mentioned in the docstring of `format-time-string', which see."
- :group 'gnorb-bbdb
:type 'string)
(defcustom gnorb-bbdb-message-link-format-one "%:count"
@@ -117,13 +112,11 @@ date, and the message's count in the list, as an integer.
You can
access subject and count using the %:subject and %:count escapes.
The message date can be formatted using any of the escapes
mentioned in the docstring of `format-time-string', which see."
- :group 'gnorb-bbdb
:type 'string)
(defface gnorb-bbdb-link '((t :inherit org-link))
"Custom face for displaying message links in the *BBDB* buffer.
- Defaults to org-link."
- :group 'gnorb-bbdb)
+ Defaults to org-link.")
(cl-defstruct gnorb-bbdb-link
subject date group id)
@@ -164,8 +157,6 @@ list is disregarded.
All following elements should be field setters for the message to
be composed, just as in `gnus-posting-styles'."
-
- :group 'gnorb-bbdb
:type 'list)
(when (fboundp 'bbdb-record-xfield-string)
diff --git a/packages/gnorb/gnorb-gnus.el b/packages/gnorb/gnorb-gnus.el
index c48d625..c4431b8 100644
--- a/packages/gnorb/gnorb-gnus.el
+++ b/packages/gnorb/gnorb-gnus.el
@@ -44,7 +44,6 @@
:tag "Gnorb Gnus"
:group 'gnorb)
-
(defcustom gnorb-gnus-mail-search-backends
'((notmuch (lambda (terms)
(mapconcat
@@ -67,13 +66,11 @@ the symbol name of the backend, a lambda form which
receives a
list of email addresses and returns a properly-formatted search
string, and the symbol name of the function used to initiate the
search."
- :group 'gnorb-gnus
:type 'list)
(defcustom gnorb-gnus-mail-search-backend nil
"Mail search backend currently in use. One of the three symbols
notmuch, namazu, or mairix."
- :group 'gnorb-gnus
:type 'symbol)
(defcustom gnorb-gnus-capture-always-attach nil
@@ -82,13 +79,11 @@ notmuch, namazu, or mairix."
specified the :gnus-attachments key.
Basically behave as if all attachments have \":gnus-attachments t\"."
- :group 'gnorb-gnus
:type 'boolean)
(defcustom gnorb-gnus-new-todo-capture-key nil
"Key for the capture template to use when creating a new TODO
from an outgoing message."
- :group 'gnorb-gnus
:type 'string)
(defcustom gnorb-gnus-copy-message-text nil
@@ -98,21 +93,18 @@ should the text of the message be saved?
If t, the body text of the message is pushed onto the kill ring.
If a char value, the text is saved into the corresponding
register."
- :group 'gnorb-gnus
:type '(choice boolean
character))
(defcustom gnorb-gnus-hint-relevant-article t
"When opening a gnus message, should gnorb let you know if the
message is relevant to an existing TODO?"
- :group 'gnorb-gnus
:type 'boolean)
(defcustom gnorb-gnus-tick-all-tracked-messages nil
"When non-nil, add the tick mark to all tracked messages.
This happens only once, at the time the association is created.
Ticks can be safely removed later."
- :group 'gnorb-gnus
:type 'boolean)
(defcustom gnorb-gnus-auto-tag-messages nil
@@ -120,7 +112,6 @@ Ticks can be safely removed later."
When creating associations between Org headings and messages,
automatically copy the heading's tags on to the message, using
the registry."
- :group 'gnorb-gnus
:type 'boolean)
(defcustom gnorb-gnus-summary-mark-format-letter "g"
@@ -131,7 +122,6 @@ the registry."
result in the insertion of the value of
`gnorb-gnus-summary-mark', for relevant messages, or
else a space."
- :group 'gnorb-gnus
:type 'string)
(defcustom gnorb-gnus-summary-tags-format-letter "G"
@@ -139,19 +129,16 @@ the registry."
Add this format specification to your `gnus-summary-line-format'
to show the tags which are currently applied to the message.
Must be prefixed with \"u\", eg. \"%uG\"."
- :group 'gnorb-gnus
:type 'string)
(defcustom gnorb-gnus-summary-mark "ยก"
"Default mark to insert in the summary format line of articles
that are likely relevant to existing TODO headings."
- :group 'gnorb-gnus
:type 'string)
(defcustom gnorb-gnus-summary-tracked-mark "&"
"Default mark to insert in the summary format line of articles
that are already tracked by TODO headings."
- :group 'gnorb-gnus
:type 'string)
(defcustom gnorb-gnus-trigger-refile-targets
@@ -159,14 +146,12 @@ Must be prefixed with \"u\", eg. \"%uG\"."
"A value to use as an equivalent of `org-refile-targets' (which
see) when offering trigger targets for
`gnorb-gnus-incoming-do-todo'."
- :group 'gnorb-gnus
:type 'list)
(defcustom gnorb-gnus-refile-use-outline-path 'org
"Gnorb equivalent of `org-refile-use-outline-path' (which see).
Used when selecting Org headings for triggering or attaching
attachments."
- :group 'gnorb-gnus
:type '(choice
(const :tag "Not" nil)
(const :tag "Yes" t)
@@ -185,7 +170,6 @@ list of strings, which are assumed to be fully qualified
server+group combinations, ie \"nnimap+Server:[Gmail]/Sent
Mail\", or something similar. This only has to be done once for
each message."
- :group 'gnorb-gnus
:type '(repeat (string :tag "Group name")))
(defvar gnorb-gnus-capture-attachments nil
diff --git a/packages/gnorb/gnorb-org.el b/packages/gnorb/gnorb-org.el
index 9c97af2..77594d8 100644
--- a/packages/gnorb/gnorb-org.el
+++ b/packages/gnorb/gnorb-org.el
@@ -51,7 +51,6 @@
(defcustom gnorb-org-after-message-setup-hook nil
"Hook run in a message buffer after setting up the message from
`gnorb-org-handle-mail' or `gnorb-org-email-subtree'."
- :group 'gnorb-org
:type 'hook)
(defcustom gnorb-org-trigger-actions
@@ -85,7 +84,6 @@ symbol indicating a custom function. The custom function
will be
called on the heading in question, and passed a plist containing
information about the message from which we're triggering."
- :group 'gnorb-org
:type 'list
:package-version '(gnorb . "1.1.3"))
@@ -96,14 +94,12 @@ note, the message id will be added to the text of the log
note.
When later viewing the messages, call `gnorb-org-view' with point
on a particular logbook item to automatically go to the linked
message."
- :group 'gnorb-org
:type 'boolean)
(defcustom gnorb-org-msg-id-key "GNORB_MSG_ID"
"The name of the org property used to store the Message-IDs
from relevant messages. This is no longer used, and will be
removed soon."
- :group 'gnorb-org
:type 'string)
(defcustom gnorb-org-mail-scan-scope 2
@@ -119,7 +115,6 @@ with a prefix arg, the heading and body text of the subtree
under
point will instead be scanned for gnus:, mailto:, and bbdb:
links. This option controls how many paragraphs of body text to
scan. Set to 0 to only look in the heading."
- :group 'gnorb-org
:type '(choice (const :tag "Whole subtree" all)
(integer :tag "Number of paragraphs")))
@@ -144,7 +139,6 @@ message, this option will limit which headings will be
offered as
target candidates. Specifically it will be used as the second
argument to `org-map-entries', and syntax is the same as that
used in an agenda tags view."
- :group 'gnorb-org
:type 'symbol)
;;;###autoload
diff --git a/packages/gnorb/gnorb-utils.el b/packages/gnorb/gnorb-utils.el
index a4fcf34..e34646a 100644
--- a/packages/gnorb/gnorb-utils.el
+++ b/packages/gnorb/gnorb-utils.el
@@ -48,7 +48,7 @@
`gnorb-org-trigger-actions'"
"September 8, 2014" 'set)
-(defvar gnorb-tmp-dir (make-temp-file "emacs-gnorb" t)
+(defvar gnorb-tmp-dir (make-temp-file "emacs-gnorb-" t)
"Temporary directory where attachments etc are saved.")
(defvar gnorb-message-org-ids nil
@@ -573,11 +573,10 @@ group."
(defun gnorb-find-tracked-headings (headers &optional include-zombies)
"Check HEADERS for message references and return relevant heading IDs.
+HEADERS is a message's data header, as produced by
+\(gnus-interactive \"H\"), or, equivalently:
-HEADERs is a message's data header, as produced by
-\(gnus-interactive \"H\"\), or, equivalently:
-
-\(gnus-data-header \(gnus-data-find \(gnus-summary-article-number\)\)\)"
+\(gnus-data-header (gnus-data-find (gnus-summary-article-number)))"
(let ((references (mail-header-references headers))
(msg-id (mail-header-message-id headers)))
(when gnorb-tracking-enabled
@@ -586,7 +585,6 @@ HEADERs is a message's data header, as produced by
(defun gnorb-choose-trigger-heading (&optional id)
"Given an Org heading ID, ask the user if they want to trigger it.
-
If not, prompt for another target heading. Either way, return the
target heading id."
(let ((id (if (stringp id)
diff --git a/packages/gnorb/nngnorb.el b/packages/gnorb/nngnorb.el
index fe2b0d6..7d76e69 100644
--- a/packages/gnorb/nngnorb.el
+++ b/packages/gnorb/nngnorb.el
@@ -306,7 +306,6 @@ continue to provide tracking of sent messages."
(defun gnorb-summary-disassociate-message ()
"Disassociate a message from its Org TODO.
-
This is used in a Gnorb-created *Summary* buffer to remove the
connection between the message and whichever Org TODO resulted in
the message being included in this search."
@@ -342,8 +341,6 @@ the message being included in this search."
(gnorb-pretty-outline chosen)))
(message "Message has no associations"))))
-(defvar nngnorb-status-string "")
-
(defun nngnorb-retrieve-headers (_articles &optional _group _server _fetch-old)
(with-current-buffer nntp-server-buffer
(erase-buffer))
