[PATCH 1/3] emacs: Stop the `truncate-string-to-width' madness.

diff --git a/d3/239b91a6dc52723d7cef66d457aab8a9ae7ff8 b/d3/239b91a6dc52723d7cef66d457aab8a9ae7ff8
new file mode 100644 (file)
index 0000000..90f5e8e
--- /dev/null
+++ b/d3/239b91a6dc52723d7cef66d457aab8a9ae7ff8
@@ -0,0 +1,96 @@
+Return-Path: <dme@dme.org>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 19DCD431E84\r
+       for <notmuch@notmuchmail.org>; Wed, 25 Jan 2012 05:48:41 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id l+6WMBJihVL5 for <notmuch@notmuchmail.org>;\r
+       Wed, 25 Jan 2012 05:48:40 -0800 (PST)\r
+Received: from mail-ww0-f45.google.com (mail-ww0-f45.google.com\r
+ [74.125.82.45])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ 79488431FD5   for <notmuch@notmuchmail.org>; Wed, 25 Jan 2012 05:48:40 -0800\r
+ (PST)\r
+Received: by wgbdt12 with SMTP id dt12so4808697wgb.2\r
+       for <notmuch@notmuchmail.org>; Wed, 25 Jan 2012 05:48:39 -0800 (PST)\r
+MIME-Version: 1.0\r
+Received: by 10.180.19.130 with SMTP id f2mr11315186wie.12.1327499319293;\r
+       Wed, 25 Jan 2012 05:48:39 -0800 (PST)\r
+Received: from hotblack-desiato.hh.sledj.net\r
+       (host81-149-164-25.in-addr.btopenworld.com. [81.149.164.25])\r
+       by mx.google.com with ESMTPS id em13sm24450670wid.7.2012.01.25.05.48.37\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Wed, 25 Jan 2012 05:48:38 -0800 (PST)\r
+Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000)\r
+       id 1C3C39FE6A; Wed, 25 Jan 2012 13:48:36 +0000 (GMT)\r
+From: David Edmondson <dme@dme.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/3] emacs: Stop the `truncate-string-to-width' madness.\r
+Date: Wed, 25 Jan 2012 13:48:32 +0000\r
+Message-Id: <1327499314-7887-2-git-send-email-dme@dme.org>\r
+X-Mailer: git-send-email 1.7.8.3\r
+In-Reply-To: <1327499314-7887-1-git-send-email-dme@dme.org>\r
+References: <1327496913-4946-1-git-send-email-dme@dme.org>\r
+       <1327499314-7887-1-git-send-email-dme@dme.org>\r
+X-Gm-Message-State:\r
+ ALoCoQnCAOEQZ0sZUam5AsijUP2GPj3tYxXou+S/Vf6sU17+p8CzwpE/AJtQCo83M5mNVO/N1NmH\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Wed, 25 Jan 2012 13:48:41 -0000\r
+\r
+There's no need to call `truncate-string-to-width' twice in this code\r
+path.\r
+---\r
+ emacs/notmuch.el |   14 ++++++--------\r
+ 1 files changed, 6 insertions(+), 8 deletions(-)\r
+\r
+diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+index 3ec0816..3f6b977 100644\r
+--- a/emacs/notmuch.el\r
++++ b/emacs/notmuch.el\r
+@@ -441,18 +441,16 @@ Complete list of currently available key bindings:\r
+   (interactive "P")\r
+   (let ((thread-id (notmuch-search-find-thread-id))\r
+       (subject (notmuch-search-find-subject)))\r
++\r
++    (if (string-match "^[ \t]*$" subject)\r
++      (setq subject "[No Subject]"))\r
++\r
+     (if (> (length thread-id) 0)\r
+       (notmuch-show thread-id\r
+                     (current-buffer)\r
+                     notmuch-search-query-string\r
+-                    ;; name the buffer based on notmuch-search-find-subject\r
+-                    (if (string-match "^[ \t]*$" subject)\r
+-                        "[No Subject]"\r
+-                      (truncate-string-to-width\r
+-                       (concat "*"\r
+-                               (truncate-string-to-width subject 32 nil nil t)\r
+-                               "*")\r
+-                       32 nil nil t))\r
++                    ;; Name the buffer based on the subject.\r
++                    (concat "*" (truncate-string-to-width subject 30 nil nil t) "*")\r
+                     crypto-switch)\r
+       (message "End of search results."))))\r
+ \r
+-- \r
+1.7.8.3\r
+\r