6f/35ff5eebc10831ddc4c8f07625ed0cb9726043

   1 Return-Path: <amdragon@mit.edu>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id 26DE9431FC9\r
   6         for <notmuch@notmuchmail.org>; Thu, 29 Aug 2013 09:26:22 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.7\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id ANV6O7spvFob for <notmuch@notmuchmail.org>;\r
  16         Thu, 29 Aug 2013 09:26:17 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-4.mit.edu (dmz-mailsec-scanner-4.mit.edu\r
  18         [18.9.25.15])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 594A2431FD2\r
  20         for <notmuch@notmuchmail.org>; Thu, 29 Aug 2013 09:26:08 -0700 (PDT)\r
  21 X-AuditID: 1209190f-b7fa58e000000953-3b-521f761e20c9\r
  22 Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
  23         by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id 9B.4E.02387.E167F125; Thu, 29 Aug 2013 12:26:06 -0400 (EDT)\r
  25 Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
  26         by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id r7TGQ3eQ018777; \r
  27         Thu, 29 Aug 2013 12:26:04 -0400\r
  28 Received: from drake.dyndns.org\r
  29         (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
  30         [216.15.114.40]) (authenticated bits=0)\r
  31         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  32         by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id r7TGQ1MZ014995\r
  33         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  34         Thu, 29 Aug 2013 12:26:02 -0400\r
  35 Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
  36         (envelope-from <amdragon@mit.edu>)\r
  37         id 1VF52n-0007Wq-1G; Thu, 29 Aug 2013 12:26:01 -0400\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: notmuch@notmuchmail.org\r
  40 Subject: [PATCH 4/9] emacs: Remove notmuch-search quit continuation\r
  41 Date: Thu, 29 Aug 2013 12:25:52 -0400\r
  42 Message-Id: <1377793557-28878-5-git-send-email-amdragon@mit.edu>\r
  43 X-Mailer: git-send-email 1.7.10.4\r
  44 In-Reply-To: <1377793557-28878-1-git-send-email-amdragon@mit.edu>\r
  45 References: <1377793557-28878-1-git-send-email-amdragon@mit.edu>\r
  46 X-Brightmail-Tracker:\r
  47  H4sIAAAAAAAAA+NgFtrEIsWRmVeSWpSXmKPExsUixG6nritXJh9k0H6X3eL6zZnMDowez1bd\r
  48         Yg5gjOKySUnNySxLLdK3S+DK2Ld9NmvBKemKq8eWsjUwtoh3MXJySAiYSMxomcECYYtJXLi3\r
  49         nq2LkYtDSGAfo8T5bS+YIZyNjBIvV6xihHDuMEmc/vSZHcKZyyhx9MhmVpB+NgENiW37lzOC\r
  50         2CIC0hI7784GinNwMAuoSfzpUgExhQWcJda/cwOpYBFQlei48AxsM6+Ag8T1ZbOgrlCU6H42\r
  51         gQ3E5hRwlOi/+xYsLgRU8+fiU/YJjPwLGBlWMcqm5Fbp5iZm5hSnJusWJyfm5aUW6Zro5WaW\r
  52         6KWmlG5iBAUNpyT/DsZvB5UOMQpwMCrx8HYEygcJsSaWFVfmHmKU5GBSEuUNLAEK8SXlp1Rm\r
  53         JBZnxBeV5qQWH2KU4GBWEuF9ywmU401JrKxKLcqHSUlzsCiJ8z57ejZQSCA9sSQ1OzW1ILUI\r
  54         JivDwaEkwXsfZKhgUWp6akVaZk4JQpqJgxNkOA/Q8H8gNbzFBYm5xZnpEPlTjIpS4rw/QRIC\r
  55         IImM0jy4XlhUv2IUB3pFmFeyFKiKB5gQ4LpfAQ1mAho8IV8OZHBJIkJKqoGxu/zE4lLnnFxF\r
  56         Ld09NueO/G5jiXSLVVV371jGlH5yNfvX3QwlN7kYmZjbWme97ug4vTJtR2C3aND7v3MOuTwJ\r
  57         nfr7zFPmOQ6Pji+KTd51vlV5w+ldy5KEYpT9ali0un5Uuka7xe5mV2hvES7PrFX7b3/bdm7d\r
  58         iiU/7yfI7TfdoXqO08PpVogSS3FGoqEWc1FxIgD+9MUXxQIAAA==\r
  59 X-BeenThere: notmuch@notmuchmail.org\r
  60 X-Mailman-Version: 2.1.13\r
  61 Precedence: list\r
  62 List-Id: "Use and development of the notmuch mail system."\r
  63         <notmuch.notmuchmail.org>\r
  64 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  65         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  66 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  67 List-Post: <mailto:notmuch@notmuchmail.org>\r
  68 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  69 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  70         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  71 X-List-Received-Date: Thu, 29 Aug 2013 16:26:22 -0000\r
  72 \r
  73 Since notmuch-hello doesn't need this any more, we can remove this\r
  74 hack.  This also eliminates `notmuch-search-quit', so now all modes\r
  75 bind "q" to `notmuch-kill-this-buffer'.\r
  76 ---\r
  77  emacs/notmuch.el |   22 +++++-----------------\r
  78  1 file changed, 5 insertions(+), 17 deletions(-)\r
  79 \r
  80 diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
  81 index c964186..00cf271 100644\r
  82 --- a/emacs/notmuch.el\r
  83 +++ b/emacs/notmuch.el\r
  84 @@ -213,8 +213,8 @@ For a mouse binding, return nil."\r
  85  (defvar notmuch-search-mode-map\r
  86    (let ((map (make-sparse-keymap)))\r
  87      (define-key map "?" 'notmuch-help)\r
  88 -    (define-key map "q" 'notmuch-search-quit)\r
  89 -    (define-key map "x" 'notmuch-search-quit)\r
  90 +    (define-key map "q" 'notmuch-kill-this-buffer)\r
  91 +    (define-key map "x" 'notmuch-kill-this-buffer)\r
  92      (define-key map (kbd "<DEL>") 'notmuch-search-scroll-down)\r
  93      (define-key map "b" 'notmuch-search-scroll-down)\r
  94      (define-key map " " 'notmuch-search-scroll-up)\r
  95 @@ -257,18 +257,9 @@ For a mouse binding, return nil."\r
  96  (defvar notmuch-search-query-string)\r
  97  (defvar notmuch-search-target-thread)\r
  98  (defvar notmuch-search-target-line)\r
  99 -(defvar notmuch-search-continuation)\r
 100  \r
 101  (defvar notmuch-search-disjunctive-regexp      "\\<[oO][rR]\\>")\r
 102  \r
 103 -(defun notmuch-search-quit ()\r
 104 -  "Exit the search buffer, calling any defined continuation function."\r
 105 -  (interactive)\r
 106 -  (let ((continuation notmuch-search-continuation))\r
 107 -    (notmuch-kill-this-buffer)\r
 108 -    (when continuation\r
 109 -      (funcall continuation))))\r
 110 -\r
 111  (defun notmuch-search-scroll-up ()\r
 112    "Move forward through search results by one window's worth."\r
 113    (interactive)\r
 114 @@ -412,7 +403,6 @@ Complete list of currently available key bindings:\r
 115    (make-local-variable 'notmuch-search-oldest-first)\r
 116    (make-local-variable 'notmuch-search-target-thread)\r
 117    (make-local-variable 'notmuch-search-target-line)\r
 118 -  (set (make-local-variable 'notmuch-search-continuation) nil)\r
 119    (set (make-local-variable 'scroll-preserve-screen-position) t)\r
 120    (add-to-invisibility-spec (cons 'ellipsis t))\r
 121    (use-local-map notmuch-search-mode-map)\r
 122 @@ -896,7 +886,7 @@ PROMPT is the string to prompt with."\r
 123                               'notmuch-search-history nil nil)))))\r
 124  \r
 125  ;;;###autoload\r
 126 -(defun notmuch-search (&optional query oldest-first target-thread target-line continuation)\r
 127 +(defun notmuch-search (&optional query oldest-first target-thread target-line)\r
 128    "Run \"notmuch search\" with the given `query' and display results.\r
 129  \r
 130  If `query' is nil, it is read interactively from the minibuffer.\r
 131 @@ -928,7 +918,6 @@ the configured default sort order."\r
 132      (set 'notmuch-search-oldest-first oldest-first)\r
 133      (set 'notmuch-search-target-thread target-thread)\r
 134      (set 'notmuch-search-target-line target-line)\r
 135 -    (set 'notmuch-search-continuation continuation)\r
 136      (let ((proc (get-buffer-process (current-buffer)))\r
 137           (inhibit-read-only t))\r
 138        (if proc\r
 139 @@ -965,10 +954,9 @@ same relative position within the new buffer."\r
 140    (let ((target-line (line-number-at-pos))\r
 141         (oldest-first notmuch-search-oldest-first)\r
 142         (target-thread (notmuch-search-find-thread-id 'bare))\r
 143 -       (query notmuch-search-query-string)\r
 144 -       (continuation notmuch-search-continuation))\r
 145 +       (query notmuch-search-query-string))\r
 146      (notmuch-kill-this-buffer)\r
 147 -    (notmuch-search query oldest-first target-thread target-line continuation)\r
 148 +    (notmuch-search query oldest-first target-thread target-line)\r
 149      (goto-char (point-min))))\r
 150  \r
 151  (defcustom notmuch-poll-script nil\r
 152 -- \r
 153 1.7.10.4\r
 154 \r