emacs: avoid binding unnamed commands in keymaps

[notmuch] / emacs / notmuch-draft.el

diff --git a/emacs/notmuch-draft.el b/emacs/notmuch-draft.el
index 759e6c9e47a00d539c31219c6f3f0e007920cd20..f928be876a906c013f9ec13d345e9d95211461ba 100644 (file)
--- a/emacs/notmuch-draft.el
+++ b/emacs/notmuch-draft.el
@@ -89,9 +89,8 @@ like they are intended to be sent encrypted
   "<#\\(part encrypt\\|secure.*mode=.*encrypt>\\)"
   "Regular expression matching mml tags indicating encryption of part or message.")
 
   "<#\\(part encrypt\\|secure.*mode=.*encrypt>\\)"
   "Regular expression matching mml tags indicating encryption of part or message.")
 

-(defvar notmuch-draft-id nil
+(defvar-local notmuch-draft-id nil

   "Message-id of the most recent saved draft of this message.")
   "Message-id of the most recent saved draft of this message.")

-(make-variable-buffer-local 'notmuch-draft-id)

 
 (defun notmuch-draft--mark-deleted ()
   "Tag the last saved draft deleted.
 
 (defun notmuch-draft--mark-deleted ()
   "Tag the last saved draft deleted.


@@ -101,7 +100,7 @@ Used when a new version is saved, or the message is sent."
     (notmuch-tag notmuch-draft-id '("+deleted"))))
 
 (defun notmuch-draft-quote-some-mml ()
     (notmuch-tag notmuch-draft-id '("+deleted"))))
 
 (defun notmuch-draft-quote-some-mml ()

-  "Quote the mml tags in `notmuch-draft-quoted-tags`."
+  "Quote the mml tags in `notmuch-draft-quoted-tags'."

   (save-excursion
     ;; First we deal with any secure tag separately.
     (message-goto-body)
   (save-excursion
     ;; First we deal with any secure tag separately.
     (message-goto-body)


@@ -122,7 +121,7 @@ Used when a new version is saved, or the message is sent."
          (insert "!"))))))
 
 (defun notmuch-draft-unquote-some-mml ()
          (insert "!"))))))
 
 (defun notmuch-draft-unquote-some-mml ()

-  "Unquote the mml tags in `notmuch-draft-quoted-tags`."
+  "Unquote the mml tags in `notmuch-draft-quoted-tags'."

   (save-excursion
     (when notmuch-draft-quoted-tags
       (let ((re (concat "<#!+/?\\("
   (save-excursion
     (when notmuch-draft-quoted-tags
       (let ((re (concat "<#!+/?\\("


@@ -136,7 +135,7 @@ Used when a new version is saved, or the message is sent."
     (let (secure-tag)
       (save-restriction
        (message-narrow-to-headers)
     (let (secure-tag)
       (save-restriction
        (message-narrow-to-headers)

-       (setq secure-tag (message-fetch-field "X-Notmuch-Emacs-Secure" 't))
+       (setq secure-tag (message-fetch-field "X-Notmuch-Emacs-Secure" t))

        (message-remove-header "X-Notmuch-Emacs-Secure"))
       (message-goto-body)
       (when secure-tag
        (message-remove-header "X-Notmuch-Emacs-Secure"))
       (message-goto-body)
       (when secure-tag


@@ -146,7 +145,7 @@ Used when a new version is saved, or the message is sent."
   "Returns t if there is an mml secure tag."
   (save-excursion
     (message-goto-body)
   "Returns t if there is an mml secure tag."
   (save-excursion
     (message-goto-body)

-    (re-search-forward notmuch-draft-encryption-tag-regex nil 't)))
+    (re-search-forward notmuch-draft-encryption-tag-regex nil t)))

 
 (defun notmuch-draft--query-encryption ()
   "Checks if we should save a message that should be encrypted.
 
 (defun notmuch-draft--query-encryption ()
   "Checks if we should save a message that should be encrypted.


@@ -174,7 +173,7 @@ Really save and index an unencrypted copy? ")
   "Save the current draft message in the notmuch database.
 
 This saves the current message in the database with tags
   "Save the current draft message in the notmuch database.
 
 This saves the current message in the database with tags

-`notmuch-draft-tags` (in addition to any default tags
+`notmuch-draft-tags' (in addition to any default tags

 applied to newly inserted messages)."
   (interactive)
   (when (notmuch-draft--has-encryption-tag)
 applied to newly inserted messages)."
   (interactive)
   (when (notmuch-draft--has-encryption-tag)


@@ -185,7 +184,7 @@ applied to newly inserted messages)."
      ;; so that it is easier to search for the message, and the
      ;; latter so we have a way of accessing the saved message (for
      ;; example to delete it at a later time). We check that the
      ;; so that it is easier to search for the message, and the
      ;; latter so we have a way of accessing the saved message (for
      ;; example to delete it at a later time). We check that the

-     ;; user has these in `message-deletable-headers` (the default)
+     ;; user has these in `message-deletable-headers' (the default)

      ;; as otherwise they are doing something strange and we
      ;; shouldn't interfere. Note, since we are doing this in a new
      ;; buffer we don't change the version in the compose buffer.
      ;; as otherwise they are doing something strange and we
      ;; shouldn't interfere. Note, since we are doing this in a new
      ;; buffer we don't change the version in the compose buffer.


@@ -208,7 +207,7 @@ applied to newly inserted messages)."
      (notmuch-draft-quote-some-mml)
      (notmuch-maildir-setup-message-for-saving)
      (notmuch-maildir-notmuch-insert-current-buffer
      (notmuch-draft-quote-some-mml)
      (notmuch-maildir-setup-message-for-saving)
      (notmuch-maildir-notmuch-insert-current-buffer

-      notmuch-draft-folder 't notmuch-draft-tags))
+      notmuch-draft-folder t notmuch-draft-tags))

     ;; We are now back in the original compose buffer. Note the
     ;; function notmuch-call-notmuch-process (called by
     ;; notmuch-maildir-notmuch-insert-current-buffer) signals an error
     ;; We are now back in the original compose buffer. Note the
     ;; function notmuch-call-notmuch-process (called by
     ;; notmuch-maildir-notmuch-insert-current-buffer) signals an error


@@ -232,7 +231,8 @@ applied to newly inserted messages)."
         (draft (equal tags (notmuch-update-tags tags notmuch-draft-tags))))
     (when (or draft
              (yes-or-no-p "Message does not appear to be a draft: edit as new? "))
         (draft (equal tags (notmuch-update-tags tags notmuch-draft-tags))))
     (when (or draft
              (yes-or-no-p "Message does not appear to be a draft: edit as new? "))

-      (switch-to-buffer (get-buffer-create (concat "*notmuch-draft-" id "*")))
+      (pop-to-buffer-same-window
+       (get-buffer-create (concat "*notmuch-draft-" id "*")))

       (setq buffer-read-only nil)
       (erase-buffer)
       (let ((coding-system-for-read 'no-conversion))
       (setq buffer-read-only nil)
       (erase-buffer)
       (let ((coding-system-for-read 'no-conversion))