unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
From: Jameson Graef Rollins <jrollins@finestructure.net>
To: Notmuch Mail <notmuch@notmuchmail.org>
Subject: [PATCH] emacs: fix notmuch-show-indent-messages-width customization variable name
Date: Mon,  2 Jan 2012 14:23:02 -0800	[thread overview]
Message-ID: <1325542982-1964-1-git-send-email-jrollins@finestructure.net> (raw)
In-Reply-To: <1325542611-20511-2-git-send-email-jrollins@finestructure.net>

The name was originally notmuch-indent-messages-width, which is
inconsistent with our variable naming convention.
---
Sorry, I forgot to fix the tests in the original patch.

 emacs/notmuch-show.el |    6 +++---
 test/emacs            |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index eee4da9..82d11c9 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -91,7 +91,7 @@ any given message."
   :group 'notmuch
   :type 'boolean)
 
-(defcustom notmuch-indent-messages-width 1
+(defcustom notmuch-show-indent-messages-width 1
   "Width of message indentation in threads.
 
 Messages are shown indented according to their depth in a thread.
@@ -248,7 +248,7 @@ unchanged ADDRESS if parsing fails."
   "Insert a notmuch style headerline based on HEADERS for a
 message at DEPTH in the current thread."
   (let ((start (point)))
-    (insert (notmuch-show-spaces-n (* notmuch-indent-messages-width depth))
+    (insert (notmuch-show-spaces-n (* notmuch-show-indent-messages-width depth))
 	    (notmuch-show-clean-address (plist-get headers :From))
 	    " ("
 	    date
@@ -739,7 +739,7 @@ current buffer, if possible."
     (setq content-end (point-marker))
 
     ;; Indent according to the depth in the thread.
-    (indent-rigidly content-start content-end (* notmuch-indent-messages-width depth))
+    (indent-rigidly content-start content-end (* notmuch-show-indent-messages-width depth))
 
     (setq message-end (point-max-marker))
 
diff --git a/test/emacs b/test/emacs
index ca82445..f36718e 100755
--- a/test/emacs
+++ b/test/emacs
@@ -52,21 +52,21 @@ test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-maildir-storage
 
 test_begin_subtest "Basic notmuch-show view in emacs default indentation"
 maildir_storage_thread=$(notmuch search --output=threads id:20091117190054.GU3165@dottiness.seas.harvard.edu)
-test_emacs "(let ((notmuch-indent-messages-width 1))
+test_emacs "(let ((notmuch-show-indent-messages-width 1))
 	      (notmuch-show \"$maildir_storage_thread\")
 	      (test-output))"
 test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-maildir-storage
 
 test_begin_subtest "Basic notmuch-show view in emacs without indentation"
 maildir_storage_thread=$(notmuch search --output=threads id:20091117190054.GU3165@dottiness.seas.harvard.edu)
-test_emacs "(let ((notmuch-indent-messages-width 0))
+test_emacs "(let ((notmuch-show-indent-messages-width 0))
 	      (notmuch-show \"$maildir_storage_thread\")
 	      (test-output))"
 test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-maildir-storage-without-indentation
 
 test_begin_subtest "Basic notmuch-show view in emacs with fourfold indentation"
 maildir_storage_thread=$(notmuch search --output=threads id:20091117190054.GU3165@dottiness.seas.harvard.edu)
-test_emacs "(let ((notmuch-indent-messages-width 4))
+test_emacs "(let ((notmuch-show-indent-messages-width 4))
 	      (notmuch-show \"$maildir_storage_thread\")
 	      (test-output))"
 test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-maildir-storage-with-fourfold-indentation
-- 
1.7.7.3

  parent reply	other threads:[~2012-01-02 22:23 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-25 19:55 0.11 is frozen, please update NEWS David Bremner
2011-12-30 12:24 ` David Bremner
2011-12-30 18:42   ` [PATCH] Update NEWS for change by Aaron Ecay Aaron Ecay
2011-12-31  2:54     ` David Bremner
2011-12-31  4:44       ` Aaron Ecay
2012-01-02 11:58   ` 0.11 is frozen, please update NEWS David Bremner
2012-01-02 22:16     ` update NEWS, and fix conf variable name Jameson Graef Rollins
2012-01-02 22:16       ` [PATCH 1/2] emacs: fix notmuch-show-indent-messages-width customization " Jameson Graef Rollins
2012-01-02 22:16         ` [PATCH 2/2] update NEWS Jameson Graef Rollins
2012-01-03 19:28           ` Xavier Maillard
2012-01-02 22:23         ` Jameson Graef Rollins [this message]
2012-01-05 22:07           ` [PATCH] emacs: fix notmuch-show-indent-messages-width customization variable name David Bremner
2012-01-04  9:25     ` [PATCH] Update NEWS for Emacs changes Thomas Jost
2012-01-05 22:04       ` David Bremner
2012-01-09 11:54     ` 0.11 is frozen, please update NEWS David Bremner
2012-01-12 17:03 ` Pieter Praet
2012-01-12 22:12 ` Xavier Maillard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://notmuchmail.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1325542982-1964-1-git-send-email-jrollins@finestructure.net \
    --to=jrollins@finestructure.net \
    --cc=notmuch@notmuchmail.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://yhetil.org/notmuch.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).