diff options
author | David Bremner <bremner@debian.org> | 2011-06-23 21:54:50 -0300 |
---|---|---|
committer | David Bremner <bremner@debian.org> | 2011-06-23 21:54:50 -0300 |
commit | 68a2c7a8b0f749cb33a8ce7cfa2aa7781d2529bb (patch) | |
tree | 321c591bd62e32d315ae6430958b416c54620c75 /emacs | |
parent | d6f05fde23c7d4180a69176a685022fb81a293cf (diff) | |
parent | 8bf0c1c3deb49d54e86c04826a05f0217a81cf47 (diff) |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'emacs')
-rw-r--r-- | emacs/Makefile | 2 | ||||
-rw-r--r-- | emacs/notmuch-hello.el | 2 | ||||
-rw-r--r-- | emacs/notmuch-lib.el | 2 | ||||
-rw-r--r-- | emacs/notmuch-maildir-fcc.el | 4 | ||||
-rw-r--r-- | emacs/notmuch-show.el | 6 | ||||
-rw-r--r-- | emacs/notmuch-wash.el | 2 | ||||
-rw-r--r-- | emacs/notmuch.el | 6 |
7 files changed, 12 insertions, 12 deletions
diff --git a/emacs/Makefile b/emacs/Makefile index b6859ea..de492a7 100644 --- a/emacs/Makefile +++ b/emacs/Makefile @@ -1,4 +1,4 @@ -# See Makfefile.local for the list of files to be compiled in this +# See Makefile.local for the list of files to be compiled in this # directory. all: $(MAKE) -C .. all diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el index 916cda1..65fde75 100644 --- a/emacs/notmuch-hello.el +++ b/emacs/notmuch-hello.el @@ -428,7 +428,7 @@ Complete list of currently available key bindings: (let ((found-target-pos nil) (final-target-pos nil)) (let* ((saved-alist - ;; Filter out empty saved seaches if required. + ;; Filter out empty saved searches if required. (if notmuch-show-empty-saved-searches notmuch-saved-searches (loop for elem in notmuch-saved-searches diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el index a21dc14..f93c957 100644 --- a/emacs/notmuch-lib.el +++ b/emacs/notmuch-lib.el @@ -88,7 +88,7 @@ the user hasn't set this variable with the old or new value." (notmuch-config-get "user.primary_email")) (defun notmuch-user-other-email () - "Return the user.primary_email value (as a list) from the notmuch configuration." + "Return the user.other_email value (as a list) from the notmuch configuration." (split-string (notmuch-config-get "user.other_email") "\n")) (defun notmuch-kill-this-buffer () diff --git a/emacs/notmuch-maildir-fcc.el b/emacs/notmuch-maildir-fcc.el index aede753..e678868 100644 --- a/emacs/notmuch-maildir-fcc.el +++ b/emacs/notmuch-maildir-fcc.el @@ -88,7 +88,7 @@ will NOT be removed or replaced." notmuch-fcc-dirs) ((and (listp notmuch-fcc-dirs) - (= 1 (length (car notmuch-fcc-dirs)))) + (stringp (car notmuch-fcc-dirs))) ;; Old style - no longer works. (error "Invalid `notmuch-fcc-dirs' setting (old style)")) @@ -163,7 +163,7 @@ will NOT be removed or replaced." (make-directory (concat path "/new/") t) (make-directory (concat path "/tmp/") t)) ((file-regular-p path) - (error "%s is a file. Can't creat maildir." path)) + (error "%s is a file. Can't create maildir." path)) (t (error "I don't know how to create a maildir here")))) diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el index af1d44b..6685717 100644 --- a/emacs/notmuch-show.el +++ b/emacs/notmuch-show.el @@ -121,7 +121,7 @@ same as that of the previous message." "Use external viewers to view all attachments from the current message." (interactive) (with-current-notmuch-show-message - ; We ovverride the mm-inline-media-tests to indicate which message + ; We override the mm-inline-media-tests to indicate which message ; parts are already sufficiently handled by the original ; presentation of the message in notmuch-show mode. These parts ; will be inserted directly into the temporary buffer of @@ -803,7 +803,7 @@ The optional QUERY-CONTEXT is a notmuch search term. Only messages from the thread matching this search term are shown if non-nil. -The optional BUFFER-NAME provides the neame of the buffer in +The optional BUFFER-NAME provides the name of the buffer in which the message thread is shown. If it is nil (which occurs when the command is called interactively) the argument to the function is used. " @@ -921,7 +921,7 @@ more selectively, (such as '\\[notmuch-show-next-message]' and '\\[notmuch-show- without removing any tags, and '\\[notmuch-show-archive-thread]' to archive an entire thread without scrolling through with \\[notmuch-show-advance-and-archive]). -You can add or remove arbitary tags from the current message with +You can add or remove arbitrary tags from the current message with '\\[notmuch-show-add-tag]' or '\\[notmuch-show-remove-tag]'. All currently available key bindings: diff --git a/emacs/notmuch-wash.el b/emacs/notmuch-wash.el index 92f07c5..1f420b2 100644 --- a/emacs/notmuch-wash.el +++ b/emacs/notmuch-wash.el @@ -137,7 +137,7 @@ collapse the remaining lines into a button.") (format label-format lines-count))) (defun notmuch-wash-region-to-button (msg beg end type prefix) - "Auxilary function to do the actual making of overlays and buttons + "Auxiliary function to do the actual making of overlays and buttons BEG and END are buffer locations. TYPE should a string, either \"citation\" or \"signature\". PREFIX is some arbitrary text to diff --git a/emacs/notmuch.el b/emacs/notmuch.el index 3311fe8..f11ec24 100644 --- a/emacs/notmuch.el +++ b/emacs/notmuch.el @@ -64,7 +64,7 @@ ("authors" . "%-20s ") ("subject" . "%s ") ("tags" . "(%s)")) - "Search result formating. Supported fields are: + "Search result formatting. Supported fields are: date, count, authors, subject, tags For example: (setq notmuch-search-result-format \(\(\"authors\" . \"%-40s\"\) @@ -493,7 +493,7 @@ the messages that are about to be tagged" :group 'notmuch) (defcustom notmuch-after-tag-hook nil - "Hooks that are run before tags of a message are modified. + "Hooks that are run after tags of a message are modified. 'tags' will contain the tags that were added or removed as a list of strings of the form \"+TAG\" or \"-TAG\". @@ -836,7 +836,7 @@ non-authors is found, assume that all of the authors match." (defun notmuch-search-operate-all (action) "Add/remove tags from all matching messages. -Tis command adds or removes tags from all messages matching the +This command adds or removes tags from all messages matching the current search terms. When called interactively, this command will prompt for tags to be added or removed. Tags prefixed with '+' will be added and tags prefixed with '-' will be removed. |