sup 1.0 → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 304755e3fd6b2e9aa86139810adb852249b93d7491471f17b2bd57e84b25489b
-  data.tar.gz: 0c13ac3dd70310cae00eb59bcc2a90d13f8748e07fd3b38e74e9a7893cd18c1f
+  metadata.gz: 93d027a0f383edb73d1a2900ca991d8d8d8daca922f0088c18f5281ca04daeb4
+  data.tar.gz: 31b25e512227252a498baa651ea9b026ba452274dd5c67c99412dc2ef54f3e7a
 SHA512:
-  metadata.gz: 62e6e7e76826426f53870b6fe8d8959777752360b6ff9aca1e5644e33e2e31b399b251007a4dc5a439f68419610a2a99b32a005117615d1d293c16283379150d
-  data.tar.gz: 3cb2caa77a89ba1595365a93975e3caa006065a73787e075a2672e23670ecb3384c0f5c3a0e7bdb141fa31a3668e2870991097ece67de9d2d6b9a3fe1cbb2324
+  metadata.gz: 06211d3a91b76d20396afe9323bdf62d14acf61d13688333ae8f6409b55ff2120037df11e0a5e62e869e476868307a42216ee34e28f3621a05da0f9953a6cda3
+  data.tar.gz: f17bac030201cdabd4c6e3313a4178fb03f65f70992dcd4364cde425d1fd658408973b1758c7d45b13140dddde0e92f34006d6085140bbbb76164081083e9006

data/.github/workflows/checks.yml

@@ -0,0 +1,70 @@
+name: checks
+on:
+  push:
+    branches:
+    - develop
+  pull_request:
+    branches:
+    - develop
+permissions:
+  contents: read
+jobs:
+  rake-ci:
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+        - ubuntu-latest
+        - macos-latest
+        ruby-version:
+        - '2.0'
+        - '2.1'
+        # Ruby 2.2 fails installing sup gem with a nonsensical error:
+        #   Could not find 'xapian-ruby' (~> 1.2) among 21 total gem(s)
+        #- '2.2'
+        - '2.3'
+        - '2.4'
+        - '2.5'
+        - '2.6'
+        - '2.7'
+        - '3.0'
+        - '3.1'
+        exclude:
+        # xapian-bindings 1.2.2 fails to build on MacOS:
+        #   clang: warning: include path for libstdc++ headers not found; pass
+        #   '-stdlib=libc++' on the command line to use the libc++ standard
+        #   library instead [-Wstdlibcxx-not-found]
+        #   xapian_wrap.cc:1836:10: fatal error: 'string' file not found
+        # Probably just wrong compiler command or some mess that I can't be
+        # bothered to figure out.
+        - os: macos-latest
+          ruby-version: '2.0'
+        # xapian-bindings 1.4.18 fails to build with Ruby 3.0+ on MacOS:
+        #   error: '__declspec' attributes are not enabled; use '-fdeclspec' or
+        #   '-fms-extensions' to enable support for __declspec attributes
+        # Needs this fix:
+        # https://github.com/xapian/xapian/commit/63a06768a250b0bb4821b835f011e8214d560f8e
+        - os: macos-latest
+          ruby-version: '3.0'
+        - os: macos-latest
+          ruby-version: '3.1'
+    runs-on: ${{ matrix.os }}
+    steps:
+    - name: Install pandoc
+      run: sudo apt-get install -y pandoc
+      if: runner.os == 'Linux'
+    - name: Install pandoc
+      run: brew install pandoc
+      if: runner.os == 'macOS'
+    - uses: actions/checkout@v3
+      with:
+        submodules: recursive
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+    - name: Run Rake ci task
+      run: bundle exec rake ci
+    - name: Test gem installation
+      run: gem install pkg/sup-*.gem

data/.rubocop.yml

@@ -0,0 +1,5 @@
+require:
+  - rubocop-packaging
+
+AllCops:
+  DisabledByDefault: true

data/CONTRIBUTORS

