1 From: "Ingmar Vanhassel" <ingmar@exherbo.org>
2 To: notmuch@notmuchmail.org
3 Date: Wed, 18 Nov 2009 00:23:42 +0100
4 Subject: [notmuch] [PATCH] Typsos
5 Message-ID: <1258500222-32066-1-git-send-email-ingmar@exherbo.org>
10 gmime-filter-reply.h | 2 +-
11 lib/database.cc | 2 +-
15 lib/notmuch-private.h | 2 +-
16 lib/notmuch.h | 10 +++++-----
19 notmuch-completion.bash | 2 +-
20 notmuch-new.c | 4 ++--
21 notmuch-search.c | 2 +-
23 notmuch.el | 10 +++++-----
25 17 files changed, 30 insertions(+), 30 deletions(-)
27 diff --git a/Makefile b/Makefile
28 index 436dacf..96aaa73 100644
32 -# Default FLAGS, (can be overriden by user such as "make CFLAGS=-O2")
33 +# Default FLAGS, (can be overridden by user such as "make CFLAGS=-O2")
34 WARN_FLAGS=-Wall -Wextra -Wmissing-declarations -Wwrite-strings -Wswitch-enum
37 @@ -14,7 +14,7 @@ override CXXFLAGS += $(WARN_FLAGS) $(extra_cflags) $(extra_cxxflags)
38 override LDFLAGS += `pkg-config --libs glib-2.0 gmime-2.4 talloc` \
39 `xapian-config --libs`
41 -# Include our local Makfile.local first so that its first target is default
42 +# Include our local Makefile.local first so that its first target is default
43 include Makefile.local
44 include lib/Makefile.local
46 diff --git a/README b/README
47 index 40f05ab..27af77f 100644
50 @@ -3,7 +3,7 @@ Notmuch - thread-based email index, search and tagging.
51 Notmuch is a system for indexing, searching, reading, and tagging
52 large collections of email messages. It uses the Xapian library to
53 provide fast, full-text search of very large collection of email with
54 -a very convenient search syntas.
55 +a very convenient search syntax.
57 Notmuch is free software, released under the GNU General Public
58 License version 3 (or later).
59 @@ -45,7 +45,7 @@ obtaining a more sophisticated interface:
60 notmuch.el file in this distribution.
62 If someone were to write a curses-based interface, or similar,
63 - it might also be reasonable to buil on the "notmuch"
64 + it might also be reasonable to build on the "notmuch"
65 command-line interface.
67 2. Build on top of the notmuch library interface.
68 @@ -67,4 +67,4 @@ still in development. We would appreciate any contributions to these
73 \ No newline at end of file
75 diff --git a/gmime-filter-reply.h b/gmime-filter-reply.h
76 index 41cbc13..b7cbc6b 100644
77 --- a/gmime-filter-reply.h
78 +++ b/gmime-filter-reply.h
79 @@ -40,7 +40,7 @@ typedef struct _GMimeFilterReplyClass GMimeFilterReplyClass;
80 * @saw_nl: previous char was a \n
81 * @saw_angle: previous char was a >
83 - * A filter to insert/remove reply markers (lines begining with >)
84 + * A filter to insert/remove reply markers (lines beginning with >)
86 struct _GMimeFilterReply {
87 GMimeFilter parent_object;
88 diff --git a/lib/database.cc b/lib/database.cc
89 index 3c8d626..27597cf 100644
92 @@ -180,7 +180,7 @@ notmuch_status_to_string (notmuch_status_t status)
93 case NOTMUCH_STATUS_TAG_TOO_LONG:
94 return "Tag value is too long (exceeds NOTMUCH_TAG_MAX)";
95 case NOTMUCH_STATUS_UNBALANCED_FREEZE_THAW:
96 - return "Unblanced number of calls to notmuch_message_freeze/thaw";
97 + return "Unbalanced number of calls to notmuch_message_freeze/thaw";
99 case NOTMUCH_STATUS_LAST_STATUS:
100 return "Unknown error status value";
101 diff --git a/lib/index.cc b/lib/index.cc
102 index 65b83b3..80df64b 100644
105 @@ -198,7 +198,7 @@ _index_mime_part (notmuch_message_t *message,
109 - fprintf (stderr, "Warning: Unexpected extra parts of mutlipart/signed. Indexing anyway.\n");
110 + fprintf (stderr, "Warning: Unexpected extra parts of multipart/signed. Indexing anyway.\n");
112 _index_mime_part (message,
113 g_mime_multipart_get_part (multipart, i));
114 diff --git a/lib/message.cc b/lib/message.cc
115 index a4b090b..1d6623f 100644
118 @@ -144,7 +144,7 @@ _notmuch_message_create (const void *talloc_owner,
121 /* Create a new notmuch_message_t object for a specific message ID,
122 - * (which may or may not already exist in the databas).
123 + * (which may or may not already exist in the database).
125 * Here, 'talloc owner' is an optional talloc context to which the new
126 * message will belong. This allows for the caller to not bother
127 diff --git a/lib/messages.c b/lib/messages.c
128 index a588f8f..2f7c283 100644
131 @@ -47,7 +47,7 @@ _notmuch_message_list_create (const void *ctx)
135 -/* Append 'node' (which can of course point to an aribtrarily long
136 +/* Append 'node' (which can of course point to an arbitrarily long
137 * list of nodes) to the end of 'list'.
140 diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h
141 index 6036ce4..af82e58 100644
142 --- a/lib/notmuch-private.h
143 +++ b/lib/notmuch-private.h
144 @@ -235,7 +235,7 @@ notmuch_message_file_open (const char *filename);
145 notmuch_message_file_t *
146 _notmuch_message_file_open_ctx (void *ctx, const char *filename);
148 -/* Close a notmuch message preivously opened with notmuch_message_open. */
149 +/* Close a notmuch message previously opened with notmuch_message_open. */
151 notmuch_message_file_close (notmuch_message_file_t *message);
153 diff --git a/lib/notmuch.h b/lib/notmuch.h
154 index 32b5332..384c177 100644
157 @@ -222,7 +222,7 @@ notmuch_database_get_timestamp (notmuch_database_t *database,
159 /* Add a new message to the given notmuch database.
161 - * Here,'filename' should be a path relative to the the path of
162 + * Here,'filename' should be a path relative to the path of
163 * 'database' (see notmuch_database_get_path), or else should be an
164 * absolute filename with initial components that match the path of
166 @@ -258,7 +258,7 @@ notmuch_database_add_message (notmuch_database_t *database,
167 const char *filename,
168 notmuch_message_t **message);
170 -/* Find a message with the given messsage_id.
171 +/* Find a message with the given message_id.
173 * If the database contains a message with the given message_id, then
174 * a new notmuch_message_t object is returned. The caller should call
175 @@ -620,7 +620,7 @@ notmuch_messages_advance (notmuch_messages_t *messages);
176 /* Destroy a notmuch_messages_t object.
178 * It's not strictly necessary to call this function. All memory from
179 - * the notmuch_messages_t object will be reclaimed when the containg
180 + * the notmuch_messages_t object will be reclaimed when the containing
181 * query object is destroyed.
184 @@ -865,7 +865,7 @@ notmuch_tags_has_more (notmuch_tags_t *tags);
185 /* Get the current tag from 'tags' as a string.
187 * Note: The returned string belongs to 'tags' and has a lifetime
188 - * identical to it (and the query to which it utlimately belongs).
189 + * identical to it (and the query to which it ultimately belongs).
191 * See the documentation of notmuch_message_get_tags for example code
192 * showing how to iterate over a notmuch_tags_t object.
193 @@ -884,7 +884,7 @@ notmuch_tags_advance (notmuch_tags_t *tags);
194 /* Destroy a notmuch_tags_t object.
196 * It's not strictly necessary to call this function. All memory from
197 - * the notmuch_tags_t object will be reclaimed when the containg
198 + * the notmuch_tags_t object will be reclaimed when the containing
199 * message or query objects are destroyed.
202 diff --git a/lib/sha1.c b/lib/sha1.c
203 index ff4dd16..cc48108 100644
206 @@ -43,7 +43,7 @@ _hex_of_sha1_digest (const unsigned char digest[SHA1_DIGEST_SIZE])
210 -/* Create a hexadcimal string version of the SHA-1 digest of 'str'
211 +/* Create a hexadecimal string version of the SHA-1 digest of 'str'
212 * (including its null terminating character).
214 * This function returns a newly allocated string which the caller
215 diff --git a/lib/thread.cc b/lib/thread.cc
216 index 4411d64..da58edc 100644
219 @@ -190,7 +190,7 @@ _resolve_thread_relationships (unused (notmuch_thread_t *thread))
220 * subject line, the total count of messages, and all authors). The
221 * second search is for all messages that are in the thread and that
222 * also match the given query_string. This is to allow for a separate
223 - * count of matched messages, and to allow a viewer to diplay these
224 + * count of matched messages, and to allow a viewer to display these
225 * messages differently.
227 * Here, 'ctx' is talloc context for the resulting thread object.
228 diff --git a/notmuch-completion.bash b/notmuch-completion.bash
229 index ad55f6d..cdad05d 100644
230 --- a/notmuch-completion.bash
231 +++ b/notmuch-completion.bash
233 -# Bash completion for notmutch
234 +# Bash completion for notmuch
236 # Copyright ?? 2009 Carl Worth
238 diff --git a/notmuch-new.c b/notmuch-new.c
239 index 83a05ba..5405a9f 100644
242 @@ -303,7 +303,7 @@ add_files (notmuch_database_t *notmuch,
244 /* XXX: This should be merged with the add_files function since it
245 * shares a lot of logic with it. */
246 -/* Recursively count all regular files in path and all sub-direcotries
247 +/* Recursively count all regular files in path and all sub-directories
248 * of path. The result is added to *count (which should be
249 * initialized to zero by the top-level caller before calling
251 @@ -469,7 +469,7 @@ notmuch_new_command (void *ctx,
253 if (elapsed > 1 && ! add_files_state.saw_read_only_directory) {
254 printf ("\nTip: If you have any sub-directories that are archives (that is,\n"
255 - "they will never receive new mail), marking these directores as\n"
256 + "they will never receive new mail), marking these directories as\n"
257 "read-only (chmod u-w /path/to/dir) will make \"notmuch new\"\n"
258 "much more efficient (it won't even look in those directories).\n");
260 diff --git a/notmuch-search.c b/notmuch-search.c
261 index 8db09c7..ac81372 100644
262 --- a/notmuch-search.c
263 +++ b/notmuch-search.c
264 @@ -76,7 +76,7 @@ notmuch_search_command (void *ctx, int argc, char *argv[])
266 query_str = query_string_from_args (ctx, argc, argv);
267 if (query_str == NULL) {
268 - fprintf (stderr, "Out of moemory.\n");
269 + fprintf (stderr, "Out of memory.\n");
273 diff --git a/notmuch.1 b/notmuch.1
274 index 6c3d10f..86d5f59 100644
277 @@ -60,7 +60,7 @@ archives, and will then proceed to build a database that indexes the
278 mail to allow for fast search of the archive.
280 This directory can contain any number of sub-directories and should
281 -primarily contain only files with indvidual email messages
282 +primarily contain only files with individual email messages
283 (eg. maildir or mh archives are perfect). If there are other,
284 non-email files (such as indexes maintained by other email programs)
285 then notmuch will do its best to detect those and ignore them.
286 @@ -173,7 +173,7 @@ Constructs a reply template for a set of messages.
288 See the documentation of
290 -for deatils of the supported syntax of search terms.
291 +for details of the supported syntax of search terms.
293 To make replying to email easier,
295 diff --git a/notmuch.el b/notmuch.el
296 index 8894a8e..7e01ed6 100644
299 @@ -205,7 +205,7 @@ Unlike builtin `next-line' this version accepts no arguments."
300 (defun notmuch-show-mark-read-then-archive-thread ()
301 "Remove \"unread\" tag from each message, then archive and show next thread.
303 -Archive each message currrently shown by removing the \"unread\"
304 +Archive each message currently shown by removing the \"unread\"
305 and \"inbox\" tag from each. Then kill this buffer and show the
306 next thread from the search from which this thread was originally
308 @@ -220,7 +220,7 @@ buffer."
309 (defun notmuch-show-archive-thread ()
310 "Archive each message in thread, and show next thread from search.
312 -Archive each message currrently shown by removing the \"inbox\"
313 +Archive each message currently shown by removing the \"inbox\"
314 tag from each. Then kill this buffer and show the next thread
315 from the search from which this thread was originally shown.
317 @@ -340,7 +340,7 @@ there are no more unread messages past the current point."
318 (notmuch-show-next-message)))
320 (defun notmuch-show-next-open-message ()
321 - "Advance to the the next message which is not hidden.
322 + "Advance to the next message which is not hidden.
324 If read messages are currently hidden, advance to the next unread
325 message. Otherwise, advance to the next message."
326 @@ -674,7 +674,7 @@ thread from that buffer can be show when done with this one)."
329 (defvar notmuch-search-authors-width 40
330 - "Number of columns to use to diplay authors in a notmuch-search buffer.")
331 + "Number of columns to use to display authors in a notmuch-search buffer.")
333 (defvar notmuch-search-mode-map
334 (let ((map (make-sparse-keymap)))
335 @@ -910,7 +910,7 @@ the beginning of the buffer).
337 This command toggles the sort order for the current search.
339 -Note that any fitlered searches created by
340 +Note that any filtered searches created by
341 `notmuch-search-filter' retain the search order of the parent
344 diff --git a/show-message.c b/show-message.c
345 index 79b02e2..38f5897 100644
348 @@ -38,7 +38,7 @@ show_message_part (GMimeObject *part, int *part_count,
352 - fprintf (stderr, "Warning: Unexpected extra parts of mutlipart/signed. Continuing.\n");
353 + fprintf (stderr, "Warning: Unexpected extra parts of multipart/signed. Continuing.\n");
355 show_message_part (g_mime_multipart_get_part (multipart, i),
356 part_count, show_part);