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

diff --git a/92/c1b8efc9459c706bb06b83df31b5979d5bca1b b/92/c1b8efc9459c706bb06b83df31b5979d5bca1b
new file mode 100644 (file)
index 0000000..39904c7
--- /dev/null
+++ b/92/c1b8efc9459c706bb06b83df31b5979d5bca1b
@@ -0,0 +1,97 @@
+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 E1A16429E34\r
+       for <notmuch@notmuchmail.org>; Mon, 30 Jan 2012 02:16:07 -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 0vCTdVz4Uj7W for <notmuch@notmuchmail.org>;\r
+       Mon, 30 Jan 2012 02:16:07 -0800 (PST)\r
+Received: from mail-we0-f181.google.com (mail-we0-f181.google.com\r
+       [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 60188431FBC\r
+       for <notmuch@notmuchmail.org>; Mon, 30 Jan 2012 02:16:07 -0800 (PST)\r
+Received: by werb10 with SMTP id b10so3639029wer.26\r
+       for <notmuch@notmuchmail.org>; Mon, 30 Jan 2012 02:16:06 -0800 (PST)\r
+Received: by 10.216.133.104 with SMTP id p82mr6775390wei.6.1327918566118;\r
+       Mon, 30 Jan 2012 02:16:06 -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 bj10sm29070795wib.9.2012.01.30.02.16.04\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Mon, 30 Jan 2012 02:16:05 -0800 (PST)\r
+Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000)\r
+       id 1415FA0CE8; Mon, 30 Jan 2012 10:16:03 +0000 (GMT)\r
+From: David Edmondson <dme@dme.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/2 v2] emacs: Stop the `truncate-string-to-width' madness.\r
+Date: Mon, 30 Jan 2012 10:16:00 +0000\r
+Message-Id: <1327918561-16245-2-git-send-email-dme@dme.org>\r
+X-Mailer: git-send-email 1.7.8.3\r
+In-Reply-To: <1327918561-16245-1-git-send-email-dme@dme.org>\r
+References: <1327496913-4946-1-git-send-email-dme@dme.org>\r
+       <1327918561-16245-1-git-send-email-dme@dme.org>\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: Mon, 30 Jan 2012 10:16:08 -0000\r
+\r
+There's no need to call `truncate-string-to-width' twice in this code\r
+path.\r
+---\r
+ emacs/notmuch.el |   22 ++++++++++------------\r
+ 1 files changed, 10 insertions(+), 12 deletions(-)\r
+\r
+diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+index 72f78ed..d4d6904 100644\r
+--- a/emacs/notmuch.el\r
++++ b/emacs/notmuch.el\r
+@@ -469,18 +469,16 @@ Complete list of currently available key bindings:\r
+   (let ((thread-id (notmuch-search-find-thread-id))\r
+       (subject (notmuch-search-find-subject)))\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
+-                    crypto-switch)\r
++      (progn\r
++        (if (string-match "^[ \t]*$" subject)\r
++            (setq subject "[No Subject]"))\r
++\r
++        (notmuch-show thread-id\r
++                      (current-buffer)\r
++                      notmuch-search-query-string\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
+ (defun notmuch-search-reply-to-thread (&optional prompt-for-sender)\r
+-- \r
+1.7.8.3\r
+\r