@@ -2,22 +2,22 @@ William Morgan <william at the twitter dot coms>
 Rich Lane <rlane at the club.cc.cmu dot edus>
 Gaute Hope <eg at the gaute.vetsj dot coms>
 Whyme Lyu <callme5long at the gmail dot coms>
+Dan Callaghan <djc at the djc.id dot aus>
 Hamish Downer <dmishd at the gmail dot coms>
 Zeger-Jan van de Weg <mail at the zjvandeweg dot nls>
 Damien Leone <damien.leone at the fensalir dot frs>
 Sascha Silbe <sascha-pgp at the silbe dot orgs>
+Iain Parris <ipv2.vcs at the parris dot orgs>
 Eric Weikl <eric.weikl at the gmx dot nets>
 Paweł Wilk <siefca at the gnu dot orgs>
 Matthieu Rakotojaona <matthieu.rakotojaona at the gmail dot coms>
 Ismo Puustinen <ismo at the iki dot fis>
-Dan Callaghan <djc at the djc.id dot aus>
 Nicolas Pouillard <nicolas.pouillard at the gmail dot coms>
 Michael Stapelberg <michael at the stapelberg dot des>
 Eric Sherman <hyperbolist at the gmail dot coms>
 Tero Tilus <tero at the tilus dot nets>
 Ben Walton <bwalton at the artsci.utoronto dot cas>
 Scott Bonds <scott at the ggr dot coms>
-Iain Parris <ipv2.vcs at the parris dot orgs>
 Mike Stipicevic <stipim at the rpi dot edus>
 Martin Bähr <mbaehr at the societyserver dot orgs>
 Timon Vonk <timonv at the gmail dot coms>
@@ -87,6 +87,7 @@ Todd Eisenberger <teisenbe at the andrew.cmu dot edus>
 Johannes Larsen <mail at the johslarsen dot nets>
 Steven Schmeiser <steven at the schmeiser dot orgs>
 Steven Walter <swalter at the monarch.(none)>
+Utkarsh Gupta <utkarsh at the debian dot orgs>
 Michael Dwyer <mdwyer at the michaelmdwyer dot coms>
 Kyle Hunt <Kyle_Hunt at the ymail dot coms>
 William A. Kennington III <william at the wkennington dot coms>

data/Gemfile

@@ -2,7 +2,11 @@ source 'https://rubygems.org/'
 
 if !RbConfig::CONFIG['arch'].include?('openbsd')
   # update version in ext/mkrf_conf_xapian.rb as well.
-  gem 'xapian-ruby', '~> 1.2'
+  if /^2\.0\./ =~ RUBY_VERSION
+    gem 'xapian-ruby', ['~> 1.2', '< 1.3.6']
+  else
+    gem 'xapian-ruby', '~> 1.2'
+  end
 end
 
 gemspec

data/History.txt

@@ -1,3 +1,23 @@
+== 1.1 / 2022-05-23
+
+* #588, #577: Sup is now compatible with and tested on Ruby 3.0 and Ruby 3.1.
+* When the Sup gem installs xapian-ruby, it will install to the user gem
+  directory if the system gem directory is not writable. (Iain Parris)
+* #571: To and From addresses of enclosed messages are now displayed normally,
+  instead of as Redwood::Person objects. (Iain Parris)
+* #570: Fixed wording when displaying enclosed messages without Date header.
+  (Iain Parris)
+* #205, #602: UTF-8 header values are now accepted and handled correctly, as
+  per RFC6532.
+* #585: Text/plain attachments with invalid charset are now displayed as
+  US-ASCII (with high bytes replaced) instead of crashing.
+* #424: Spaces are now accepted in RFC2047-encoded header words, even though
+  the RFC forbids them. (Dan Callaghan)
+* Invalid RFC2047-encoded header words are now displayed in their raw form,
+  rather than trying to forcibly transcode them to UTF-8, as per the RFC's
+  recommendation. (Dan Callaghan)
+* Sup now decodes UTF-7 correctly instead of crashing.
+
 == 1.0 / 2020-07-12
 
 No changes. The version number is incremented to 1.0 to reflect the fact that

