auth-source.el (auth-source-netrc-create):

message.el (message-yank-original): Fix use of `case'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 721a7d7..3a2a422 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -24,6 +24,11 @@
        (nnimap-parse-flags): Store HIGHESTMODSEQ as a string, since it may be
        too large for 32-bit Emacsen.
 
        (nnimap-parse-flags): Store HIGHESTMODSEQ as a string, since it may be
        too large for 32-bit Emacsen.
 

+2011-03-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * auth-source.el (auth-source-netrc-create):
+       * message.el (message-yank-original): Fix use of `case'.
+

 2011-03-15  Nelson Ferreira  <nelson.ferreira@ieee.org>  (tiny change)
 
        * gnus-art.el (gnus-article-treat-body-boundary): Fix boundary width on
 2011-03-15  Nelson Ferreira  <nelson.ferreira@ieee.org>  (tiny change)
 
        * gnus-art.el (gnus-article-treat-body-boundary): Fix boundary width on

diff --git a/lisp/auth-source.el b/lisp/auth-source.el
index 332a8f6..ce483e4 100644 (file)
--- a/lisp/auth-source.el
+++ b/lisp/auth-source.el
@@ -1140,10 +1140,10 @@ See `auth-source-search' for details on SPEC."
                                    (if (zerop (length add)) "" " ")
                                    ;; remap auth-source tokens to netrc
                                    (case r
                                    (if (zerop (length add)) "" " ")
                                    ;; remap auth-source tokens to netrc
                                    (case r

-                                     ('user   "login")
-                                     ('host   "machine")
-                                     ('secret "password")
-                                     ('port   "port") ; redundant but clearer
+                                     (user   "login")
+                                     (host   "machine")
+                                     (secret "password")
+                                     (port   "port") ; redundant but clearer

                                      (t (symbol-name r)))
                                    ;; the value will be printed in %S format
                                    data))))
                                      (t (symbol-name r)))
                                    ;; the value will be printed in %S format
                                    data))))

diff --git a/lisp/message.el b/lisp/message.el
index 198c5d8..3dc5647 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -3800,13 +3800,13 @@ prefix, and don't delete any headers."
                (goto-char (mark t))
                (insert-before-markers ?\n)
                (goto-char pt))))
                (goto-char (mark t))
                (insert-before-markers ?\n)
                (goto-char pt))))

-         (cond
-           ((eq 'above message-cite-reply-position)
+         (case message-cite-reply-position
+           (above

             (message-goto-body)
             (insert body-text)
             (insert (if (bolp) "\n" "\n\n"))
             (message-goto-body))
             (message-goto-body)
             (insert body-text)
             (insert (if (bolp) "\n" "\n\n"))
             (message-goto-body))

-           ((eq 'below message-cite-reply-position)
+           (below

             (message-goto-signature)))
          ;; Add a `message-setup-very-last-hook' here?
          ;; Add `gnus-article-highlight-citation' here?
             (message-goto-signature)))
          ;; Add a `message-setup-very-last-hook' here?
          ;; Add `gnus-article-highlight-citation' here?