Merge from mainline.

26 files changed, 496 insertions, 295 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c817a59a03a..c44c491cad0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,49 @@
+2011-02-24  Glenn Morris  <rgm@gnu.org>
+
+        * files-x.el (modify-dir-local-variable): Handle dir-locals from
+        the cache, and from non-file sources.
+
+        * help-fns.el (describe-variable): Return consistent results when a
+        dir-local from a file came from the cache or did not.  (Bug#8095)
+        If a dir-local has no associated file, say it came from a "directory".
+
+        * files.el (hack-dir-local-variables): Fix setting of `dir-name'.
+        (hack-local-variables-confirm, hack-local-variables-filter): Doc fix.
+
+        * files.el (dir-locals-find-file): Doc fix.
+        Fix the check for cache elements that have no associated file,
+        and the mtime check for those that do.  (Bug#8095)
+
+        * dired-x.el (dired-hack-local-variables):
+        Handle interrupts during hacking local variables.  (Bug#5216)
+
+        * emacs-lisp/autoload.el (autoload-save-buffers)
+        (autoload-find-destination, update-directory-autoloads):
+        Avoid prompts when updating autoloads.
+
+2011-02-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/bytecomp.el (byte-compile-disable-print-circle): Obsolete.
+
+2011-02-23  Kenichi Handa  <handa@m17n.org>
+
+        * mail/rmailmm.el (rmail-mime-process-multipart): Do not signal an
+        error when a multipart boundary in the nested multipart is found.
+
+        * mail/rmail.el (rmail-start-mail): Decode "encoded-words" of
+        header components.
+
+2011-02-23  Glenn Morris  <rgm@gnu.org>
+
+        * dired.el (dired-mode): Call hack-dir-local-variables-non-file-buffer.
+        * dired-x.el (dired-omit-mode): Safe if boolean.
+        (dired-enable-local-variables): Fix doc and custom type.
+        (dired-enable-local-variables, dired-local-variables-file)
+        (dired-hack-local-variables): Make obsolete.
+        (dired-omit-here-always): Use dir-locals.el instead.
+
+        * files.el (safe-local-eval-forms): Add the write-file-hooks version.
+
 2011-02-22  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * help-fns.el (describe-function-1): Don't signal an error just because
@@ -9036,7 +9082,7 @@
         * htmlfontify.el (hfy-face-attr-for-class): Use append instead
         of nconc to avoid pure storage error (Bug#6239).
 
-2010-06-27  Christoph  <cschol2112@googlemail.com>  (tiny change)
+2010-06-27  Christoph Scholtes  <cschol2112@googlemail.com>
 
         * bookmark.el (bookmark-bmenu-2-window, bookmark-bmenu-other-window)
         (bookmark-bmenu-other-window-with-mouse): Remove unnecessary
@@ -11219,7 +11265,7 @@
 
         * ido.el (ido-file-internal): Fix 2009-12-02 change.
 
-2010-04-19  Christoph  <cschol2112@googlemail.com>  (tiny change)
+2010-04-19  Christoph Scholtes  <cschol2112@googlemail.com>
 
         * progmodes/grep.el (grep-compute-defaults): Fix handling of host
         default settings (Bug#5928).
diff --git a/lisp/allout-widgets.el b/lisp/allout-widgets.el
index 75e1e5882f6..cc5fd6d96fa 100644
--- a/lisp/allout-widgets.el
+++ b/lisp/allout-widgets.el
@@ -2013,7 +2013,7 @@ Optional FORCE means force reassignment of the region property."
   ;; item body), to bias the registered values.
   ;;
   ;; This is not necessary/useful when the item is being decorated, because
-  ;; that always must be preceeded by a fresh item parse.
+  ;; that always must be preceded by a fresh item parse.
 
   (if (not (eq field :body-end))
       (widget-get item-widget :from)
diff --git a/lisp/allout.el b/lisp/allout.el
index 1a7d8cb1593..d881e1177fa 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -255,7 +255,7 @@ prevails."
 
 This is in contrast to the majority of allout-mode bindings on
 `allout-prefixed-bindings', whose bindings are created with a
-preceeding command key.
+preceding command key.
 
 Use vector format for the keys:
   - put literal keys after a '?' question mark, eg: '?a', '?.'
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index 8b1dbb1ef83..ce07676fc99 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -145,6 +145,8 @@ See Info node `(dired-x) Omitting Variables' for more information."
       (let ((dired-omit-size-limit nil)) (dired-omit-expunge))
     (revert-buffer)))
 
+(put 'dired-omit-mode 'safe-local-variable 'booleanp)
+
 ;; For backward compatibility
 (define-obsolete-variable-alias 'dired-omit-files-p 'dired-omit-mode "22.1")
 
@@ -185,15 +187,19 @@ If nil, there is no maximum size."
 
 (defcustom dired-enable-local-variables t
   "Control use of local-variables lists in Dired.
-The value can be t, nil or something else.
-A value of t means local-variables lists are obeyed;
-nil means they are ignored; anything else means query.
-
 This temporarily overrides the value of `enable-local-variables' when
 listing a directory.  See also `dired-local-variables-file'."
-  :type 'boolean
+  :risky t
+  :type '(choice (const :tag "Query Unsafe" t)
+                 (const :tag "Safe Only" :safe)
+                 (const :tag "Do all" :all)
+                 (const :tag "Ignore" nil)
+                 (other :tag "Query" other))
   :group 'dired-x)
 
+(make-obsolete-variable 'dired-enable-local-variables
+                        "use a standard `dir-locals-file' instead." "24.1")
+
 (defcustom dired-guess-shell-gnutar
   (catch 'found
     (dolist (exe '("tar" "gtar"))
@@ -723,26 +729,25 @@ Knows about the special cases in variable `dired-default-directory-alist'."
 
 ;;; LOCAL VARIABLES FOR DIRED BUFFERS.
 
-;; Brief Description:
-;;;
+;; Brief Description  (This feature is obsolete as of Emacs 24.1)
+;;
 ;; * `dired-extra-startup' is part of the `dired-mode-hook'.
-;;;
+;;
 ;; * `dired-extra-startup' calls `dired-hack-local-variables'
-;;;
+;;
 ;; * `dired-hack-local-variables' checks the value of
-;;;   `dired-local-variables-file'
-;;;
+;;   `dired-local-variables-file'
+;;
 ;; * Check if `dired-local-variables-file' is a non-nil string and is a
-;;;   filename found in the directory of the Dired Buffer being created.
-;;;
+;;   filename found in the directory of the Dired Buffer being created.
+;;
 ;; * If `dired-local-variables-file' satisfies the above, then temporarily
-;;;   include it in the Dired Buffer at the bottom.
-;;;
+;;   include it in the Dired Buffer at the bottom.
+;;
 ;; * Set `enable-local-variables' temporarily to the user variable
-;;;   `dired-enable-local-variables' and run `hack-local-variables' on the
-;;;   Dired Buffer.
+;;   `dired-enable-local-variables' and run `hack-local-variables' on the
+;;   Dired Buffer.
 
-;; FIXME do standard dir-locals obsolete this?
 (defcustom dired-local-variables-file (convert-standard-filename ".dired")
   "Filename, as string, containing local dired buffer variables to be hacked.
 If this file found in current directory, then it will be inserted into dired
@@ -752,6 +757,8 @@ See also `dired-enable-local-variables'."
   :type 'file
   :group 'dired)
 
+(make-obsolete-variable 'dired-local-variables-file 'dir-locals-file "24.1")
+
 (defun dired-hack-local-variables ()
   "Evaluate local variables in `dired-local-variables-file' for dired buffer."
   (and (stringp dired-local-variables-file)
@@ -767,29 +774,37 @@ See also `dired-enable-local-variables'."
            (insert "\^L\n")
            (insert-file-contents dired-local-variables-file))
          ;; Hack 'em.
-         (let ((buffer-file-name dired-local-variables-file))
-           (hack-local-variables))
+         (unwind-protect
+             (let ((buffer-file-name dired-local-variables-file))
+               (hack-local-variables))
+           ;; Delete this stuff: `eobp' is used to find last subdir by dired.el.
+           (delete-region opoint (point-max)))
          ;; Make sure that the modeline shows the proper information.
-         (dired-sort-set-modeline)
-         ;; Delete this stuff: `eobp' is used to find last subdir by dired.el.
-         (delete-region opoint (point-max)))))
+         (dired-sort-set-modeline))))
+
+(make-obsolete 'dired-hack-local-variables
+               'hack-dir-local-variables-non-file-buffer "24.1")
 
+;; Not sure this is worth having a dedicated command for...
 (defun dired-omit-here-always ()
-  "Create `dired-local-variables-file' for omitting and reverts directory.
-Sets `dired-omit-mode' to t in a local variables file that is readable by
-dired."
+  "Create `dir-locals-file' setting `dired-omit-mode' to t in `dired-mode'.
+If in a Dired buffer, reverts it."
   (interactive)
   (if (file-exists-p dired-local-variables-file)
-      (message "File `./%s' already exists." dired-local-variables-file)
-    ;; Create `dired-local-variables-file'.
-    (with-current-buffer (get-buffer-create " *dot-dired*")
-      (erase-buffer)
-      (insert "Local Variables:\ndired-omit-mode: t\nEnd:\n")
-      (write-file dired-local-variables-file)
-      (kill-buffer))
+      (error "Old-style dired-local-variables-file `./%s' found;
+replace it with a dir-locals-file `./%s'"
+             dired-local-variables-file
+             dir-locals-file))
+  (if (file-exists-p dir-locals-file)
+      (message "File `./%s' already exists." dir-locals-file)
+    (with-temp-buffer
+      (insert "((dired-mode . ((dired-omit-mode . t))))\n")
+      (write-file dir-locals-file))
     ;; Run extra-hooks and revert directory.
-    (dired-extra-startup)
-    (dired-revert)))
+    (when (derived-mode-p 'dired-mode)
+      (hack-dir-local-variables-non-file-buffer)
+      (dired-extra-startup)
+      (dired-revert))))
 
 
 ;;; GUESS SHELL COMMAND.
diff --git a/lisp/dired.el b/lisp/dired.el
index 910d59f2cce..3f31ba58139 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1860,6 +1860,7 @@ Keybindings:
   (set (make-local-variable 'desktop-save-buffer)
        'dired-desktop-buffer-misc-data)
   (setq dired-switches-alist nil)
+  (hack-dir-local-variables-non-file-buffer) ; before sorting
   (dired-sort-other dired-actual-switches t)
   (when (featurep 'dnd)
     (set (make-local-variable 'dnd-protocol-alist)
@@ -4072,7 +4073,7 @@ true then the type of the file linked to by FILE is printed instead.
 ;;;***
 
 ;;;### (autoloads (dired-do-relsymlink dired-jump) "dired-x" "dired-x.el"
-;;;;;;  "86d436093caa9ae80f7b73915c6a4b4c")
+;;;;;;  "515e1dbc42acebd9a0175c4209b6673c")
 ;;; Generated autoloads from dired-x.el
 
 (autoload 'dired-jump "dired-x" "\
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index 7b610d11b0f..d6e7ee9e3cb 100644
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -537,7 +537,8 @@ Return non-nil if and only if FILE adds no autoloads to OUTFILE
 (defun autoload-save-buffers ()
   (while autoload-modified-buffers
     (with-current-buffer (pop autoload-modified-buffers)
-      (save-buffer))))
+      (let ((version-control 'never))
+        (save-buffer)))))
 
 ;;;###autoload
 (defun update-file-autoloads (file &optional save-after)
@@ -569,8 +570,9 @@ removes any prior now out-of-date autoload entries."
       (with-current-buffer
           ;; We used to use `raw-text' to read this file, but this causes
           ;; problems when the file contains non-ASCII characters.
-          (find-file-noselect
-           (autoload-ensure-default-file (autoload-generated-file)))
+          (let ((enable-local-variables :safe))
+            (find-file-noselect
+             (autoload-ensure-default-file (autoload-generated-file))))
         ;; This is to make generated-autoload-file have Unix EOLs, so
         ;; that it is portable to all platforms.
         (or (eq 0 (coding-system-eol-type buffer-file-coding-system))
@@ -656,8 +658,9 @@ directory or directories specified."
          (autoload-modified-buffers nil))
 
     (with-current-buffer
-        (find-file-noselect
-         (autoload-ensure-default-file (autoload-generated-file)))
+        (let ((enable-local-variables :safe))
+          (find-file-noselect
+           (autoload-ensure-default-file (autoload-generated-file))))
       (save-excursion
 
         ;; Canonicalize file names and remove the autoload file itself.
@@ -721,7 +724,8 @@ directory or directories specified."
          (current-buffer) nil nil no-autoloads this-time)
         (insert generate-autoload-section-trailer))
 
-      (save-buffer)
+      (let ((version-control 'never))
+        (save-buffer))
       ;; In case autoload entries were added to other files because of
       ;; file-local autoload-generated-file settings.
       (autoload-save-buffers))))
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 199927d536e..2f113dfb479 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -227,6 +227,7 @@ the functions you loaded will not be able to run.")
 
 (defvar byte-compile-disable-print-circle nil
   "If non-nil, disable `print-circle' on printing a byte-compiled code.")
+(make-obsolete-variable 'byte-compile-disable-print-circle nil "24.1")
 ;;;###autoload(put 'byte-compile-disable-print-circle 'safe-local-variable 'booleanp)
 
 (defcustom byte-compile-dynamic-docstrings t
diff --git a/lisp/files-x.el b/lisp/files-x.el
index a3cb5331e67..a9c32477155 100644
--- a/lisp/files-x.el
+++ b/lisp/files-x.el
@@ -360,18 +360,28 @@ from the MODE alist ignoring the input argument VALUE."
   (catch 'exit
     (unless enable-local-variables
       (throw 'exit (message "Directory-local variables are disabled")))
-
     (let ((variables-file (or (and (buffer-file-name)
                                    (not (file-remote-p (buffer-file-name)))
                                    (dir-locals-find-file (buffer-file-name)))
                               dir-locals-file))
           variables)
-
+      (if (consp variables-file)        ; result from cache
+          ;; If cache element has an mtime, assume it came from a file.
+          ;; Otherwise, assume it was set directly.
+          (setq variables-file (if (nth 2 variables-file)
+                                   (expand-file-name dir-locals-file
+                                                     (car variables-file))
+                                 (cadr variables-file))))
+      ;; I can't be bothered to handle this case right now.
+      ;; Dir locals were set directly from a class.  You need to
+      ;; directly modify the class in dir-locals-class-alist.
+      (and variables-file (not (stringp variables-file))
+           (throw 'exit (message "Directory locals were not set from a file")))
       ;; Don't create ".dir-locals.el" for the deletion operation.
-      (when (and (eq op 'delete)
-                 (not (file-exists-p variables-file)))
-        (throw 'exit (message "File .dir-locals.el not found")))
-
+      (and (eq op 'delete)
+           (or (not variables-file)
+               (not (file-exists-p variables-file)))
+           (throw 'exit (message "No .dir-locals.el file was found")))
       (let ((auto-insert nil))
         (find-file variables-file))
       (widen)
diff --git a/lisp/files.el b/lisp/files.el
index 014469ed8fc..5890bf9b8c9 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2806,7 +2806,9 @@ symbol and VAL is a value that is considered safe."
   :type 'alist)
 
 (defcustom safe-local-eval-forms
-  '((add-hook 'write-file-functions 'time-stamp)
+  ;; This should be here at least as long as Emacs supports write-file-hooks.
+  '((add-hook 'write-file-hooks 'time-stamp)
+    (add-hook 'write-file-functions 'time-stamp)
     (add-hook 'before-save-hook 'time-stamp))
   "Expressions that are considered safe in an `eval:' local variable.
 Add expressions to this list if you want Emacs to evaluate them, when
@@ -2814,7 +2816,7 @@ they appear in an `eval' local variable specification, without first
 asking you for confirmation."
   :risky t
   :group 'find-file
-  :version "22.2"
+  :version "24.1"                       ; added write-file-hooks
   :type '(repeat sexp))
 
 ;; Risky local variables:
@@ -2917,8 +2919,8 @@ variable to set.")
 ALL-VARS is the list of all variables to be set up.
 UNSAFE-VARS is the list of those that aren't marked as safe or risky.
 RISKY-VARS is the list of those that are marked as risky.
-DIR-NAME is a directory name if these settings come from
-directory-local variables, or nil otherwise."
+If these settings come from directory-local variables, then
+DIR-NAME is the name of the associated directory.  Otherwise it is nil."
   (if noninteractive
       nil
     (save-window-excursion
@@ -3060,8 +3062,8 @@ VARIABLES is the alist of variable-value settings.  This alist is
  `enable-local-eval', `enable-local-variables', and (if necessary)
  user interaction.  The results are added to
  `file-local-variables-alist', without applying them.
-DIR-NAME is a directory name if these settings come from
- directory-local variables, or nil otherwise."
+If these settings come from directory-local variables, then
+DIR-NAME is the name of the associated directory.  Otherwise it is nil."
   ;; Find those variables that we may want to save to
   ;; `safe-local-variable-values'.
   (let (all-vars risky-vars unsafe-vars)
@@ -3345,11 +3347,11 @@ Each element in this list has the form (DIR CLASS MTIME).
 DIR is the name of the directory.
 CLASS is the name of a variable class (a symbol).
 MTIME is the recorded modification time of the directory-local
- variables file associated with this entry.  This time is a list
- of two integers (the same format as `file-attributes'), and is
- used to test whether the cache entry is still valid.
- Alternatively, MTIME can be nil, which means the entry is always
- considered valid.")
+variables file associated with this entry.  This time is a list
+of two integers (the same format as `file-attributes'), and is
+used to test whether the cache entry is still valid.
+Alternatively, MTIME can be nil, which means the entry is always
+considered valid.")
 
 (defsubst dir-locals-get-class-variables (class)
   "Return the variable list for CLASS."
@@ -3458,13 +3460,20 @@ across different environments and users.")
 (defun dir-locals-find-file (file)
   "Find the directory-local variables for FILE.
 This searches upward in the directory tree from FILE.
-If the directory root of FILE has been registered in
- `dir-locals-directory-cache' and the directory-local variables
- file has not been modified, return the matching entry in
- `dir-locals-directory-cache'.
-Otherwise, if a directory-local variables file is found, return
- the file name.
-Otherwise, return nil."
+It stops at the first directory that has been registered in
+`dir-locals-directory-cache' or contains a `dir-locals-file'.
+If it finds an entry in the cache, it checks that it is valid.
+A cache entry with no modification time element (normally, one that
+has been assigned directly using `dir-locals-set-directory-class', not
+set from a file) is always valid.
+A cache entry based on a `dir-locals-file' is valid if the modification
+time stored in the cache matches the current file modification time.
+If not, the cache entry is cleared so that the file will be re-read.
+
+This function returns either nil (no directory local variables found),
+or the matching entry from `dir-locals-directory-cache' (a list),
+or the full path to the `dir-locals-file' (a string) in the case
+of no valid cache entry."
   (setq file (expand-file-name file))
   (let* ((dir-locals-file-name
           (if (eq system-type 'ms-dos)
@@ -3473,8 +3482,8 @@ Otherwise, return nil."
          (locals-file (locate-dominating-file file dir-locals-file-name))
          (dir-elt nil))
     ;; `locate-dominating-file' may have abbreviated the name.
-    (when locals-file
-      (setq locals-file (expand-file-name dir-locals-file-name locals-file)))
+    (if locals-file
+        (setq locals-file (expand-file-name dir-locals-file-name locals-file)))
     ;; Find the best cached value in `dir-locals-directory-cache'.
     (dolist (elt dir-locals-directory-cache)
       (when (and (eq t (compare-strings file nil (length (car elt))
@@ -3483,23 +3492,32 @@ Otherwise, return nil."
                                               '(windows-nt cygwin ms-dos))))
                  (> (length (car elt)) (length (car dir-elt))))
         (setq dir-elt elt)))
-    (let ((use-cache (and dir-elt
-                          (or (null locals-file)
-                              (<= (length (file-name-directory locals-file))
-                                  (length (car dir-elt)))))))
-      (if use-cache
-          ;; Check the validity of the cache.
-          (if (and (file-readable-p (car dir-elt))
-                   (or (null  (nth 2 dir-elt))
+    (if (and dir-elt
+             (or (null locals-file)
+                 (<= (length (file-name-directory locals-file))
+                     (length (car dir-elt)))))
+        ;; Found a potential cache entry.  Check validity.
+        ;; A cache entry with no MTIME is assumed to always be valid
+        ;; (ie, set directly, not from a dir-locals file).
+        ;; Note, we don't bother to check that there is a matching class
+        ;; element in dir-locals-class-alist, since that's done by
+        ;; dir-locals-set-directory-class.
+        (if (or (null (nth 2 dir-elt))
+                (let ((cached-file (expand-file-name dir-locals-file-name
+                                                     (car dir-elt))))
+                  (and (file-readable-p cached-file)
                        (equal (nth 2 dir-elt)
-                              (nth 5 (file-attributes (car dir-elt))))))
-              ;; This cache entry is OK.
-              dir-elt
-            ;; This cache entry is invalid; clear it.
-            (setq dir-locals-directory-cache
-                  (delq dir-elt dir-locals-directory-cache))
-            locals-file)
-        locals-file))))
+                              (nth 5 (file-attributes cached-file))))))
+            ;; This cache entry is OK.
+            dir-elt
+          ;; This cache entry is invalid; clear it.
+          (setq dir-locals-directory-cache
+                (delq dir-elt dir-locals-directory-cache))
+          ;; Return the first existing dir-locals file.  Might be the same
+          ;; as dir-elt's, might not (eg latter might have been deleted).
+          locals-file)
+      ;; No cache entry.
+      locals-file)))
 
 (defun dir-locals-read-from-file (file)
   "Load a variables FILE and register a new class and instance.
@@ -3529,10 +3547,8 @@ and `file-local-variables-alist', without applying them."
           (dir-name nil))
       (cond
        ((stringp variables-file)
-        (setq dir-name (if (buffer-file-name)
-                           (file-name-directory (buffer-file-name))
-                         default-directory))
-        (setq class (dir-locals-read-from-file variables-file)))
+        (setq dir-name (file-name-directory variables-file)
+              class (dir-locals-read-from-file variables-file)))
        ((consp variables-file)
         (setq dir-name (nth 0 variables-file))
         (setq class (nth 1 variables-file))))
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 3695b94b510..9dd315782ff 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,7 +1,77 @@
+2011-02-24  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * auth-source.el (auth-source-netrc-create): Use `read-char' with no
+        argument that XEmacs doesn't support.
+
+2011-02-23  Julien Danjou  <julien@danjou.info>
+
+        * gnus-art.el (article-make-date-line): Ignore errors if time is
+        invalid and not convertible.
+        (article-make-date-line): Only add lapsed time if time is not nil.
+
+2011-02-23  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * auth-source.el (auth-source-netrc-create): Use `read-char' instead of
+        `read-char-choice' for backwards compatibility.
+        (auth-source-netrc-element-or-first): New function to DTRT for
+        parameter extraction.
+        (auth-source-netrc-create): Use it and fix multiple parameter print
+        bug.  Use the default passed from above (given-default) or the
+        built-in (user-login-name for :user).
+
+2011-02-23  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-start.el (gnus-dribble-read-file): Set
+        buffer-save-without-query, since we always want to save the dribble
+        file, probably.
+
+        * nnmail.el (nnmail-article-group): Allow a final "" split to work on
+        nnimap.
+
+        * gnus-sum.el (gnus-user-date-format-alist): Renamed back again from
+        -summary- since it's a user-visible variable.
+
+        * nnimap.el (nnimap-retrieve-group-data-early): Don't do QRESYNC the
+        first time you use the new Gnus.
+
+2011-02-22  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * auth-source.el: Don't load netrc.el.
+        (auth-sources): Search ~/.netrc as well by default.
+        (auth-source-debug): Add 'trivia option for extra output.
+        (auth-source-do-trivia): Use it.
+        (auth-source-search): Simplify logic to use
+        `auth-source-search-backends'.  Use `auth-source-do-trivia' where
+        appropriate.  Don't keep a running count at this level.  Layer :create
+        and :delete options appropriately on the first and second passes.
+        Don't track the backend with the search results.
+        (auth-source-search-backends): New function to search a list of
+        backends for a processed spec.
+        (auth-source-netrc-parse): Cache all netrc files, making
+        auth-source-netrc-cache an alist keyed by the file name and using the
+        file mtime as the caching criterion.  Keep the obfuscated data secret
+        with a lexical bind.
+        (auth-source-netrc-search): Don't calculate the length of the results
+        unnecessarily.
+        (auth-source-search-backends): Fix bug.
+        (auth-source-netrc-create): Rework prompts.
+
+2011-02-22  Andrew Cohen  <cohen@andy.bu.edu>
+
+        * nnir.el (nnir-imap-search-arguments,nnir-imap-default-search-key):
+        Lower case names of search constraints.
+        (nnir-run-query): Cache and reuse search constraints for all imap
+        servers.
+
+2011-02-22  Sam Steingold  <sds@gnu.org>
+
+        * gnus-msg.el (gnus-setup-message): Also bind `winconf-name'.
+
 2011-02-22  Lars Ingebrigtsen  <larsi@gnus.org>
 
         * gnus-msg.el (gnus-inews-add-send-actions): Restore the winconf name
         after exit.
+        (gnus-setup-message): Define missing variable from last checkin.
 
         * gnus-sum.el (gnus-summary-show-article): When called with t as the
         value, show the raw article.
diff --git a/lisp/gnus/auth-source.el b/lisp/gnus/auth-source.el
index 57fecc7ae32..63ec93dd760 100644
--- a/lisp/gnus/auth-source.el
+++ b/lisp/gnus/auth-source.el
@@ -42,7 +42,6 @@
 (require 'password-cache)
 (require 'mm-util)
 (require 'gnus-util)
-(require 'netrc)
 (require 'assoc)
 (eval-when-compile (require 'cl))
 (require 'eieio)
@@ -164,16 +163,19 @@ If the value is a function, debug messages are logged by calling
   :type `(choice
           :tag "auth-source debugging mode"
           (const :tag "Log using `message' to the *Messages* buffer" t)
+          (const :tag "Log all trivia with `message' to the *Messages* buffer"
+                 trivia)
           (function :tag "Function that takes arguments like `message'")
           (const :tag "Don't log anything" nil)))
 
-(defcustom auth-sources '("~/.authinfo.gpg" "~/.authinfo")
+(defcustom auth-sources '("~/.authinfo.gpg" "~/.authinfo" "~/.netrc")
   "List of authentication sources.
 
 The default will get login and password information from
 \"~/.authinfo.gpg\", which you should set up with the EPA/EPG
 packages to be encrypted.  If that file doesn't exist, it will
-try the unencrypted version \"~/.authinfo\".
+try the unencrypted version \"~/.authinfo\" and the famous
+\"~/.netrc\" file.
 
 See the auth.info manual for details.
 
@@ -256,6 +258,11 @@ If the value is not a list, symmetric encryption will be used."
   (when auth-source-debug
     (apply 'auth-source-do-warn msg)))
 
+(defun auth-source-do-trivia (&rest msg)
+  (when (or (eq auth-source-debug 'trivia)
+            (functionp auth-source-debug))
+    (apply 'auth-source-do-warn msg)))
+
 (defun auth-source-do-warn (&rest msg)
   (apply
     ;; set logger to either the function in auth-source-debug or 'message
@@ -500,7 +507,7 @@ must call it to obtain the actual value."
                      unless (memq (nth i spec) ignored-keys)
                      collect (nth i spec)))
          (found (auth-source-recall spec))
-         filtered-backends accessor-key found-here goal matches backend)
+         filtered-backends accessor-key backend)
 
     (if (and found auth-source-do-cache)
         (auth-source-do-debug
@@ -509,7 +516,7 @@ must call it to obtain the actual value."
 
       (assert
        (or (eq t create) (listp create)) t
-       "Invalid auth-source :create parameter (must be nil, t, or a list): %s %s")
+       "Invalid auth-source :create parameter (must be t or a list): %s %s")
 
       (setq filtered-backends (copy-sequence backends))
       (dolist (backend backends)
@@ -523,66 +530,64 @@ must call it to obtain the actual value."
                 (return))
             (invalid-slot-name))))
 
-      (auth-source-do-debug
+      (auth-source-do-trivia
        "auth-source-search: found %d backends matching %S"
        (length filtered-backends) spec)
 
       ;; (debug spec "filtered" filtered-backends)
-      (setq goal max)
       ;; First go through all the backends without :create, so we can
       ;; query them all.
-      (let ((uspec (copy-sequence spec)))
-        (plist-put uspec :create nil)
-        (dolist (backend filtered-backends)
-          (let ((match (apply
-                        (slot-value backend 'search-function)
-                        :backend backend
-                        uspec)))
-            (when match
-              (push (list backend match) matches)))))
+      (setq found (auth-source-search-backends filtered-backends
+                                               spec
+                                               ;; to exit early
+                                               max
+                                               ;; create and delete
+                                               nil delete))
+
+      (auth-source-do-debug
+       "auth-source-search: found %d results (max %d) matching %S"
+       (length found) max spec)
+
       ;; If we didn't find anything, then we allow the backend(s) to
       ;; create the entries.
       (when (and create
-                 (not matches))
-        (dolist (backend filtered-backends)
-          (unless matches
-            (let ((match (apply
-                          (slot-value backend 'search-function)
-                          :backend backend
-                          :create create
-                          :delete delete
-                          spec)))
-              (when match
-                (push (list backend match) matches))))))
-
-      (setq backend (caar matches)
-            found-here (cadar matches))
-
-      (block nil
-        ;; if max is 0, as soon as we find something, return it
-        (when (and (zerop max) (> 0 (length found-here)))
-          (return t))
-
-        ;; decrement the goal by the number of new results
-        (decf goal (length found-here))
-        ;; and append the new results to the full list
-        (setq found (append found found-here))
-
-        (auth-source-do-debug
-         "auth-source-search: found %d results (max %d/%d) in %S matching %S"
-         (length found-here) max goal backend spec)
-
-        ;; return full list if the goal is 0 or negative
-        (when (zerop (max 0 goal))
-          (return found))
-
-        ;; change the :max parameter in the spec to the goal
-        (setq spec (plist-put spec :max goal))
-
-        (when (and found auth-source-do-cache)
-          (auth-source-remember spec found))))
-
-    found))
+                 (not found))
+        (setq found (auth-source-search-backends filtered-backends
+                                                 spec
+                                                 ;; to exit early
+                                                 max
+                                                 ;; create and delete
+                                                 create delete))
+        (auth-source-do-warn
+         "auth-source-search: CREATED %d results (max %d) matching %S"
+         (length found) max spec))
+
+      (when (and found auth-source-do-cache)
+        (auth-source-remember spec found)))
+
+      found))
+
+(defun auth-source-search-backends (backends spec max create delete)
+  (let (matches)
+    (dolist (backend backends)
+      (when (> max (length matches))   ; when we need more matches...
+        (let ((bmatches (apply
+                         (slot-value backend 'search-function)
+                         :backend backend
+                         ;; note we're overriding whatever the spec
+                         ;; has for :create and :delete
+                         :create create
+                         :delete delete
+                         spec)))
+          (when bmatches
+            (auth-source-do-trivia
+             "auth-source-search-backend: got %d (max %d) in %s:%s matching %S"
+             (length bmatches) max
+             (slot-value backend :type)
+             (slot-value backend :source)
+             spec)
+            (setq matches (append matches bmatches))))))
+    matches))
 
 ;;; (auth-source-search :max 1)
 ;;; (funcall (plist-get (nth 0 (auth-source-search :max 1)) :secret))
@@ -704,25 +709,35 @@ Note that the MAX parameter is used so we can exit the parse early."
     (when (file-exists-p file)
       (setq port (auth-source-ensure-strings port))
       (with-temp-buffer
-        (let ((tokens '("machine" "host" "default" "login" "user"
-                        "password" "account" "macdef" "force"
-                        "port" "protocol"))
-              (max (or max 5000))       ; sanity check: default to stop at 5K
-              (modified 0)
-              alist elem result pair)
-          (if (and auth-source-netrc-cache
-                   (equal (car auth-source-netrc-cache)
-                          (nth 5 (file-attributes file))))
-              (insert (base64-decode-string
-                       (rot13-string (cdr auth-source-netrc-cache))))
-            (insert-file-contents file)
-            (when (string-match "\\.gpg\\'" file)
-              ;; Store the contents of the file heavily encrypted in memory.
-              (setq auth-source-netrc-cache
-                    (cons (nth 5 (file-attributes file))
-                          (rot13-string
-                           (base64-encode-string
-                            (buffer-string)))))))
+        (let* ((tokens '("machine" "host" "default" "login" "user"
+                         "password" "account" "macdef" "force"
+                         "port" "protocol"))
+               (max (or max 5000))       ; sanity check: default to stop at 5K
+               (modified 0)
+               (cached (cdr-safe (assoc file auth-source-netrc-cache)))
+               (cached-mtime (plist-get cached :mtime))
+               (cached-secrets (plist-get cached :secret))
+               alist elem result pair)
+
+          (if (and (functionp cached-secrets)
+                   (equal cached-mtime
+                          (nth 5 (file-attributes file))))
+              (progn
+                (auth-source-do-trivia
+                 "auth-source-netrc-parse: using CACHED file data for %s"
+                 file)
+                (insert (funcall cached-secrets)))
+            (insert-file-contents file)
+            ;; cache all netrc files (used to be just .gpg files)
+            ;; Store the contents of the file heavily encrypted in memory.
+            ;; (note for the irony-impaired: they are just obfuscated)
+            (aput 'auth-source-netrc-cache file
+                  (list :mtime (nth 5 (file-attributes file))
+                        :secret (lexical-let ((v (rot13-string
+                                                  (base64-encode-string
+                                                   (buffer-string)))))
+                                  (lambda () (base64-decode-string
+                                         (rot13-string v)))))))
           (goto-char (point-min))
           ;; Go through the file, line by line.
           (while (and (not (eobp))
@@ -868,7 +883,7 @@ See `auth-source-search' for details on SPEC."
 
     ;; if we need to create an entry AND none were found to match
     (when (and create
-               (= 0 (length results)))
+               (not results))
 
       ;; create based on the spec and record the value
       (setq results (or
@@ -883,6 +898,11 @@ See `auth-source-search' for details on SPEC."
                             (plist-put spec :create nil)))))
     results))
 
+(defun auth-source-netrc-element-or-first (v)
+  (if (listp v)
+      (nth 0 v)
+    v))
+
 ;;; (auth-source-search :host "nonesuch" :type 'netrc :max 1 :create t)
 ;;; (auth-source-search :host "nonesuch" :type 'netrc :max 1 :create t :create-extra-keys '((A "default A") (B)))
 
@@ -897,7 +917,6 @@ See `auth-source-search' for details on SPEC."
          (required (append base-required create-extra))
          (file (oref backend source))
          (add "")
-         (show "")
          ;; `valist' is an alist
          valist
          ;; `artificial' will be returned if no creation is needed
@@ -928,63 +947,39 @@ See `auth-source-search' for details on SPEC."
     ;; for each required element
     (dolist (r required)
       (let* ((data (aget valist r))
+             ;; take the first element if the data is a list
+             (data (auth-source-netrc-element-or-first data))
+             ;; this is the default to be offered
              (given-default (aget auth-source-creation-defaults r))
-             ;; the defaults are simple
+             ;; the default supplementals are simple: for the user,
+             ;; try (user-login-name), otherwise take given-default
              (default (cond
                        ((and (not given-default) (eq r 'user))
                         (user-login-name))
-                       ;; note we need this empty string
-                       ((and (not given-default) (eq r 'port))
-                        "")
-                       (t given-default)))
-             ;; the prompt's default string depends on the data so far
-             (default-string (if (and default (< 0 (length default)))
-                                 (format " (default %s)" default)
-                               " (no default)"))
-             ;; the prompt should also show what's entered so far
-             (user-value (aget valist 'user))
-             (host-value (aget valist 'host))
-             (port-value (aget valist 'port))
-             ;; note this handles lists by just printing them
-             ;; later we allow the user to use completing-read to pick
-             (info-so-far (concat (if user-value
-                                      (format "%s@" user-value)
-                                    "[USER?]")
-                                  (if host-value
-                                      (format "%s" host-value)
-                                    "[HOST?]")
-                                  (if port-value
-                                      ;; this distinguishes protocol between
-                                      (if (zerop (length port-value))
-                                          "" ; 'entered as "no default"' vs.
-                                        (format ":%s" port-value)) ; given
-                                    ;; and this is when the protocol is unknown
-                                    "[PORT?]"))))
-
-        ;; now prompt if the search SPEC did not include a required key;
-        ;; take the result and put it in `data' AND store it in `valist'
-        (aput 'valist r
-              (setq data
-                    (cond
-                     ((and (null data) (eq r 'secret))
-                      ;; special case prompt for passwords
-                      (read-passwd (format "Password for %s: " info-so-far)))
-                     ((null data)
-                      (read-string
-                       (format "Enter %s for %s%s: "
-                               r info-so-far default-string)
-                       nil nil default))
-                     ((listp data)
-                      (completing-read
-                       (format "Enter %s for %s (TAB to see the choices): "
-                               r info-so-far)
-                       data
-                       nil              ; no predicate
-                       t                ; require a match
-                       ;; note the default is nil, but if the user
-                       ;; hits RET we'll get "", which is handled OK later
-                       nil))
-                     (t data))))
+                       (t given-default))))
+
+        ;; store the data, prompting for the password if needed
+        (setq data
+              (cond
+               ((and (null data) (eq r 'secret))
+                ;; special case prompt for passwords
+                (read-passwd (format "Password for %s@%s:%s: "
+                                     (or
+                                      (auth-source-netrc-element-or-first
+                                       (aget valist 'user))
+                                      (plist-get artificial :user)
+                                      "[any user]")
+                                     (or
+                                      (auth-source-netrc-element-or-first
+                                       (aget valist 'host))
+                                      (plist-get artificial :host)
+                                      "[any host]")
+                                     (or
+                                      (auth-source-netrc-element-or-first
+                                       (aget valist 'port))
+                                      (plist-get artificial :port)
+                                      "[any port]"))))
+               (t (or data default))))
 
         (when data
           (setq artificial (plist-put artificial
@@ -997,7 +992,9 @@ See `auth-source-search' for details on SPEC."
         ;; when r is not an empty string...
         (when (and (stringp data)
                    (< 0 (length data)))
-          (let ((printer (lambda (hide)
+          ;; this function is not strictly necessary but I think it
+          ;; makes the code clearer -tzz
+          (let ((printer (lambda ()
                            ;; append the key (the symbol name of r)
                            ;; and the value in r
                            (format "%s%s %S"
@@ -1005,17 +1002,14 @@ See `auth-source-search' for details on SPEC."
                                    (if (zerop (length add)) "" " ")
                                    ;; remap auth-source tokens to netrc
                                    (case r
-                                     ('user "login")
-                                     ('host "machine")
+                                     ('user   "login")
+                                     ('host   "machine")
                                      ('secret "password")
-                                     ('port "port") ; redundant but clearer
+                                     ('port   "port") ; redundant but clearer
                                      (t (symbol-name r)))
                                    ;; the value will be printed in %S format
-                                   (if (and hide (eq r 'secret))
-                                       "HIDDEN_SECRET"
-                                     data)))))
-            (setq add (concat add (funcall printer nil)))
-            (setq show (concat show (funcall printer t)))))))
+                                   data))))
+            (setq add (concat add (funcall printer)))))))
 
     (with-temp-buffer
       (when (file-exists-p file)
@@ -1032,17 +1026,35 @@ See `auth-source-search' for details on SPEC."
       (goto-char (point-max))
 
       ;; ask AFTER we've successfully opened the file
-      (if (y-or-n-p (format "Add to file %s: line [%s]" file show))
+      (let ((prompt (format "Add to file %s? %s: "
+                            file
+                            "(y)es/(n)o but use it/(e)dit line/(s)kip file"))
+            done k)
+        (while (not done)
+          (message "%s" prompt)
+          (setq k (read-char))
+          (case k
+            (?y (setq done t))
+            (?n (setq add ""
+                      done t))
+            (?s (setq add ""
+                      done 'skip))
+            (?e (setq add (read-string "Line to add: " add)))
+            (t nil)))
+
+        (when (< 0 (length add))
           (progn
             (unless (bolp)
               (insert "\n"))
             (insert add "\n")
             (write-region (point-min) (point-max) file nil 'silent)
-            (auth-source-do-debug
+            (auth-source-do-warn
              "auth-source-netrc-create: wrote 1 new line to %s"
              file)
-            nil)
-        (list artificial)))))
+            nil))
+
+        (when (eq done t)
+          (list artificial))))))
 
 ;;; Backend specific parsing: Secrets API backend
 
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 2a36c43130c..5b3489a72ee 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -3463,7 +3463,7 @@ possible values."
                              combined-lapsed))
     (error "Unknown conversion type: %s" type))
   (condition-case ()
-      (let ((time (date-to-time date)))
+      (let ((time (ignore-errors (date-to-time date))))
         (cond
          ;; Convert to the local timezone.
          ((eq type 'local)
@@ -3515,6 +3515,7 @@ possible values."
                 (segments 3)
                 lapsed-string)
             (while (and
+                    time
                     (setq lapsed-string
                           (concat " (" (article-lapsed-string time segments) ")"))
                     (> (+ (length date-string)
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index 29ac43115c8..093eec33fcd 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -383,6 +383,7 @@ Thank you for your help in stamping out bugs.
 (defvar gnus-article-reply nil)
 (defmacro gnus-setup-message (config &rest forms)
   (let ((winconf (make-symbol "gnus-setup-message-winconf"))
+        (winconf-name (make-symbol "gnus-setup-message-winconf-name"))
         (buffer (make-symbol "gnus-setup-message-buffer"))
         (article (make-symbol "gnus-setup-message-article"))
         (yanked (make-symbol "gnus-setup-yanked-articles"))
@@ -433,7 +434,7 @@ Thank you for your help in stamping out bugs.
            (progn
              ,@forms)
          (gnus-inews-add-send-actions ,winconf ,buffer ,article ,config
-                                      ,yanked ,winconf-name)
+                                      ,yanked ',winconf-name)
          (setq gnus-message-buffer (current-buffer))
          (set (make-local-variable 'gnus-message-group-art)
               (cons ,group ,article))
@@ -541,7 +542,7 @@ Gcc: header for archiving purposes."
            (gnus-post-method arg ,gnus-newsgroup-name)))
   (message-add-action
    `(progn
-      (setq gnus-current-window-configuration ,winconf-name)
+      (setq gnus-current-window-configuration ',winconf-name)
       (when (gnus-buffer-exists-p ,buffer)
         (set-window-configuration ,winconf)))
    'exit 'postpone 'kill)
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index e5e2468058c..dea6aabc75b 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -864,6 +864,7 @@ prompt the user for the name of an NNTP server to use."
                                (gnus-get-buffer-create
                                 (file-name-nondirectory dribble-file)))
       (set (make-local-variable 'file-precious-flag) t)
+      (setq buffer-save-without-query t)
       (erase-buffer)
       (setq buffer-file-name dribble-file)
       (auto-save-mode t)
@@ -1717,8 +1718,8 @@ If SCAN, request a scan of that group as well."
                           gnus-secondary-select-methods))
       (when (and (not (assoc method type-cache))
                  (gnus-check-backend-function 'request-list (car method)))
-       (with-current-buffer nntp-server-buffer
-         (gnus-read-active-file-1 method nil))))
+        (with-current-buffer nntp-server-buffer
+          (gnus-read-active-file-1 method nil))))
 
     ;; Do the rest of the retrieval.
     (dolist (elem type-cache)
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 2d78a5698df..abe6367f0d0 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -3853,7 +3853,7 @@ This function is intended to be used in
           ((< c (* 1000 10000)) (format "%1.1fM" (/ c (* 1024.0 1024))))
           (t (format "%dM" (/ c (* 1024.0 1024)))))))
 
-(defcustom gnus-summary-user-date-format-alist
+(defcustom gnus-user-date-format-alist
   '(((gnus-seconds-today) . "Today, %H:%M")
     ((+ 86400 (gnus-seconds-today)) . "Yesterday, %H:%M")
     (604800 . "%A %H:%M")               ; That's one week
@@ -3880,11 +3880,9 @@ respectively."
   :version "24.1"
   :group 'gnus-summary-format
   :type '(alist :key-type sexp :value-type string))
-(make-obsolete-variable 'gnus-user-date-format-alist
-                        'gnus-summary-user-date-format-alist "24.1")
 
 (defun gnus-user-date (messy-date)
-  "Format the messy-date according to `gnus-summary-user-date-format-alist'.
+  "Format the messy-date according to `gnus-user-date-format-alist'.
 Returns \"  ?  \" if there's bad input or if another error occurs.
 Input should look like this: \"Sun, 14 Oct 2001 13:34:39 +0200\"."
   (condition-case ()
@@ -3893,7 +3891,7 @@ Input should look like this: \"Sun, 14 Oct 2001 13:34:39 +0200\"."
              ;;If we don't find something suitable we'll use this one
              (my-format "%b %d '%y"))
         (let* ((difference (- now messy-date))
-               (templist gnus-summary-user-date-format-alist)
+               (templist gnus-user-date-format-alist)
                (top (eval (caar templist))))
           (while (if (numberp top) (< top difference) (not top))
             (progn
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 138875ba477..b2733407836 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -1151,6 +1151,7 @@ textual parts.")
           (setf (nnimap-examined nnimap-object) group)
           (if (and qresyncp
                    uidvalidity
+                   active
                    modseq)
               (push
                (list (nnimap-send-command "EXAMINE %S (%s (%s %s))"
diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el
index 8e91c68b391..eaaac3f88ce 100644
--- a/lisp/gnus/nnir.el
+++ b/lisp/gnus/nnir.el
@@ -203,11 +203,12 @@
 ;; Imap variables
 
 (defvar nnir-imap-search-arguments
-  '(("Whole message" . "TEXT")
-    ("Subject" . "SUBJECT")
-    ("To" . "TO")
-    ("From" . "FROM")
-    ("Imap" . ""))
+  '(("whole message" . "TEXT")
+    ("subject" . "SUBJECT")
+    ("to" . "TO")
+    ("from" . "FROM")
+    ("body" . "BODY")
+    ("imap" . ""))
   "Mapping from user readable keys to IMAP search items for use in nnir")
 
 (defvar nnir-imap-search-other "HEADER %S"
@@ -335,7 +336,7 @@ result, `gnus-retrieve-headers' will be called instead."
   :type '(function)
   :group 'nnir)
 
-(defcustom nnir-imap-default-search-key "Whole message"
+(defcustom nnir-imap-default-search-key "whole message"
   "*The default IMAP search key for an nnir search. Must be one of
   the keys in `nnir-imap-search-arguments'. To use raw imap queries
   by default set this to \"Imap\"."
@@ -1500,11 +1501,14 @@ Tested with Namazu 2.0.6 on a GNU/Linux system."
                 (setq search-func (cadr (assoc nnir-search-engine
                                                nnir-engines)))
                 (if search-func
-                    (funcall search-func
-                             (if nnir-extra-parms
-                                 (nnir-read-parms q nnir-search-engine)
-                               q)
-                             server (cadr x))
+                    (funcall
+                     search-func
+                     (if nnir-extra-parms
+                         (or (and (eq nnir-search-engine 'imap)
+                                  (assq 'criteria q) q)
+                             (setq q (nnir-read-parms q nnir-search-engine)))
+                       q)
+                     server (cadr x))
                   nil)))
             groups))))
 
diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el
index b2336e13b64..8906a036779 100644
--- a/lisp/gnus/nnmail.el
+++ b/lisp/gnus/nnmail.el
@@ -1215,7 +1215,8 @@ FUNC will be called with the group name to determine the article number."
               ;; This is the final group, which is used as a
               ;; catch-all.
               (when (and (not group-art)
-                         (not nnmail-inhibit-default-split-group))
+                         (or (equal "" (nth 1 method))
+                             (not nnmail-inhibit-default-split-group)))
                 (setq group-art
                       (list (cons (car method)
                                   (funcall func (car method))))))))
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 1cd5526fcff..38e331dc992 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -748,15 +748,21 @@ it is displayed along with the global value."
                 (setq extra-line t)
                 (if (member (cons variable val) dir-local-variables-alist)
                     (let ((file (and (buffer-file-name)
-                                     (not (file-remote-p (buffer-file-name)))
-                                     (dir-locals-find-file (buffer-file-name)))))
+                                      (not (file-remote-p (buffer-file-name)))
+                                      (dir-locals-find-file
+                                       (buffer-file-name))))
+                          (type "file"))
                       (princ "  This variable is a directory local variable")
                       (when file
-                        (princ (concat "\n  from the file \""
-                                       (if (consp file)
-                                           (car file)
-                                         file)
-                                       "\"")))
+                        (if (consp file) ; result from cache
+                            ;; If the cache element has an mtime, we
+                            ;; assume it came from a file.
+                            (if (nth 2 file)
+                                (setq file (expand-file-name
+                                            dir-locals-file (car file)))
+                              ;; Otherwise, assume it was set directly.
+                              (setq type "directory")))
+                        (princ (format "\n  from the %s \"%s\"" type file)))
                       (princ ".\n"))
                   (princ "  This variable is a file local variable.\n")))
 
diff --git a/lisp/international/ja-dic-cnv.el b/lisp/international/ja-dic-cnv.el
index 7e317ea09c0..c0fcf19d841 100644
--- a/lisp/international/ja-dic-cnv.el
+++ b/lisp/international/ja-dic-cnv.el
@@ -337,7 +337,7 @@ The name of generated file is specified by the variable `ja-dic-filename'."
       (erase-buffer)
       (buffer-disable-undo)
       (insert ";;; ja-dic.el --- dictionary for Japanese input method"
-              " -*-coding: euc-japan; byte-compile-disable-print-circle:t; -*-\n"
+              " -*-coding: euc-japan; -*-\n"
               ";;\tGenerated by the command `skkdic-convert'\n"
               ";;\tDate: " (current-time-string) "\n"
               ";;\tOriginal SKK dictionary file: "
diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el
index 935d66c613b..e68dc8bdc17 100644
--- a/lisp/international/titdic-cnv.el
+++ b/lisp/international/titdic-cnv.el
@@ -272,8 +272,7 @@ SPC, 6, 3, 4, or 7 specifing a tone (SPC:$(0?v(N(B, 6:$(0Dm(N(B, 3:$(0&9Vy
 
     (princ ";; Quail package `")
     (princ package)
-    (princ (format "' -*- coding:%s; " coding-system-for-write))
-    (princ "byte-compile-disable-print-circle:t; -*-\n")
+    (princ (format "' -*- coding:%s -*-\n" coding-system-for-write))
     (princ ";;   Generated by the command `titdic-convert'\n;;\tDate: ")
     (princ (current-time-string))
     (princ "\n;;\tOriginal TIT dictionary file: ")
@@ -1154,8 +1153,8 @@ the generated Quail package is saved."
         (setq coding-system-for-write
               (coding-system-change-eol-conversion coding 'unix))
         (with-temp-file (expand-file-name quailfile dirname)
-          (insert (format ";; Quail package `%s' -*- coding:%s; " name coding))
-          (insert "byte-compile-disable-print-circle:t; -*-\n")
+          (insert (format ";; Quail package `%s' -*- coding:%s -*-\n"
+                          name coding))
           (insert ";;   Generated by the command `miscdic-convert'\n")
           (insert ";;   Date: " (current-time-string) "\n")
           (insert ";;   Source dictionary file: " dicfile "\n")
diff --git a/lisp/mail/mailclient.el b/lisp/mail/mailclient.el
index ab9f3662745..b957d9f36c6 100644
--- a/lisp/mail/mailclient.el
+++ b/lisp/mail/mailclient.el
@@ -1,4 +1,4 @@
-;;; mailclient.el --- mail sending via system's mail client.  -*- byte-compile-dynamic: t -*-
+;;; mailclient.el --- mail sending via system's mail client.
 
 ;; Copyright (C) 2005-2011 Free Software Foundation
 
diff --git a/lisp/mail/mailheader.el b/lisp/mail/mailheader.el
index 896400068cc..1277d1d4109 100644
--- a/lisp/mail/mailheader.el
+++ b/lisp/mail/mailheader.el
@@ -101,7 +101,7 @@ value."
                 (cons (cdr header) (funcall (cdr rule) (cdr header))))))))
   headers)
 
-;; Advertized part of the interface; see mail-header, mail-header-set.
+;; Advertised part of the interface; see mail-header, mail-header-set.
 (defvar headers)
 
 (defsubst mail-header (header &optional header-alist)
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 06867f6d92a..7fe5383d865 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -3443,6 +3443,16 @@ does not pop any summary buffer."
         (setq yank-action (list 'insert-buffer replybuffer)))
     (push (cons "cc" cc) other-headers)
     (push (cons "in-reply-to" in-reply-to) other-headers)
+    (setq other-headers
+          (mapcar #'(lambda (elt)
+                      (cons (car elt) (if (stringp (cdr elt))
+                                          (rfc2047-decode-string (cdr elt)))))
+                  other-headers))
+    (if (stringp to) (setq to (rfc2047-decode-string to)))
+    (if (stringp in-reply-to)
+        (setq in-reply-to (rfc2047-decode-string in-reply-to)))
+    (if (stringp cc) (setq cc (rfc2047-decode-string cc)))
+    (if (stringp subject) (setq subject (rfc2047-decode-string subject)))
     (prog1
         (compose-mail to subject other-headers noerase
                       switch-function yank-action sendactions
@@ -3450,7 +3460,7 @@ does not pop any summary buffer."
       (if (eq switch-function 'switch-to-buffer-other-frame)
           ;; This is not a standard frame parameter; nothing except
           ;; sendmail.el looks at it.
-          (modify-frame-parameters (selected-frame)
+            (modify-frame-parameters (selected-frame)
                                    '((mail-dedicated-frame . t)))))))
 
 (defun rmail-mail-return ()
diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el
index 0bfeb121ca4..96132739b20 100644
--- a/lisp/mail/rmailmm.el
+++ b/lisp/mail/rmailmm.el
@@ -853,28 +853,33 @@ The other arguments are the same as `rmail-mime-multipart-handler'."
             ((looking-at "[ \t]*\n")
              (setq next (copy-marker (match-end 0) t)))
             (t
-             (rmail-mm-get-boundary-error-message
-              "Malformed boundary" content-type content-disposition
-              content-transfer-encoding)))
-
-      (setq index (1+ index))
-      ;; Handle the part.
-      (if parse-tag
+             ;; The original code signalled an error as below, but
+             ;; this line may be a boundary of nested multipart.  So,
+             ;; we just set `next' to nil to skip this line
+             ;; (rmail-mm-get-boundary-error-message
+             ;;  "Malformed boundary" content-type content-disposition
+             ;;  content-transfer-encoding)
+             (setq next nil)))
+
+      (when next
+        (setq index (1+ index))
+        ;; Handle the part.
+        (if parse-tag
+            (save-restriction
+              (narrow-to-region beg end)
+              (let ((child (rmail-mime-process
+                            nil (format "%s/%d" parse-tag index)
+                            content-type content-disposition)))
+                ;; Display a tagline.
+                (aset (aref (rmail-mime-entity-display child) 1) 1
+                      (aset (rmail-mime-entity-tagline child) 2 t))
+                (push child entities)))
+
+          (delete-region end next)
           (save-restriction
             (narrow-to-region beg end)
-            (let ((child (rmail-mime-process
-                          nil (format "%s/%d" parse-tag index)
-                          content-type content-disposition)))
-              ;; Display a tagline.
-              (aset (aref (rmail-mime-entity-display child) 1) 1
-                    (aset (rmail-mime-entity-tagline child) 2 t))
-              (push child entities)))
-
-        (delete-region end next)
-        (save-restriction
-          (narrow-to-region beg end)
-          (rmail-mime-show)))
-      (goto-char (setq beg next)))
+            (rmail-mime-show)))
+        (goto-char (setq beg next))))
 
     (when parse-tag
       (setq entities (nreverse entities))
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index 9e49f0e775b..1c1ffc41624 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -2801,7 +2801,7 @@ server/database name."
 (defun sql-rename-buffer (&optional new-name)
   "Rename a SQL interactive buffer.
 
-Prompts for the new name if command is preceeded by
+Prompts for the new name if command is preceded by
 \\[universal-argument].  If no buffer name is provided, then the
 `sql-alternate-buffer-name' is used.
 
@@ -3262,7 +3262,7 @@ you must tell Emacs.  Here's how to do that in your `~/.emacs' file:
   :abbrev-table sql-mode-abbrev-table
   (if sql-mode-menu
       (easy-menu-add sql-mode-menu)); XEmacs
-  
+
   (set (make-local-variable 'comment-start) "--")
   ;; Make each buffer in sql-mode remember the "current" SQLi buffer.
   (make-local-variable 'sql-buffer)
@@ -4257,4 +4257,3 @@ buffer.
 (provide 'sql)
 
 ;;; sql.el ends here
-