data/Manifest.txt

@@ -0,0 +1,149 @@
+.github/workflows/checks.yml
+.gitignore
+.gitmodules
+.rubocop.yml
+CONTRIBUTORS
+Gemfile
+HACKING
+History.txt
+LICENSE
+Manifest.txt
+README.md
+Rakefile
+ReleaseNotes
+bin/sup
+bin/sup-add
+bin/sup-config
+bin/sup-dump
+bin/sup-import-dump
+bin/sup-recover-sources
+bin/sup-sync
+bin/sup-sync-back-maildir
+bin/sup-tweak-labels
+contrib/colorpicker.rb
+contrib/completion/_sup.bash
+contrib/completion/_sup.zsh
+devel/console.sh
+devel/count-loc.sh
+devel/load-index.rb
+devel/profile.rb
+devel/start-console.rb
+doc/FAQ.txt
+doc/Hooks.txt
+doc/Philosophy.txt
+doc/wiki
+ext/mkrf_conf_xapian.rb
+lib/sup.rb
+lib/sup/account.rb
+lib/sup/buffer.rb
+lib/sup/colormap.rb
+lib/sup/contact.rb
+lib/sup/crypto.rb
+lib/sup/draft.rb
+lib/sup/hook.rb
+lib/sup/horizontal_selector.rb
+lib/sup/idle.rb
+lib/sup/index.rb
+lib/sup/interactive_lock.rb
+lib/sup/keymap.rb
+lib/sup/label.rb
+lib/sup/logger.rb
+lib/sup/logger/singleton.rb
+lib/sup/maildir.rb
+lib/sup/mbox.rb
+lib/sup/message.rb
+lib/sup/message_chunks.rb
+lib/sup/mode.rb
+lib/sup/modes/buffer_list_mode.rb
+lib/sup/modes/completion_mode.rb
+lib/sup/modes/compose_mode.rb
+lib/sup/modes/console_mode.rb
+lib/sup/modes/contact_list_mode.rb
+lib/sup/modes/edit_message_async_mode.rb
+lib/sup/modes/edit_message_mode.rb
+lib/sup/modes/file_browser_mode.rb
+lib/sup/modes/forward_mode.rb
+lib/sup/modes/help_mode.rb
+lib/sup/modes/inbox_mode.rb
+lib/sup/modes/label_list_mode.rb
+lib/sup/modes/label_search_results_mode.rb
+lib/sup/modes/line_cursor_mode.rb
+lib/sup/modes/log_mode.rb
+lib/sup/modes/person_search_results_mode.rb
+lib/sup/modes/poll_mode.rb
+lib/sup/modes/reply_mode.rb
+lib/sup/modes/resume_mode.rb
+lib/sup/modes/scroll_mode.rb
+lib/sup/modes/search_list_mode.rb
+lib/sup/modes/search_results_mode.rb
+lib/sup/modes/text_mode.rb
+lib/sup/modes/thread_index_mode.rb
+lib/sup/modes/thread_view_mode.rb
+lib/sup/person.rb
+lib/sup/poll.rb
+lib/sup/rfc2047.rb
+lib/sup/search.rb
+lib/sup/sent.rb
+lib/sup/service/label_service.rb
+lib/sup/source.rb
+lib/sup/tagger.rb
+lib/sup/textfield.rb
+lib/sup/thread.rb
+lib/sup/time.rb
+lib/sup/undo.rb
+lib/sup/update.rb
+lib/sup/util.rb
+lib/sup/util/axe.rb
+lib/sup/util/locale_fiddler.rb
+lib/sup/util/ncurses.rb
+lib/sup/util/path.rb
+lib/sup/util/query.rb
+lib/sup/util/uri.rb
+lib/sup/version.rb
+sup.gemspec
+test/dummy_source.rb
+test/fixtures/bad-content-transfer-encoding-1.eml
+test/fixtures/binary-content-transfer-encoding-2.eml
+test/fixtures/blank-header-fields.eml
+test/fixtures/contacts.txt
+test/fixtures/embedded-message.eml
+test/fixtures/mailing-list-header.eml
+test/fixtures/malicious-attachment-names.eml
+test/fixtures/missing-from-to.eml
+test/fixtures/missing-line.eml
+test/fixtures/multi-part-2.eml
+test/fixtures/multi-part.eml
+test/fixtures/no-body.eml
+test/fixtures/non-ascii-header-in-nested-message.eml
+test/fixtures/non-ascii-header.eml
+test/fixtures/rfc2047-header-encoding.eml
+test/fixtures/simple-message.eml
+test/fixtures/text-attachments-with-charset.eml
+test/fixtures/utf8-header.eml
+test/fixtures/zimbra-quote-with-bottom-post.eml
+test/gnupg_test_home/.gpg-v21-migrated
+test/gnupg_test_home/gpg.conf
+test/gnupg_test_home/private-keys-v1.d/306D2EE90FF0014B5B9FD07E265C751791674140.key
+test/gnupg_test_home/pubring.gpg
+test/gnupg_test_home/receiver_pubring.gpg
+test/gnupg_test_home/receiver_secring.gpg
+test/gnupg_test_home/regen_keys.sh
+test/gnupg_test_home/secring.gpg
+test/gnupg_test_home/sup-test-2@foo.bar.asc
+test/integration/test_maildir.rb
+test/integration/test_mbox.rb
+test/integration/test_sup-add.rb
+test/test_crypto.rb
+test/test_header_parsing.rb
+test/test_helper.rb
+test/test_message.rb
+test/test_messages_dir.rb
+test/test_yaml_regressions.rb
+test/unit/service/test_label_service.rb
+test/unit/test_contact.rb
+test/unit/test_horizontal_selector.rb
+test/unit/test_locale_fiddler.rb
+test/unit/test_person.rb
+test/unit/util/test_query.rb
+test/unit/util/test_string.rb
+test/unit/util/test_uri.rb

data/README.md

@@ -57,9 +57,15 @@ some alternatives to consider:
 * [Notmuch](https://notmuchmail.org/) was inspired by Sup. There are a wide
   variety of [Notmuch clients](https://notmuchmail.org/frontends/) available.
   The most similar to Sup's look-and-feel is
-  [Alot](https://github.com/pazz/alot) — also a curses-based frontend.
-  Alot even ships with a built-in
-  [Sup theme](https://github.com/pazz/alot/blob/master/extra/themes/sup)!
+  [Alot](https://github.com/pazz/alot) — also a curses-based front end.
+  Alot even ships with a
+  [built-in](https://github.com/pazz/alot/blob/master/extra/themes/sup)
+  [Sup theme](https://github.com/pazz/alot/wiki/Gallery#user-content-theme-sup)!
+
+* [mu](https://www.djcbsoftware.nl/code/mu/) /
+  [mu4e](https://www.djcbsoftware.nl/code/mu/mu4e.html). Like Sup, a search-based
+  email back end, and also implemented using Xapian. The emacs-based front end
+  [is quite different](https://www.djcbsoftware.nl/code/mu/mu4e/Other-mail-clients.html).
 
 ## License
 

data/Rakefile

@@ -1,6 +1,10 @@
 require 'rake/testtask'
 require "bundler/gem_tasks"
 
+# Manifest.txt file in same folder as this Rakefile
+manifest_filename = "#{File.dirname(__FILE__)}/Manifest.txt"
+git_ls_files_command = "git ls-files | LC_ALL=C sort"
+
 Rake::TestTask.new(:test) do |test|
   test.libs << 'test'
   test.test_files = FileList.new('test/**/test_*.rb')
@@ -9,7 +13,7 @@ end
 task :default => :test
 
 task :build => [:man]
-task :travis => [:test, :build]
+task :ci => [:test, :rubocop_packaging, :check_manifest, :build]
 
 def test_pandoc
   return system("pandoc -v > /dev/null 2>&1")
@@ -50,3 +54,38 @@ task :clean do
     FileUtils.rm_r d if Dir.exist? d
   end
 end
+
+task :manifest do
+  manifest = `#{git_ls_files_command}`
+  if $?.success? then
+    puts "Writing `git ls-files` output to #{manifest_filename}"
+    File.write(manifest_filename, manifest, mode: 'w')
+  else
+    abort "Failed to generate Manifest.txt (with `git ls-files`)"
+  end
+end
+
+task :check_manifest do
+  manifest = `#{git_ls_files_command}`
+  manifest_file_contents = File.read(manifest_filename)
+  if manifest == manifest_file_contents
+    puts "Manifest.txt OK"
+  else
+    puts "Manifest from `git ls-files`:\n#{manifest}"
+    STDERR.puts "Manifest.txt outdated. Please commit an updated Manifest.txt"
+    STDERR.puts "To generate Manifest.txt, run: rake manifest"
+    abort "Manifest.txt does not match `git ls-files`"
+  end
+end
+
+task :rubocop_packaging do
+  if /^2\.[012]\./ =~ RUBY_VERSION
+    puts "skipping rubocop-packaging checks on unsupported Ruby #{RUBY_VERSION}"
+    next
+  end
+  if system("rubocop --only Packaging")
+    puts "rubocop-packaging checks OK"
+  else
+    abort "rubocop-packaging checks failed"
+  end
+end

data/bin/sup-add

@@ -94,18 +94,14 @@ begin
       next
     end
 
-    parsed_uri = URI(URI.escape(uri))
-
     source =
-      case parsed_uri.scheme
-      when "maildir"
+      case uri
+      when /^maildir:/
         Redwood::Maildir.new uri, !$opts[:unusual], $opts[:archive], $opts[:sync_back], nil, labels
-      when "mbox"
+      when /^mbox:/
         Redwood::MBox.new uri, !$opts[:unusual], $opts[:archive], nil, labels
       when nil
-        Optimist::die "Sources must be specified with an URI"
-      else
-        Optimist::die "Unknown source type #{parsed_uri.scheme.inspect}"
+        Optimist::die "Sources must be specified with a maildir:// or mbox:// URI"
       end
     @cli.say "Adding #{source}..."
     Redwood::SourceManager.add_source source

data/ext/mkrf_conf_xapian.rb

@@ -10,13 +10,19 @@ end
 
 puts "xapian: platform specific dependencies.."
 
-inst = Gem::DependencyInstaller.new
+destination = File.writable?(Gem.dir) ? Gem.dir : Gem.user_dir
+inst = Gem::DependencyInstaller.new(:install_dir => destination)
 begin
 
   if !RbConfig::CONFIG['arch'].include?('openbsd')
     # update version in Gemfile as well
     name    = "xapian-ruby"
-    version = "~> 1.2"
+    version =
+      if /^2\.0\./ =~ RUBY_VERSION
+        ["~> 1.2", "< 1.3.6"]
+      else
+        "~> 1.2"
+      end
 
     begin
       # try to load gem
@@ -34,8 +40,8 @@ begin
     STDERR.puts "xapian: openbsd: you have to install xapian-core and xapian-bindings manually, have a look at: https://github.com/sup-heliotrope/sup/wiki/Installation%3A-OpenBSD"
   end
 
-rescue
-
+rescue StandardError => e
+  STDERR.puts "Unable to install #{name} gem: #{e.inspect}"
   exit(1)
 
 end

data/lib/sup/colormap.rb

@@ -236,7 +236,7 @@ class Colormap
     @@instance.send meth, *a
   end
   # Performance shortcut
-  def self.color_for *a; @@instance.color_for *a; end
+  def self.color_for(*a); @@instance.color_for(*a); end
 end
 
 end

data/lib/sup/hook.rb

@@ -138,7 +138,7 @@ private
         returning IO.read(fn_for(name)) do
           debug "read '#{name}' from #{fn_for(name)}"
         end
-      rescue SystemCallError => e
+      rescue SystemCallError
         #debug "disabled hook for '#{name}': #{e.message}"
         nil
       end

data/lib/sup/index.rb

@@ -425,7 +425,7 @@ EOS
 
     ## gmail style "is" operator
     subs = subs.gsub(/\b(is|has):(\S+)\b/) do
-      field, label = $1, $2
+      _field, label = $1, $2
       case label
       when "read"
         "-label:unread"
@@ -649,7 +649,7 @@ EOS
   end
 
   def synchronize &b
-    @index_mutex.synchronize &b
+    @index_mutex.synchronize(&b)
   end
 
   def run_query xapian_query, offset, limit, checkatleast=0

data/lib/sup/keymap.rb

@@ -98,7 +98,7 @@ EOS
   end
 
   def action_for kc
-    action, help, keys = @map[kc.code]
+    action, help, _keys = @map[kc.code]
     [action, help]
   end
 

data/lib/sup/maildir.rb

@@ -12,13 +12,13 @@ class Maildir < Source
   def initialize uri, usual=true, archived=false, sync_back=true, id=nil, labels=[]
     super uri, usual, archived, id
     @expanded_uri = Source.expand_filesystem_uri(uri)
-    parts = @expanded_uri.match /^([a-zA-Z0-9]*:(\/\/)?)(.*)/
+    parts = /^([a-zA-Z0-9]*:(\/\/)?)(.*)/.match @expanded_uri
     if parts
       prefix = parts[1]
       @path = parts[3]
-      uri = URI(prefix + URI.encode(@path, URI_ENCODE_CHARS))
+      uri = URI(prefix + Source.encode_path_for_uri(@path))
     else
-      uri = URI(URI.encode @expanded_uri, URI_ENCODE_CHARS)
+      uri = URI(Source.encode_path_for_uri @path)
       @path = uri.path
     end
 
@@ -30,7 +30,7 @@ class Maildir < Source
     # sync by default if not specified
     @sync_back = true if @sync_back.nil?
 
-    @dir = URI.decode uri.path
+    @dir = URI.decode_www_form_component uri.path
     @labels = Set.new(labels || [])
     @mutex = Mutex.new
     @ctimes = { 'cur' => Time.at(0), 'new' => Time.at(0) }

data/lib/sup/mbox.rb

@@ -19,13 +19,13 @@ class MBox < Source
     case uri_or_fp
     when String
       @expanded_uri = Source.expand_filesystem_uri(uri_or_fp)
-      parts = @expanded_uri.match /^([a-zA-Z0-9]*:(\/\/)?)(.*)/
+      parts = /^([a-zA-Z0-9]*:(\/\/)?)(.*)/.match @expanded_uri
       if parts
         prefix = parts[1]
         @path = parts[3]
-        uri = URI(prefix + URI.encode(@path, URI_ENCODE_CHARS))
+        uri = URI(prefix + Source.encode_path_for_uri(@path))
       else
-        uri = URI(URI.encode @expanded_uri, URI_ENCODE_CHARS)
+        uri = URI(Source.encode_path_for_uri @expanded_uri)
         @path = uri.path
       end
 
@@ -36,7 +36,7 @@ class MBox < Source
     else
       @f = uri_or_fp
       @path = uri_or_fp.path
-      @expanded_uri = "mbox://#{URI.encode @path, URI_ENCODE_CHARS}"
+      @expanded_uri = "mbox://#{Source.encode_path_for_uri @path}"
     end
 
     super uri_or_fp, usual, archived, id

data/lib/sup/message.rb

@@ -1,6 +1,7 @@
 # encoding: UTF-8
 
 require 'time'
+require 'string-scrub' if /^2\.0\./ =~ RUBY_VERSION
 
 module Redwood
 
@@ -71,9 +72,9 @@ class Message
     return unless v
     return v unless v.is_a? String
     return unless v.size < MAX_HEADER_VALUE_SIZE # avoid regex blowup on spam
-    d = v.dup
-    d = d.transcode($encoding, 'ASCII')
-    Rfc2047.decode_to $encoding, d
+    ## Header values should be either 7-bit with RFC2047-encoded words
+    ## or UTF-8 as per RFC6532. Replace any invalid high bytes with U+FFFD.
+    Rfc2047.decode_to $encoding, v.dup.force_encoding(Encoding::UTF_8).scrub
   end
 
   def parse_header encoded_header
@@ -104,7 +105,7 @@ class Message
     when String
       begin
         Time.parse date
-      rescue ArgumentError => e
+      rescue ArgumentError
         #debug "faking mangled date header for #{@id} (orig #{header['date'].inspect} gave error: #{e.message})"
         Time.now
       end
@@ -309,7 +310,7 @@ EOS
   end
 
   def each_raw_message_line &b
-    location.each_raw_message_line &b
+    location.each_raw_message_line(&b)
   end
 
   def sync_back

data/lib/sup/message_chunks.rb

@@ -128,7 +128,16 @@ EOS
 
       text = case @content_type
       when /^text\/plain\b/
-        @raw_content.force_encoding(encoded_content.charset || 'US-ASCII')
+        if /^UTF-7$/i =~ encoded_content.charset
+          @raw_content.decode_utf7
+        else
+          begin
+            charset = Encoding.find(encoded_content.charset || 'US-ASCII')
+          rescue ArgumentError
+            charset = 'US-ASCII'
+          end
+          @raw_content.force_encoding(charset)
+        end
       else
         HookManager.run "mime-decode", :content_type => @content_type,
                         :filename => lambda { write_to_disk },
@@ -274,24 +283,19 @@ EOS
   class EnclosedMessage
     attr_reader :lines
     def initialize from, to, cc, date, subj
-      @from = from ? "unknown sender" : from.full_address
-      @to = to ? "" : to.map { |p| p.full_address }.join(", ")
-      @cc = cc ? "" : cc.map { |p| p.full_address }.join(", ")
-      if date
-        @date = date.rfc822
-      else
-        @date = ""
-      end
-
+      @from = !from ? "unknown sender" : from.full_address
+      @to = !to ? "" : to.map { |p| p.full_address }.join(", ")
+      @cc = !cc ? "" : cc.map { |p| p.full_address }.join(", ")
+      @date = !date ? "" : date.rfc822
       @subj = subj
-
-      @lines = "\nFrom: #{from}\n"
-      @lines += "To: #{to}\n"
-      if !cc.empty?
-        @lines += "Cc: #{cc}\n"
-      end
-      @lines += "Date: #{date}\n"
-      @lines += "Subject: #{subj}\n\n"
+      @lines = [
+        "From: #{@from}",
+        "To: #{@to}",
+        "Cc: #{@cc}",
+        "Date: #{@date}",
+        "Subject: #{@subj}"
+      ]
+      @lines.delete_if{ |line| line == 'Cc: ' }
     end
 
     def inlineable?; false end
@@ -302,7 +306,11 @@ EOS
     def viewable?; false end
 
     def patina_color; :generic_notice_patina_color end
-    def patina_text; "Begin enclosed message sent on #{@date}" end
+    def patina_text
+      "Begin enclosed message" + (
+        @date == "" ? "" : " sent on #{@date}"
+      )
+    end
 
     def color; :quote_color end
   end

data/lib/sup/modes/completion_mode.rb

@@ -26,7 +26,6 @@ class CompletionMode < ScrollMode
 private
 
   def update_lines
-    width = buffer.content_width
     max_length = @list.max_of { |s| s.length }
     num_per = [1, buffer.content_width / (max_length + INTERSTITIAL.length)].max
     @lines = [@header].compact