Merge from mainline.

53 files changed, 859 insertions, 561 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c44c491cad0..8d891b22fd0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,117 @@
+2011-03-01  Juanma Barranquero  <lekktu@gmail.com>
+
+        * emacs-lisp/cl-macs.el (lexical-let*): Fix argument name in docstring.
+
+2011-03-01  Glenn Morris  <rgm@gnu.org>
+
+        * calendar/cal-hebrew.el (calendar-hebrew-birthday, diary-hebrew-date):
+        Rename and rework functions added in previous change.
+
+2011-03-01  Ed Reingold  <reingold@emr.cs.iit.edu>
+
+        * calendar/cal-hebrew.el (hebrew-calendar-birthday)
+        (diary-hebrew-birthday): New functions.
+
+2011-03-01  Glenn Morris  <rgm@gnu.org>
+
+        * dired.el (dired-safe-switches-p): Beef it up.
+        (dired-actual-switches): Use it for the safe-local prop.  (Bug#3230)
+
+2011-03-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * dired.el (dired-safe-switches-p): New function.
+
+2011-03-01  Glenn Morris  <rgm@gnu.org>
+
+        * files.el (dir-locals-collect-variables):
+        Add the ability to exclude subdirectories.  (Bug#8100)
+
+        * dired-x.el (dired-omit-here-always): Add `(subdirs . nil)' to locals.
+
+2011-02-28  Christoph Scholtes  <cschol2112@googlemail.com>
+
+        * ido.el (ido-everywhere): Doc fix.
+        (ido-mode): Doc fix.
+
+2011-02-28  Glenn Morris  <rgm@gnu.org>
+
+        * dired-x.el (dired-guess-shell-alist-default): Use \\', not $.
+
+2011-02-28  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-cmds.el (tramp-append-tramp-buffers): Dump load-path
+        shadows.
+
+2011-02-28  Antoine Levitt  <antoine.levitt@gmail.com>  (tiny change)
+
+        * dired-x.el (dired-guess-shell-alist-default): Add rar and 7z.
+
+2011-02-28  Juanma Barranquero  <lekktu@gmail.com>
+
+        * emacs-lisp/pcase.el (pcase, pcase--u1, pcase--q1):
+        Fix typos in docstrings.
+
+2011-02-28  Stephen Berman  <stephen.berman@gmx.net>
+
+        * dired-aux.el (dired-update-file-line):
+        Fix 2010-11-09 change.  (Bug#8131)
+
+2011-02-28  Eli Zaretskii  <eliz@gnu.org>
+
+        * international/mule-cmds.el (set-default-coding-systems): Use the
+        -unix variant of encoding in default-keyboard-coding-system.
+        (Bug#8122)
+
+2011-02-27  Chong Yidong  <cyd@stupidchicken.com>
+
+        * facemenu.el (list-colors-display): Use with-help-window (Bug#8048).
+
+2011-02-27  Prestoo Ten  <prestooten@gmail.com>  (tiny change)
+
+        * term/screen.el: New file (Bug#2650).
+
+2011-02-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/pcase.el (pcase--if): Try to invert test to reduce depth.
+        (pcase-mutually-exclusive-predicates): New var.
+        (pcase--split-consp, pcase--split-pred): Use it.
+        (pcase--split-equal, pcase--split-member): When splitting against
+        a pure predicate, run it to know the outcome.
+        (pcase--u1): Mark vars that are actually used.
+        (pcase--q1): Avoid introducing unused vars.
+
+2011-02-27  Jay Belanger  <jay.p.belanger@gmail.com>
+
+        * calc/calc-ext.el (calc-init-extensions):
+        Autoload `calc-l-prefix-help' instead of `calc-ul-prefix-help'.
+
+        * calc/calc-math.el (calcFunc-log10): Don't signal an error in
+        symbolic mode.
+
+        * calc/calc-vec.el (calcFunc-subscr): Return nil if the first
+        argument is a variable.
+
+2011-02-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/assoc.el: Remove misleading `sort' (bug#8126).
+        (aput, adelete, amake): Replace `eval' -> `symbol-value'.
+        Suggested by Michael Heerdegen <michael_heerdegen@web.de>.
+
+2011-02-25  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * password-cache.el (password-in-cache-p): Convenience function to
+        check if a key is in the cache, even if the value is nil.
+
+2011-02-25  Jambunathan K  <kjambunathan@gmail.com>
+
+        * emacs-lisp/package-x.el (package--archive-contents-from-url)
+        (package--archive-contents-from-file): New functions.
+        (package-update-news-on-upload): New var.
+        (package-upload-buffer-internal): Extract archive-contents from
+        package-archive-upload-base if it is not found at archive-url.
+        Obey package-update-news-on-upload.
+        (package-upload-buffer, package-upload-file): Doc fix.
+
 2011-02-24  Glenn Morris  <rgm@gnu.org>
 
         * files-x.el (modify-dir-local-variable): Handle dir-locals from
@@ -1461,8 +1575,7 @@
         (allout-command-prefix) (allout-prefixed-keybindings)
         (allout-unprefixed-keybindings):
         Use allout-compose-and-institute-keymap to process the bindings.
-        (allout-unprefixed-keybindings): Remove extraneous '?' question
-        marks.
+        (allout-unprefixed-keybindings): Remove extraneous '?' question marks.
         (allout-prefixed-keybindings): Elide binding to (prefixed) \C-h -
         user can customize if they want to use that binding.
         Bind allout-copy-topic-as-kill to (prefixed) \M-k.
@@ -1471,14 +1584,12 @@
         (allout-hotspot-key-handler): Remove attempt to resolve the key
         through the literal key-string lookup on allout-keybindings-list.
         That probably hasn't worked for a Long Time, and removal of
-        allout-keybindings-list further simplifies the keybindings
-        situation.
+        allout-keybindings-list further simplifies the keybindings situation.
         (allout-pre-command-business): Use allout-mode-map-value instead
         of allout-mode-map.
         (allout-preempt-trailing-ctrl-h): Remove.  The user can customize
         the bindings if they want to use a keybinding having a trailing
-        \C-h.  No deprecation needed since this feature was never in a
-        release.
+        \C-h.  No deprecation needed since this feature was never in a release.
         (allout-keybindings-list): Remove.  It's not been useful for a
         while.  (See allout-hotspot-key-handler changes, above.)
         (produce-allout-mode-map): Remove.  Consolidate into
@@ -2660,7 +2771,7 @@
         this original name from `bookmark-name-from-record' reverting part
         of 2010-12-08T08:09:27Z!kfogel@red-bean.com / kfogel@red-bean.com-20101208080927-5j9jqnb2xvcw4ogm.
         As Drew Adams pointed out, there was no reason to cause churn for
-        third-party callers.
+        third-party callers.  (Bug#7609)
 
 2010-12-12  Alan Mackenzie  <acm@muc.de>
 
@@ -3006,7 +3117,6 @@
 
         * net/tramp-cmds.el: Remove solved todo item.
 
-        * net/tramp-efs.el:
         * net/tramp-ftp.el:
         * net/tramp-gvfs.el:
         * net/tramp-gw.el:
@@ -4620,7 +4730,7 @@
 
 2010-10-24  Michael McNamara  <mac@mail.brushroad.com>
 
-        * verilog-mode.el (verilog-directive-re): Make this variable
+        * progmodes/verilog-mode.el (verilog-directive-re): Make this variable
         auto-built for efficiency of execution and updating.
         (verilog-extended-complete-re): Support 'pure' fucntion & task
         declarations (these have no bodies).
@@ -4654,7 +4764,7 @@
 
 2010-10-24  Wilson Snyder  <wsnyder@wsnyder.org>
 
-        * verilog-mode.el (verilog-auto-inst, verilog-gate-ios)
+        * progmodes/verilog-mode.el (verilog-auto-inst, verilog-gate-ios)
         (verilog-gate-keywords, verilog-read-sub-decls)
         (verilog-read-sub-decls-gate, verilog-read-sub-decls-gate-ios)
         (verilog-read-sub-decls-line, verilog-read-sub-decls-sig): Support
@@ -6251,8 +6361,8 @@
         Use `tramp-compat-funcall'.
 
         * net/tramp.el (tramp-process-actions):
-        * net/tramp-gvfs.el (tramp-handle-vc-registered):
-        * net/tramp-sh.el (tramp-gvfs-handler-askquestion)
+        * net/tramp-gvfs.el (tramp-gvfs-handler-askquestion):
+        * net/tramp-sh.el (tramp-handle-vc-registered)
         (tramp-get-remote-stat, tramp-get-remote-readlink):
         Use `tramp-compat-with-temp-message'.
 
@@ -7299,48 +7409,6 @@
 
         * whitespace.el (whitespace-style): Adjust type declaration.
 
-2010-08-26  Magnus Henoch  <magnus.henoch@gmail.com>
-
-        * net/tramp-gvfs.el (tramp-gvfs-handle-copy-file): Do not pass
-        empty argument to gvfs-copy.
-
-2010-08-26  Chong Yidong  <cyd@stupidchicken.com>
-
-        * net/tramp-compat.el (tramp-compat-delete-file): Rewrite to
-        handle new TRASH arg of `delete-file'.
-
-2010-08-26  Christian Lynbech  <christian.lynbech@tieto.com>  (tiny change)
-
-        * net/tramp.el (tramp-handle-insert-directory): Don't use
-        `forward-word', its default syntax could be changed.
-
-2010-08-26  Toru TSUNEYOSHI  <t_tuneyosi@hotmail.com>
-            Michael Albinus  <michael.albinus@gmx.de>
-
-        Implement compression for inline methods.
-
-        * net/tramp.el (tramp-inline-compress-start-size): New defcustom.
-        (tramp-copy-size-limit): Allow also nil.
-        (tramp-inline-compress-commands): New defconst.
-        (tramp-find-inline-compress, tramp-get-inline-compress)
-        (tramp-get-inline-coding): New defuns.
-        (tramp-get-remote-coding, tramp-get-local-coding): Remove,
-        replaced by `tramp-get-inline-coding'.
-        (tramp-handle-file-local-copy, tramp-handle-write-region)
-        (tramp-method-out-of-band-p): Use `tramp-get-inline-coding'.
-
-2010-08-26  Noah Lavine  <noah549@gmail.com>  (tiny change)
-
-        Detect ssh 'ControlMaster' argument automatically in some cases.
-
-        * net/tramp.el (tramp-detect-ssh-controlmaster): New defun.
-        (tramp-default-method): Use it.
-
-2010-08-26  Karel Klíč  <kklic@redhat.com>
-
-        * net/tramp.el (tramp-file-name-for-operation):
-        Add file-selinux-context.
-
 2010-08-26  Łukasz Stelmach  <lukasz.stelmach@iem.pw.edu.pl>  (tiny change)
 
         * play/cookie1.el (read-cookie): Fix off-by-one error (bug#6921).
@@ -7372,210 +7440,14 @@
 
         Sync with Tramp 2.1.19.
 
-        * net/tramp-cmds.el (tramp-cleanup-all-connections)
-        (tramp-reporter-dump-variable, tramp-load-report-modules)
-        (tramp-append-tramp-buffers): Use `tramp-compat-funcall'.
-        (tramp-bug): Recommend setting of `tramp-verbose' to 9.
-
-        * net/tramp-compat.el (top): Do not autoload
-        `tramp-handle-file-remote-p'.  Load tramp-util.el and tramp-vc.el
-        only when `start-file-process' is not bound.
-        (byte-compile-not-obsolete-vars): Define if not bound.
-        (tramp-compat-funcall): New defmacro.
-        (tramp-compat-line-beginning-position)
-        (tramp-compat-line-end-position)
-        (tramp-compat-temporary-file-directory)
-        (tramp-compat-make-temp-file, tramp-compat-file-attributes)
-        (tramp-compat-copy-file, tramp-compat-copy-directory)
-        (tramp-compat-delete-file, tramp-compat-delete-directory)
-        (tramp-compat-number-sequence, tramp-compat-process-running-p):
-        Use it.
-        (tramp-advice-file-expand-wildcards): Do not use
-        `tramp-handle-file-remote-p'.
-        (tramp-compat-make-temp-file): Simplify fallback implementation.
-        (tramp-compat-copy-file): Add PRESERVE-SELINUX-CONTEXT.
-        (tramp-compat-copy-tree): Remove function.
-        (tramp-compat-delete-file): New defun.
-        (tramp-compat-delete-directory): Provide implementation for older
-        Emacsen.
-        (tramp-compat-file-attributes): Handle only
-        `wrong-number-of-arguments' error.
+        * net/tramp-gvfs.el (tramp-gvfs-handle-write-region): Protect
+        deleting tmpfile.
+        (tramp-gvfs-maybe-open-connection): Use `tramp-compat-funcall'.
 
-        * net/tramp-fish.el (tramp-fish-handle-copy-file):
-        Add PRESERVE_SELINUX_CONTEXT.
-        (tramp-fish-handle-delete-file): Add TRASH arg.
-        (tramp-fish-handle-directory-files-and-attributes):
-        Do not use `tramp-fish-handle-file-attributes.
-        (tramp-fish-handle-file-local-copy)
-        (tramp-fish-handle-insert-file-contents)
-        (tramp-fish-maybe-open-connection): Use `with-progress-reporter'.
-
-        * net/tramp-gvfs.el (top): Require url-util.
-        (tramp-gvfs-mount-point): Remove.
-        (tramp-gvfs-file-name-handler-alist): Add `file-selinux-context'
-        and `set-file-selinux-context'.
-        (tramp-gvfs-stringify-dbus-message, tramp-gvfs-send-command)
-        (tramp-gvfs-handle-file-selinux-context)
-        (tramp-gvfs-handle-set-file-selinux-context): New defuns.
-        (with-tramp-dbus-call-method): Format trace message.
-        (tramp-gvfs-handle-copy-file): Handle PRESERVE-SELINUX-CONTEXT.
-        (tramp-gvfs-handle-copy-file, tramp-gvfs-handle-rename-file):
-        Implement backup call, when operation on local files fails.
-        Use progress reporter.  Flush properties of changed files.
-        (tramp-gvfs-handle-delete-file): Add TRASH arg.
-        Use `tramp-compat-delete-file'.
-        (tramp-gvfs-handle-expand-file-name): Expand "~/".
-        (tramp-gvfs-handle-make-directory): Make more traces.
-        (tramp-gvfs-handle-write-region): Protect deleting tmpfile.
-        (tramp-gvfs-url-file-name): Hexify file name in url.
-        (tramp-gvfs-fuse-file-name): Take also prefix (like dav shares)
-        into account for the resulting file name.
-        (tramp-gvfs-handler-askquestion): Preserve current message, in
-        order to let progress reporter continue afterwards.  (Bug#6257)
-        Return dummy mountpoint, when the answer is "no".
-        See `tramp-gvfs-maybe-open-connection'.
-        (tramp-gvfs-handler-mounted-unmounted)
-        (tramp-gvfs-connection-mounted-p): Test also for new mountspec
-        attribute "default_location".  Set "prefix" property.
-        Handle default-location.
-        (tramp-gvfs-mount-spec): Return both prefix and mountspec.
-        (tramp-gvfs-maybe-open-connection): Test, whether mountpoint
-        exists.  Raise an error, if not (due to a corresponding answer
-        "no" in interactive questions, for example).
-        Use `tramp-compat-funcall'.
-
-        * net/tramp-imap.el (top): Autoload `epg-make-context'.
-        (tramp-imap-handle-copy-file): Add PRESERVE-SELINUX-CONTEXT.
-        (tramp-imap-do-copy-or-rename-file)
-        (tramp-imap-handle-insert-file-contents)
-        (tramp-imap-handle-file-local-copy): Use `with-progress-reporter'.
-        (tramp-imap-handle-delete-file): Add TRASH arg.
-
-        * net/tramp-smb.el (tramp-smb-handle-copy-file):
-        Add PRESERVE-SELINUX-CONTEXT.
-        (tramp-smb-handle-copy-file)
-        (tramp-smb-handle-file-local-copy, tramp-smb-handle-rename-file)
-        (tramp-smb-handle-write-region, tramp-smb-maybe-open-connection):
-        Use `with-progress-reporter'.
-        (tramp-smb-handle-delete-file): Add TRASH arg.
-
-        * net/tramp.el (tramp-methods): Move hostname to the end in all
-        ssh `tramp-login-args'.  Add `tramp-async-args' attribute where
-        appropriate.
-        (tramp-verbose): Describe verbose level 9.
-        (tramp-completion-function-alist)
-        (tramp-file-name-regexp, tramp-chunksize)
-        (tramp-local-coding-commands, tramp-remote-coding-commands)
-        (with-connection-property, tramp-completion-mode-p)
-        (tramp-action-process-alive, tramp-action-out-of-band)
-        (tramp-check-for-regexp, tramp-file-name-p, tramp-equal-remote)
-        (tramp-exists-file-name-handler): Fix docstring.
-        (tramp-remote-process-environment): Use `format' instead of
-        `concat'.  Protect version string by apostroph.
-        (tramp-shell-prompt-pattern): Do not use a shy group in case of
-        XEmacs.
-        (tramp-file-name-regexp-unified)
-        (tramp-completion-file-name-regexp-unified): On W32 systems, do
-        not regard the volume letter as remote filename.  (Bug#5447)
-        (tramp-perl-file-attributes)
-        (tramp-perl-directory-files-and-attributes): Don't pass "$3".
-        (tramp-vc-registered-read-file-names): Read input as
-        here-document, otherwise the command could exceed maximum length
-        of command line.
-        (tramp-file-name-handler-alist): Add `file-selinux-context' and
-        `set-file-selinux-context'.
-        (tramp-debug-message): Add `tramp-compat-funcall' to ignored
-        backtrace functions.
-        (tramp-error-with-buffer): Don't show the connection buffer when
-        we are in completion mode.
-        (tramp-progress-reporter-update, tramp-remote-selinux-p)
-        (tramp-handle-file-selinux-context)
-        (tramp-handle-set-file-selinux-context, tramp-process-sentinel)
-        (tramp-connectable-p, tramp-open-shell, tramp-get-remote-trash):
-        New defuns.
-        (with-progress-reporter): New defmacro.
-        (tramp-debug-outline-regexp): New defconst.
-        (top, tramp-rfn-eshadow-setup-minibuffer)
-        (tramp-rfn-eshadow-update-overlay, tramp-handle-set-file-times)
-        (tramp-handle-dired-compress-file, tramp-handle-shell-command)
-        (tramp-completion-mode-p, tramp-check-for-regexp)
-        (tramp-open-connection-setup-interactive-shell)
-        (tramp-compute-multi-hops, tramp-read-passwd, tramp-clear-passwd)
-        (tramp-time-diff, tramp-coding-system-change-eol-conversion)
-        (tramp-set-process-query-on-exit-flag, tramp-unload-tramp):
-        Use `tramp-compat-funcall'.
-        (tramp-handle-make-symbolic-link): Flush file properties.
-        (tramp-handle-load, tramp-handle-file-local-copy)
-        (tramp-handle-insert-file-contents, tramp-handle-write-region)
-        (tramp-handle-vc-registered, tramp-maybe-send-script)
-        (tramp-find-shell): Use `with-progress-reporter'.
-        (tramp-do-file-attributes-with-stat): Add space in format string,
-        in order to work around a bug in pdksh.  Reported by Gilles Pion
-        <gpion@lfdj.com>.
-        (tramp-handle-verify-visited-file-modtime): Do not send a command
-        when the connection is not established.
-        (tramp-handle-set-file-times): Simplify the check for utc.
-        (tramp-handle-directory-files-and-attributes)
-        (tramp-get-remote-path): Use `copy-tree'.
-        (tramp-completion-handle-file-name-all-completions): Ensure, that
-        non remote files are still checked.  Oops.
-        (tramp-handle-copy-file, tramp-do-copy-or-rename-file):
-        Handle PRESERVE-SELINUX-CONTEXT.
-        (tramp-do-copy-or-rename-file): Add progress reporter.
-        (tramp-do-copy-or-rename-file-directly): Do not use
-        `tramp-handle-file-remote-p'.
-        (tramp-do-copy-or-rename-file-out-of-band):
-        Use `tramp-compat-delete-directory'.
-        (tramp-do-copy-or-rename-file-out-of-band)
-        (tramp-compute-multi-hops, tramp-maybe-open-connection):
-        Use `format-spec-make'.
-        (tramp-handle-delete-file): Add TRASH arg.
-        (tramp-handle-dired-uncache): Flush directory cache, not only file
-        cache.
-        (tramp-handle-expand-file-name)
+        * net/tramp.el (tramp-handle-expand-file-name)
         (tramp-completion-handle-file-name-all-completions)
         (tramp-completion-handle-file-name-completion):
         Use `tramp-connectable-p'.
-        (tramp-handle-start-file-process): Set connection property "vec".
-        Use it, in order to invalidate file caches.  Check only for
-        `remote-tty' process property.
-        Implement tty setting.  (Bug#4604, Bug#6360)
-        (tramp-file-name-for-operation): Add `call-process-region' and
-        `set-file-selinux-context'.
-        (tramp-find-foreign-file-name-handler)
-        (tramp-advice-make-auto-save-file-name)
-        (tramp-set-auto-save-file-modes): Remove superfluous check for
-        `stringp'.  This is done inside `tramp-tramp-file-p'.
-        (tramp-file-name-handler): Trace 'quit.  Catch the error for some
-        operations when we are in completion mode.  This gives the user
-        the chance to correct the file name in the minibuffer.
-        (tramp-completion-mode-p): Use `non-essential'.
-        (tramp-handle-file-name-all-completions): Backward/ XEmacs
-        compatibility: Use `completion-ignore-case' if
-        `read-file-name-completion-ignore-case' does not exist.
-        (tramp-get-debug-buffer): Use `tramp-debug-outline-regexp'.
-        (tramp-find-shell, tramp-open-connection-setup-interactive-shell):
-        `tramp-open-shell'.
-        (tramp-action-password): Hide password prompt before next run.
-        (tramp-process-actions): Widen connection buffer for the trace.
-        (tramp-open-connection-setup-interactive-shell): Set `remote-tty'
-        process property.  Trace stty settings if `tramp-verbose' >= 9.
-        Apply workaround for IRIX64 bug.  Move argument of last
-        `tramp-send-command' where it belongs to.
-        (tramp-maybe-open-connection): Use `async-args' and `gw-args' in
-        front of `login-args'.
-        (tramp-get-ls-command, tramp-get-ls-command-with-dired): Run tests
-        on "/dev/null" instead of "/".
-        (tramp-get-ls-command-with-dired): Make test for "--dired"
-        stronger.
-        (tramp-set-auto-save-file-modes): Adapt version check.
-        (tramp-set-process-query-on-exit-flag): Fix wrong parentheses.
-        (tramp-handle-process-file): Call the program in a subshell, in
-        order to preserve working directory.
-        (tramp-handle-shell-command): Don't use hard-wired "/bin/sh" but
-        `tramp-remote-sh' from `tramp-methods'.
-        (tramp-get-ls-command): Make test for "--color=never" stronger.
-        (tramp-check-for-regexp): Use (forward-line 1).
 
         * net/trampver.el: Update release number.
 
@@ -9847,9 +9719,8 @@
         * net/tramp-ftp.el (tramp-ftp-file-name-handler):
         Use `delete-file' instead of `tramp-compat-delete-file'.
 
-        * net/tramp-gvfs.el (tramp-gvfs-handle-delete-file): Rename arg.
-        (tramp-gvfs-handle-write-region): Use `delete-file' instead of
-        `tramp-compat-delete-file'.
+        * net/tramp-gvfs.el (tramp-gvfs-handle-write-region): Use
+        `delete-file' instead of `tramp-compat-delete-file'.
 
         * net/tramp-imap.el (tramp-imap-do-copy-or-rename-file):
         Use `delete-file' instead of `tramp-compat-delete-file'.
diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10
index 83ee20fa497..1c2f2b5b015 100644
--- a/lisp/ChangeLog.10
+++ b/lisp/ChangeLog.10
@@ -20591,7 +20591,7 @@
 
         * viper-cmd.el (viper-change-state): Got rid of make-local-hook.
         (viper-special-read-and-insert-char): Make C-m work right in the r
-        comand.
+        command.
         (viper-buffer-search-enable): Fixed format string.
 
         * viper-ex.el (ex-token-alist): Use ex-set-visited-file-name
diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12
index d2f7cab27f0..35572bd6105 100644
--- a/lisp/ChangeLog.12
+++ b/lisp/ChangeLog.12
@@ -10699,9 +10699,6 @@
         output of the next command.  Reported by M Jared Finder
         <jared@hpalace.com>.
 
-        * net/tramp-vc.el (vc-user-login-name): Wrap defadvice with a test
-        for `process-file', in order to let it work for older Emacsen too.
-
 2006-04-17  Ralf Angeli  <angeli@iwi.uni-sb.de>
 
         * textmodes/tex-mode.el (tex-font-lock-match-suscript): New function.
@@ -11678,7 +11675,7 @@
         make underlining work for wide characters.
         (org-goto-map, org-agenda-mode-map, org-mode-map): Explicitly bind
         TAB to `org-cycle', to make sure that no binding in
-        `outline-mode-map' can supercede it.
+        `outline-mode-map' can supersede it.
 
 2006-03-14  Ken Manheimer  <ken.manheimer@gmail.com>
 
@@ -19139,7 +19136,7 @@
         * pgg.el (pgg-decrypt): Passing along PASSPHRASE in call to
         pgg-decrypt-region.
         (pgg-pending-timers): A new hash for tracking the passphrase cache
-        timers, so that new ones supercede old ones.
+        timers, so that new ones supersede old ones.
         (pgg-add-passphrase-to-cache): Rename from
         `pgg-add-passphrase-cache' to reduce confusion (all callers
         changed).  Modified to cancel old timers when new ones are added.
@@ -19225,7 +19222,7 @@
         * pgg.el (pgg-decrypt): Passing along PASSPHRASE in call to
         pgg-decrypt-region.
         (pgg-pending-timers): A new hash for tracking the passphrase cache
-        timers, so that new ones supercede old ones.
+        timers, so that new ones supersede old ones.
         (pgg-add-passphrase-to-cache): Rename from
         `pgg-add-passphrase-cache' to reduce confusion (all callers
         changed).  Modified to cancel old timers when new ones are added.
diff --git a/lisp/ChangeLog.3 b/lisp/ChangeLog.3
index b54580ff0bc..8cafac2c0c4 100644
--- a/lisp/ChangeLog.3
+++ b/lisp/ChangeLog.3
@@ -4906,7 +4906,7 @@
         * two-column.el: Doc fixes.
 
         * loaddefs.el (function-keymap): Definition deleted; this has been
-        superceded by function-key-map.
+        superseded by function-key-map.
 
         * gomoku.el (gomoku-mode-map): Use function key symbols, instead
         of the keypad.el facilities.
@@ -6056,7 +6056,7 @@
         and `fill-column'.  Code now actually sets `left-margin' and
         `fill-column', as advertised.
         * text-mode.el (change-log-mode): Function deleted, since it's
-        been superceded by the one in add-log.el.
+        been superseded by the one in add-log.el.
 
 1992-06-14  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
 
@@ -6070,7 +6070,7 @@
 
 1992-06-12  Jim Blandy  (jimb@pogo.cs.oberlin.edu)
 
-        * isearch-mode.el: New package, which will probably supercede
+        * isearch-mode.el: New package, which will probably supersede
         isearch.el.
         (isearch-mode-map, isearch-mode-meta-map): When initializing
         these, remember that vectors are no longer keymaps.
@@ -10009,7 +10009,7 @@
         display-time-string.
         (rmail-pop-up): Default display-time-hook to automatically retrieve
         new mail if the variable rmail-pop-up is non-nil.
-        (add-clock-handler): Removed; superceded by timer.el.
+        (add-clock-handler): Removed; superseded by timer.el.
 
         * loaddefs.el: Removed add-clock-handler.
 
@@ -10032,7 +10032,7 @@
 
         * loaddefs.el: Autoload for diff.
 
-        * files.el (diff): Superceded by diff.el.
+        * files.el (diff): Superseded by diff.el.
         (diff-switches-function): Still needs to be merged into diff.el.
 
         * diff.el: New file.
diff --git a/lisp/allout.el b/lisp/allout.el
index d881e1177fa..ca72806b7d9 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -339,7 +339,7 @@ The types of elements in the layout specification are:
          -- positive numbers open to the relative depth indicated by the
             number, but do not force already opened subtopics to be closed.
          -- 0 means to close topic -- hide all subitems.
- :   -- repeat spec -- apply the preceeding element to all siblings at
+ :   -- repeat spec -- apply the preceding element to all siblings at
         current level, *up to* those siblings that would be covered by specs
         following the `:' on the list.  Ie, apply to all topics at level but
         trailing ones accounted for by trailing specs.  (Only the first of
@@ -3125,7 +3125,7 @@ situation."
                  nil)
         ;; rationale: if any intervening items were at a lower depth, we
         ;; would now be on the first offspring at the target depth -- ie,
-        ;; the preceeding item (per the search direction) must be at a
+        ;; the preceding item (per the search direction) must be at a
         ;; lesser depth.  that's all we need to check.
         (if backward (allout-next-heading) (allout-previous-heading))
         (if (< allout-recent-depth target-depth)
@@ -4246,7 +4246,7 @@ With a negative argument, the item is shifted out using
 
 With an argument greater than one, shift-in the item but not its
 offspring, making the item into a sibling of its former children,
-and a child of sibling that formerly preceeded it.
+and a child of sibling that formerly preceded it.
 
 You are not allowed to shift the first offspring of a topic
 inwards, because that would yield a \"containment
@@ -5364,7 +5364,7 @@ header and body.  The elements of that list are:
 
       (goto-char start)
       (beginning-of-line)
-      ;; Goto initial topic, and register preceeding stuff, if any:
+      ;; Goto initial topic, and register preceding stuff, if any:
       (if (> (allout-goto-prefix-doublechecked) start)
           ;; First topic follows beginning point -- register preliminary stuff:
           (setq result
diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el
index fcc3ecc1ab1..ec4e902f33d 100644
--- a/lisp/calc/calc-ext.el
+++ b/lisp/calc/calc-ext.el
@@ -1061,7 +1061,7 @@ calc-full-help calc-g-prefix-help calc-help-prefix
 calc-hyperbolic-prefix-help calc-inv-hyp-prefix-help calc-option-prefix-help
 calc-inverse-prefix-help calc-j-prefix-help calc-k-prefix-help
 calc-m-prefix-help calc-r-prefix-help calc-s-prefix-help
-calc-t-prefix-help calc-u-prefix-help calc-ul-prefix-help
+calc-t-prefix-help calc-u-prefix-help calc-l-prefix-help
 calc-v-prefix-help)
 
  ("calc-incom" calc-begin-complex calc-begin-vector calc-comma
diff --git a/lisp/calc/calc-math.el b/lisp/calc/calc-math.el
index 185ed18ed42..92af9263b28 100644
--- a/lisp/calc/calc-math.el
+++ b/lisp/calc/calc-math.el
@@ -1574,7 +1574,7 @@ If this can't be done, return NIL."
          (if calc-infinite-mode
              '(neg (var inf var-inf))
            (math-reject-arg x "*Logarithm of zero")))
-        (calc-symbolic-mode (signal 'inexact-result nil))
+        ;;(calc-symbolic-mode (signal 'inexact-result nil))
         ((Math-numberp x)
          (math-with-extra-prec 2
            (let ((xf (math-float x)))
diff --git a/lisp/calc/calc-vec.el b/lisp/calc/calc-vec.el
index 5dfbc2d51f5..47ef3241b3e 100644
--- a/lisp/calc/calc-vec.el
+++ b/lisp/calc/calc-vec.el
@@ -759,12 +759,13 @@
           (math-reject-arg n "*Index out of range")))))
 
 (defun calcFunc-subscr (mat n &optional m)
-  (setq mat (calcFunc-mrow mat n))
-  (if m
-      (if (math-num-integerp n)
-          (calcFunc-mrow mat m)
-        (calcFunc-mcol mat m))
-    mat))
+  (if (eq (car-safe mat) 'var) nil
+    (setq mat (calcFunc-mrow mat n))
+    (if m
+        (if (math-num-integerp n)
+            (calcFunc-mrow mat m)
+          (calcFunc-mcol mat m))
+      mat)))
 
 ;;; Get the Nth column of a matrix.
 (defun math-mat-col (mat n)
diff --git a/lisp/calendar/cal-hebrew.el b/lisp/calendar/cal-hebrew.el
index f2dfc3c51fe..63e7484e127 100644
--- a/lisp/calendar/cal-hebrew.el
+++ b/lisp/calendar/cal-hebrew.el
@@ -792,6 +792,20 @@ from the cursor position."
 (define-obsolete-function-alias 'list-yahrzeit-dates
   'calendar-hebrew-list-yahrzeits "23.1")
 
+(defun calendar-hebrew-birthday (date year)
+  "Absolute date of the anniversary of Hebrew birth DATE, in Hebrew YEAR."
+  (let ((b-day (calendar-extract-day date))
+        (b-month (calendar-extract-month date))
+        (b-year (calendar-extract-year date)))
+    ;; If it's Adar in a normal Hebrew year or Adar II in a Hebrew leap year...
+    (if (= b-month (calendar-hebrew-last-month-of-year b-year))
+        ;; ...then use the same day in last month of Hebrew year.
+        (calendar-hebrew-to-absolute
+         (list (calendar-hebrew-last-month-of-year year) b-day year))
+      ;; Else use the normal anniversary of the birth date,
+      ;; or the corresponding day in years without that date.
+      (+ (calendar-hebrew-to-absolute (list b-month 1 year)) b-day -1))))
+
 (defvar date)
 
 ;; To be called from diary-list-sexp-entries, where DATE is bound.
@@ -800,6 +814,37 @@ from the cursor position."
   "Hebrew calendar equivalent of date diary entry."
   (format "Hebrew date (until sunset): %s" (calendar-hebrew-date-string date)))
 
+(defvar entry)
+(declare-function diary-ordinal-suffix "diary-lib" (n))
+
+;;;###diary-autoload
+(defun diary-hebrew-birthday (month day year &optional after-sunset)
+  "Hebrew birthday diary entry.
+Entry applies if date is birthdate (MONTH DAY YEAR), or the day before.
+The order of the input parameters changes according to
+`calendar-date-style' (e.g. to DAY MONTH YEAR in the European style).
+
+Assumes the associated diary entry is the name of the person.
+
+Although the date of birth is specified by the *civil* calendar,
+this function determines the proper Hebrew calendar birthday.
+If the optional argument AFTER-SUNSET is non-nil, this means the
+birth occurred after local sunset on the given civil date.
+In this case, the following civil date corresponds to the Hebrew birthday."
+  (let* ((h-date (calendar-hebrew-from-absolute
+                  (+ (calendar-absolute-from-gregorian
+                      (diary-make-date month day year))
+                     (if after-sunset 1 0))))
+         (h-year (calendar-extract-year h-date))     ; birth-day
+         (d (calendar-absolute-from-gregorian date)) ; today
+         (h-yr (calendar-extract-year (calendar-hebrew-from-absolute d)))
+         (age (- h-yr h-year))          ; current H year - birth H-year
+         (b-date (calendar-hebrew-birthday h-date h-yr)))
+    (and (> age 0) (memq b-date (list d (1+ d)))
+         (format "%s's %d%s Hebrew birthday%s" entry age
+                 (diary-ordinal-suffix age)
+                 (if (= b-date d) "" " (evening)")))))
+
 ;;;###diary-autoload
 (defun diary-hebrew-omer (&optional mark)
   "Omer count diary entry.
@@ -829,8 +874,6 @@ use when highlighting the day in the calendar."
 ;;;###diary-autoload
 (define-obsolete-function-alias 'diary-omer 'diary-hebrew-omer "23.1")
 
-(defvar entry)
-
 (autoload 'diary-make-date "diary-lib")
 
 (declare-function diary-ordinal-suffix "diary-lib" (n))
diff --git a/lisp/cedet/semantic/analyze.el b/lisp/cedet/semantic/analyze.el
index 8a0fbd5cc37..5cdd1577a6e 100644
--- a/lisp/cedet/semantic/analyze.el
+++ b/lisp/cedet/semantic/analyze.el
@@ -100,7 +100,7 @@ Usually bound to the dimension of a single symbol or command.")
            :type list
            :documentation "List of tags defining local text.
 This can be nil, or a list where the last element can be a string
-representing text that may be incomplete.  Preceeding elements
+representing text that may be incomplete.  Preceding elements
 must be semantic tags representing variables or functions
 called in a dereference sequence.")
    (prefixclass :initarg :prefixclass
diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el
index 31e92724a00..47cb722e005 100644
--- a/lisp/cedet/semantic/complete.el
+++ b/lisp/cedet/semantic/complete.el
@@ -1264,7 +1264,7 @@ inserted into the current context.")
 ;; generated by a collector.  This format is in semanticdb search
 ;; form.  This vaguely standard form is a bit challenging to navigate
 ;; because the tags do not contain buffer info, but the file associated
-;; with the tags preceed the tag in the list.
+;; with the tags precedes the tag in the list.
 ;;
 ;; Basic displayors don't care, and can strip the results.
 ;; Advanced highlighting displayors need to know when they need
diff --git a/lisp/cedet/semantic/edit.el b/lisp/cedet/semantic/edit.el
index ef206fd3122..7f7e82a95c2 100644
--- a/lisp/cedet/semantic/edit.el
+++ b/lisp/cedet/semantic/edit.el
@@ -426,7 +426,7 @@ See `semantic-edits-change-leaf-tag' for details on parents."
             ;; confirmed as the lineage of `overlapped-tags'
             ;; which must have a value by now.
 
-            ;; Loop over the search list to find the preceeding CDR.
+            ;; Loop over the search list to find the preceding CDR.
             ;; Fortunatly, (car overlapped-tags) happens to be
             ;; the first tag positionally.
             (let ((tokstart (semantic-tag-start (car overlapped-tags))))
@@ -874,7 +874,7 @@ pre-positioned to a convenient location."
             ))
       (message "To Remove Middle Tag: (%s)"
                (semantic-format-tag-name first)))
-    ;; Find in the cache the preceeding tag
+    ;; Find in the cache the preceding tag
     (while (and cachestart (not (eq first (car (cdr cachestart)))))
       (setq cachestart (cdr cachestart)))
     ;; Find the last tag
diff --git a/lisp/cedet/semantic/format.el b/lisp/cedet/semantic/format.el
index ecd03ccec73..fa6e7517624 100644
--- a/lisp/cedet/semantic/format.el
+++ b/lisp/cedet/semantic/format.el
@@ -296,7 +296,7 @@ local definitions."
 
 (define-overloadable-function semantic-format-tag-canonical-name (tag &optional parent color)
   "Return a canonical name for TAG.
-A canonical name includes the names of any parents or namespaces preceeding
+A canonical name includes the names of any parents or namespaces preceding
 the tag.
 Optional argument PARENT is the parent type if TAG is a detail.
 Optional argument COLOR means highlight the prototype with font-lock colors.")
diff --git a/lisp/cedet/semantic/java.el b/lisp/cedet/semantic/java.el
index 4489d0ffae5..71a205386db 100644
--- a/lisp/cedet/semantic/java.el
+++ b/lisp/cedet/semantic/java.el
@@ -256,7 +256,7 @@ Optional argument COLOR indicates that color should be mixed in."
 (define-mode-local-override semantic-documentation-for-tag
   java-mode (&optional tag nosnarf)
   "Find documentation from TAG and return it as a clean string.
-Java have documentation set in a comment preceeding TAG's definition.
+Java has documentation set in a comment preceding TAG's definition.
 Attempt to strip out comment syntactic sugar, unless optional argument
 NOSNARF is non-nil.
 If NOSNARF is 'lex, then return the semantic lex token."
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 986c9edfd2d..c533c81be0e 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -1025,9 +1025,9 @@ See Info node `(emacs)Subdir switches' for more details."
   ;; Keeps any marks that may be present in column one (doing this
   ;; here is faster than with dired-add-entry's optional arg).
   ;; Does not update other dired buffers.  Use dired-relist-entry for that.
-  (let ((char (following-char))
-        (opoint (line-beginning-position))
-        (buffer-read-only))
+  (let* ((opoint (line-beginning-position))
+         (char (char-after opoint))
+         (buffer-read-only))
     (delete-region opoint (progn (forward-line 1) (point)))
     (if file
         (progn
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index ce07676fc99..9941c7a0db5 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -786,6 +786,7 @@ See also `dired-enable-local-variables'."
                'hack-dir-local-variables-non-file-buffer "24.1")
 
 ;; Not sure this is worth having a dedicated command for...
+;; See the more general features in files-x.el.
 (defun dired-omit-here-always ()
   "Create `dir-locals-file' setting `dired-omit-mode' to t in `dired-mode'.
 If in a Dired buffer, reverts it."
@@ -798,7 +799,9 @@ replace it with a dir-locals-file `./%s'"
   (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")
+      (insert "\
+\((dired-mode . ((subdirs . nil)
+                (dired-omit-mode . t))))\n")
       (write-file dir-locals-file))
     ;; Run extra-hooks and revert directory.
     (when (derived-mode-p 'dired-mode)
@@ -845,7 +848,7 @@ replace it with a dir-locals-file `./%s'"
 
 (defvar dired-guess-shell-alist-default
   (list
-   (list "\\.tar$"
+   (list "\\.tar\\'"
          '(if dired-guess-shell-gnutar
               (concat dired-guess-shell-gnutar " xvf")
             "tar xvf")
@@ -863,7 +866,7 @@ replace it with a dir-locals-file `./%s'"
 
    ;; REGEXPS for compressed archives must come before the .Z rule to
    ;; be recognized:
-   (list "\\.tar\\.Z$"
+   (list "\\.tar\\.Z\\'"
          ;; Untar it.
          '(if dired-guess-shell-gnutar
               (concat dired-guess-shell-gnutar " zxvf")
@@ -873,7 +876,7 @@ replace it with a dir-locals-file `./%s'"
                   " " dired-guess-shell-znew-switches))
 
    ;; gzip'ed archives
-   (list "\\.t\\(ar\\.\\)?gz$"
+   (list "\\.t\\(ar\\.\\)?gz\\'"
          '(if dired-guess-shell-gnutar
               (concat dired-guess-shell-gnutar " zxvf")
             (concat "gunzip -qc * | tar xvf -"))
@@ -893,7 +896,7 @@ replace it with a dir-locals-file `./%s'"
             (concat "gunzip -qc * | tar tvf -")))
 
    ;; bzip2'ed archives
-   (list "\\.t\\(ar\\.bz2\\|bz\\)$"
+   (list "\\.t\\(ar\\.bz2\\|bz\\)\\'"
          "bunzip2 -c * | tar xvf -"
          ;; Extract files into a separate subdirectory
          '(concat "mkdir " (file-name-sans-extension file)
@@ -903,7 +906,7 @@ replace it with a dir-locals-file `./%s'"
          "bunzip2")
 
    ;; xz'ed archives
-   (list "\\.t\\(ar\\.\\)?xz$"
+   (list "\\.t\\(ar\\.\\)?xz\\'"
          "unxz -c * | tar xvf -"
          ;; Extract files into a separate subdirectory
          '(concat "mkdir " (file-name-sans-extension file)
@@ -912,94 +915,96 @@ replace it with a dir-locals-file `./%s'"
          ;; Optional decompression.
          "unxz")
 
-   '("\\.shar\\.Z$" "zcat * | unshar")
-   '("\\.shar\\.g?z$" "gunzip -qc * | unshar")
+   '("\\.shar\\.Z\\'" "zcat * | unshar")
+   '("\\.shar\\.g?z\\'" "gunzip -qc * | unshar")
 
-   '("\\.e?ps$" "ghostview" "xloadimage" "lpr")
-   (list "\\.e?ps\\.g?z$" "gunzip -qc * | ghostview -"
+   '("\\.e?ps\\'" "ghostview" "xloadimage" "lpr")
+   (list "\\.e?ps\\.g?z\\'" "gunzip -qc * | ghostview -"
          ;; Optional decompression.
          '(concat "gunzip" (if dired-guess-shell-gzip-quiet " -q")))
-   (list "\\.e?ps\\.Z$" "zcat * | ghostview -"
+   (list "\\.e?ps\\.Z\\'" "zcat * | ghostview -"
          ;; Optional conversion to gzip format.
          '(concat "znew" (if dired-guess-shell-gzip-quiet " -q")
                   " " dired-guess-shell-znew-switches))
 
-   '("\\.patch$" "cat * | patch")
-   (list "\\.patch\\.g?z$" "gunzip -qc * | patch"
+   '("\\.patch\\'" "cat * | patch")
+   (list "\\.patch\\.g?z\\'" "gunzip -qc * | patch"
          ;; Optional decompression.
          '(concat "gunzip" (if dired-guess-shell-gzip-quiet " -q")))
-   (list "\\.patch\\.Z$" "zcat * | patch"
+   (list "\\.patch\\.Z\\'" "zcat * | patch"
          ;; Optional conversion to gzip format.
          '(concat "znew" (if dired-guess-shell-gzip-quiet " -q")
                   " " dired-guess-shell-znew-switches))
 
    ;; The following four extensions are useful with dired-man ("N" key)
-   (list "\\.\\(?:[0-9]\\|man\\)$" '(progn (require 'man)
+   (list "\\.\\(?:[0-9]\\|man\\)\\'" '(progn (require 'man)
                                            (if (Man-support-local-filenames)
                                                "man -l"
                                              "cat * | tbl | nroff -man -h")))
-   (list "\\.\\(?:[0-9]\\|man\\)\\.g?z$" '(progn (require 'man)
+   (list "\\.\\(?:[0-9]\\|man\\)\\.g?z\\'" '(progn (require 'man)
                                                  (if (Man-support-local-filenames)
                                                      "man -l"
                                                    "gunzip -qc * | tbl | nroff -man -h"))
          ;; Optional decompression.
          '(concat "gunzip" (if dired-guess-shell-gzip-quiet " -q")))
-   (list "\\.[0-9]\\.Z$" '(progn (require 'man)
+   (list "\\.[0-9]\\.Z\\'" '(progn (require 'man)
                                  (if (Man-support-local-filenames)
                                      "man -l"
                                    "zcat * | tbl | nroff -man -h"))
          ;; Optional conversion to gzip format.
          '(concat "znew" (if dired-guess-shell-gzip-quiet " -q")
                   " " dired-guess-shell-znew-switches))
-   '("\\.pod$" "perldoc" "pod2man * | nroff -man")
-
-   '("\\.dvi$" "xdvi" "dvips")          ; preview and printing
-   '("\\.au$" "play")                   ; play Sun audiofiles
-   '("\\.mpe?g$\\|\\.avi$" "xine -p")
-   '("\\.ogg$" "ogg123")
-   '("\\.mp3$" "mpg123")
-   '("\\.wav$" "play")
-   '("\\.uu$" "uudecode")               ; for uudecoded files
-   '("\\.hqx$" "mcvert")
-   '("\\.sh$" "sh")                     ; execute shell scripts
-   '("\\.xbm$" "bitmap")                ; view X11 bitmaps
-   '("\\.gp$" "gnuplot")
-   '("\\.p[bgpn]m$" "xloadimage")
-   '("\\.gif$" "xloadimage")            ; view gif pictures
-   '("\\.tif$" "xloadimage")
-   '("\\.png$" "display")               ; xloadimage 4.1 doesn't grok PNG
-   '("\\.jpe?g$" "xloadimage")
-   '("\\.fig$" "xfig")                  ; edit fig pictures
-   '("\\.out$" "xgraph")                ; for plotting purposes.
-   '("\\.tex$" "latex" "tex")
-   '("\\.texi\\(nfo\\)?$" "makeinfo" "texi2dvi")
-   '("\\.pdf$" "xpdf")
-   '("\\.doc$" "antiword" "strings")
-   '("\\.rpm$" "rpm -qilp" "rpm -ivh")
-   '("\\.dia$" "dia")
-   '("\\.mgp$" "mgp")
+   '("\\.pod\\'" "perldoc" "pod2man * | nroff -man")
+
+   '("\\.dvi\\'" "xdvi" "dvips")                ; preview and printing
+   '("\\.au\\'" "play")                 ; play Sun audiofiles
+   '("\\.mpe?g\\'\\|\\.avi\\'" "xine -p")
+   '("\\.ogg\\'" "ogg123")
+   '("\\.mp3\\'" "mpg123")
+   '("\\.wav\\'" "play")
+   '("\\.uu\\'" "uudecode")             ; for uudecoded files
+   '("\\.hqx\\'" "mcvert")
+   '("\\.sh\\'" "sh")                   ; execute shell scripts
+   '("\\.xbm\\'" "bitmap")              ; view X11 bitmaps
+   '("\\.gp\\'" "gnuplot")
+   '("\\.p[bgpn]m\\'" "xloadimage")
+   '("\\.gif\\'" "xloadimage")          ; view gif pictures
+   '("\\.tif\\'" "xloadimage")
+   '("\\.png\\'" "display")             ; xloadimage 4.1 doesn't grok PNG
+   '("\\.jpe?g\\'" "xloadimage")
+   '("\\.fig\\'" "xfig")                        ; edit fig pictures
+   '("\\.out\\'" "xgraph")              ; for plotting purposes.
+   '("\\.tex\\'" "latex" "tex")
+   '("\\.texi\\(nfo\\)?\\'" "makeinfo" "texi2dvi")
+   '("\\.pdf\\'" "xpdf")
+   '("\\.doc\\'" "antiword" "strings")
+   '("\\.rpm\\'" "rpm -qilp" "rpm -ivh")
+   '("\\.dia\\'" "dia")
+   '("\\.mgp\\'" "mgp")
 
    ;; Some other popular archivers.
-   (list "\\.zip$" "unzip" "unzip -l"
+   (list "\\.zip\\'" "unzip" "unzip -l"
          ;; Extract files into a separate subdirectory
          '(concat "unzip" (if dired-guess-shell-gzip-quiet " -q")
                   " -d " (file-name-sans-extension file)))
-   '("\\.zoo$" "zoo x//")
-   '("\\.lzh$" "lharc x")
-   '("\\.arc$" "arc x")
-   '("\\.shar$" "unshar")
+   '("\\.zoo\\'" "zoo x//")
+   '("\\.lzh\\'" "lharc x")
+   '("\\.arc\\'" "arc x")
+   '("\\.shar\\'" "unshar")
+   '("\\.rar\\'" "unrar x")
+   '("\\.7z\\'" "7z x")
 
    ;; Compression.
-   (list "\\.g?z$" '(concat "gunzip" (if dired-guess-shell-gzip-quiet " -q")))
-   (list "\\.dz$" "dictunzip")
-   (list "\\.bz2$" "bunzip2")
-   (list "\\.xz$" "unxz")
-   (list "\\.Z$" "uncompress"
+   (list "\\.g?z\\'" '(concat "gunzip" (if dired-guess-shell-gzip-quiet " -q")))
+   (list "\\.dz\\'" "dictunzip")
+   (list "\\.bz2\\'" "bunzip2")
+   (list "\\.xz\\'" "unxz")
+   (list "\\.Z\\'" "uncompress"
          ;; Optional conversion to gzip format.
          '(concat "znew" (if dired-guess-shell-gzip-quiet " -q")
                   " " dired-guess-shell-znew-switches))
 
-   '("\\.sign?$" "gpg --verify"))
+   '("\\.sign?\\'" "gpg --verify"))
 
   "Default alist used for shell command guessing.
 See `dired-guess-shell-alist-user'.")
diff --git a/lisp/dired.el b/lisp/dired.el
index 3f31ba58139..c113f0cb2f4 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -249,9 +249,19 @@ Local to each dired buffer.  May be a list, in which case the car is the
 directory name and the cdr is the list of files to mention.
 The directory name must be absolute, but need not be fully expanded.")
 
+;; Beware of "-l;reboot" etc.  See bug#3230.
+(defun dired-safe-switches-p (switches)
+  "Return non-nil if string SWITCHES does not look risky for dired."
+  (or (not switches)
+      (and (stringp switches)
+           (< (length switches) 100)    ; arbitrary
+           (string-match "\\` *-[- [:alnum:]]+\\'" switches))))
+
 (defvar dired-actual-switches nil
   "The value of `dired-listing-switches' used to make this buffer's text.")
 
+(put 'dired-actual-switches 'safe-local-variable 'dired-safe-switches-p)
+
 (defvar dired-re-inode-size "[0-9 \t]*"
   "Regexp for optional initial inode and file size as made by `ls -i -s'.")
 
@@ -3614,7 +3624,7 @@ Ask means pop up a menu for the user to select one of copy, move or link."
 ;;;;;;  dired-run-shell-command dired-do-shell-command dired-do-async-shell-command
 ;;;;;;  dired-clean-directory dired-do-print dired-do-touch dired-do-chown
 ;;;;;;  dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff
-;;;;;;  dired-diff) "dired-aux" "dired-aux.el" "9d6333fab9c0f1b49e0bf2a536b8f245")
+;;;;;;  dired-diff) "dired-aux" "dired-aux.el" "154cdfbf451aedec60c5012b625ff329")
 ;;; Generated autoloads from dired-aux.el
 
 (autoload 'dired-diff "dired-aux" "\
@@ -4073,7 +4083,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"
-;;;;;;  "515e1dbc42acebd9a0175c4209b6673c")
+;;;;;;  "3b8851132739ab3f9054bf639873c53e")
 ;;; Generated autoloads from dired-x.el
 
 (autoload 'dired-jump "dired-x" "\
diff --git a/lisp/emacs-lisp/assoc.el b/lisp/emacs-lisp/assoc.el
index aa85916cc3f..31be851f2dd 100644
--- a/lisp/emacs-lisp/assoc.el
+++ b/lisp/emacs-lisp/assoc.el
@@ -1,4 +1,4 @@
-;;; assoc.el --- insert/delete/sort functions on association lists
+;;; assoc.el --- insert/delete functions on association lists
 
 ;; Copyright (C) 1996, 2001-2011  Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ head is one matching KEY.  Returns the sorted list and doesn't affect
 the order of any other key-value pair.  Side effect sets alist to new
 sorted list."
   (set alist-symbol
-       (sort (copy-alist (eval alist-symbol))
+       (sort (copy-alist (symbol-value alist-symbol))
              (function (lambda (a b) (equal (car a) key))))))
 
 
@@ -75,7 +75,7 @@ of the alist (with value nil if VALUE is nil or not supplied)."
   (lexical-let ((elem (aelement key value))
                 alist)
     (asort alist-symbol key)
-    (setq alist (eval alist-symbol))
+    (setq alist (symbol-value alist-symbol))
     (cond ((null alist) (set alist-symbol elem))
           ((anot-head-p alist key) (set alist-symbol (nconc elem alist)))
           (value (setcar alist (car elem)))
@@ -87,7 +87,7 @@ of the alist (with value nil if VALUE is nil or not supplied)."
 Alist is referenced by ALIST-SYMBOL and the key-value pair to remove
 is pair matching KEY.  Returns the altered alist."
   (asort alist-symbol key)
-  (lexical-let ((alist (eval alist-symbol)))
+  (lexical-let ((alist (symbol-value alist-symbol)))
     (cond ((null alist) nil)
           ((anot-head-p alist key) alist)
           (t (set alist-symbol (cdr alist))))))
@@ -133,7 +133,7 @@ extra values are ignored.  Returns the created alist."
           (t
            (amake alist-symbol keycdr valcdr)
            (aput alist-symbol keycar valcar))))
-  (eval alist-symbol))
+  (symbol-value alist-symbol))
 
 (provide 'assoc)
 
diff --git a/lisp/emacs-lisp/cl-loaddefs.el b/lisp/emacs-lisp/cl-loaddefs.el
index 8e192a18459..08001171ed1 100644
--- a/lisp/emacs-lisp/cl-loaddefs.el
+++ b/lisp/emacs-lisp/cl-loaddefs.el
@@ -282,7 +282,7 @@ Not documented
 ;;;;;;  do-all-symbols do-symbols dotimes dolist do* do loop return-from
 ;;;;;;  return block etypecase typecase ecase case load-time-value
 ;;;;;;  eval-when destructuring-bind function* defmacro* defun* gentemp
-;;;;;;  gensym) "cl-macs" "cl-macs.el" "0904b956872432ae7cc5fa9abcefce63")
+;;;;;;  gensym) "cl-macs" "cl-macs.el" "b3031039e82679e5b013ce1cbf174ee8")
 ;;; Generated autoloads from cl-macs.el
 
 (autoload 'gensym "cl-macs" "\
@@ -505,7 +505,7 @@ lexical closures as in Common Lisp.
 (autoload 'lexical-let* "cl-macs" "\
 Like `let*', but lexically scoped.
 The main visible difference is that lambdas inside BODY, and in
-successive bindings within BINDINGS, will create lexical closures
+successive bindings within VARLIST, will create lexical closures
 as in Common Lisp.  This is similar to the behavior of `let*' in
 Common Lisp.
 
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index 80e95724f1f..c57d37703b0 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -1470,7 +1470,7 @@ lexical closures as in Common Lisp.
 (defmacro lexical-let* (bindings &rest body)
   "Like `let*', but lexically scoped.
 The main visible difference is that lambdas inside BODY, and in
-successive bindings within BINDINGS, will create lexical closures
+successive bindings within VARLIST, will create lexical closures
 as in Common Lisp.  This is similar to the behavior of `let*' in
 Common Lisp.
 \n(fn VARLIST BODY)"
diff --git a/lisp/emacs-lisp/package-x.el b/lisp/emacs-lisp/package-x.el
index b9994be3d39..61f23abf0a7 100644
--- a/lisp/emacs-lisp/package-x.el
+++ b/lisp/emacs-lisp/package-x.el
@@ -40,6 +40,9 @@
 (defvar package-archive-upload-base nil
   "Base location for uploading to package archive.")
 
+(defvar package-update-news-on-upload nil
+  "Whether package upload should also update NEWS and RSS feeds.")
+
 (defun package--encode (string)
   "Encode a string by replacing some characters with XML entities."
   ;; We need a special case for translating "&" to "&amp;".
@@ -86,6 +89,36 @@
         (unless old-buffer
           (kill-buffer (current-buffer)))))))
 
+(defun package--archive-contents-from-url (archive-url)
+  "Parse archive-contents file at ARCHIVE-URL.
+Return the file contents, as a string, or nil if unsuccessful."
+  (ignore-errors
+    (when archive-url
+      (let* ((buffer (url-retrieve-synchronously
+                      (concat archive-url "archive-contents"))))
+        (set-buffer buffer)
+        (package-handle-response)
+        (re-search-forward "^$" nil 'move)
+        (forward-char)
+        (delete-region (point-min) (point))
+        (prog1 (package-read-from-string
+                (buffer-substring-no-properties (point-min) (point-max)))
+          (kill-buffer buffer))))))
+
+(defun package--archive-contents-from-file (file)
+  "Parse the given archive-contents file."
+  (if (not (file-exists-p file))
+      ;; no existing archive-contents, possibly a new ELPA repo.
+      (list package-archive-version)
+    (let ((dont-kill (find-buffer-visiting file)))
+      (with-current-buffer (let ((find-file-visit-truename t))
+                             (find-file-noselect file))
+        (prog1
+            (package-read-from-string
+             (buffer-substring-no-properties (point-min) (point-max)))
+          (unless dont-kill
+            (kill-buffer (current-buffer))))))))
+
 (defun package-maint-add-news-item (title description archive-url)
   "Add a news item to the ELPA web pages.
 TITLE is the title of the news item.
@@ -111,11 +144,20 @@ PKG-INFO is the package info, see `package-buffer-info'.
 EXTENSION is the file extension, a string.  It can be either
 \"el\" or \"tar\".
 
+The variable `package-archive-upload-base' specifies the upload
+destination.  If this is nil, signal an error.
+
 Optional arg ARCHIVE-URL is the URL of the destination archive.
-If nil, the \"gnu\" archive is used."
-  (unless archive-url
-    (or (setq archive-url (cdr (assoc "gnu" package-archives)))
-        (error "No destination URL")))
+If it is non-nil, compute the new \"archive-contents\" file
+starting from the existing \"archive-contents\" at that URL.  In
+addition, if `package-update-news-on-upload' is non-nil, call
+`package--update-news' to add a news item at that URL.
+
+If ARCHIVE-URL is nil, compute the new \"archive-contents\" file
+from the \"archive-contents\" at `package-archive-upload-base',
+if it exists."
+  (unless package-archive-upload-base
+    (error "No destination specified in `package-archive-upload-base'"))
   (save-excursion
     (save-restriction
       (let* ((file-type (cond
@@ -131,21 +173,14 @@ If nil, the \"gnu\" archive is used."
              (pkg-version (aref pkg-info 3))
              (commentary (aref pkg-info 4))
              (split-version (version-to-list pkg-version))
-             (pkg-buffer (current-buffer))
+             (pkg-buffer (current-buffer)))
 
-             ;; Download latest archive-contents.
-             (buffer (url-retrieve-synchronously
-                      (concat archive-url "archive-contents"))))
-
-        ;; Parse archive-contents.
-        (set-buffer buffer)
-        (package-handle-response)
-        (re-search-forward "^$" nil 'move)
-        (forward-char)
-        (delete-region (point-min) (point))
-        (let ((contents (package-read-from-string
-                         (buffer-substring-no-properties (point-min)
-                                                         (point-max))))
+        ;; Get archive-contents from ARCHIVE-URL if it's non-nil, or
+        ;; from `package-archive-upload-base' otherwise.
+        (let ((contents (or (package--archive-contents-from-url archive-url)
+                            (package--archive-contents-from-file
+                             (concat package-archive-upload-base
+                                     "archive-contents"))))
               (new-desc (vector split-version requires desc file-type)))
           (if (> (car contents) package-archive-version)
               (error "Unrecognized archive version %d" (car contents)))
@@ -176,7 +211,6 @@ If nil, the \"gnu\" archive is used."
                                   (symbol-name pkg-name) "-readme.txt")))
 
           (set-buffer pkg-buffer)
-          (kill-buffer buffer)
           (write-region (point-min) (point-max)
                         (concat package-archive-upload-base
                                 file-name "-" pkg-version
@@ -184,8 +218,10 @@ If nil, the \"gnu\" archive is used."
                         nil nil nil 'excl)
 
           ;; Write a news entry.
-          (package--update-news (concat file-name "." extension)
-                                pkg-version desc archive-url)
+          (and package-update-news-on-upload
+               archive-url
+               (package--update-news (concat file-name "." extension)
+                                     pkg-version desc archive-url))
 
           ;; special-case "package": write a second copy so that the
           ;; installer can easily find the latest version.
@@ -196,7 +232,9 @@ If nil, the \"gnu\" archive is used."
                             nil nil nil 'ask)))))))
 
 (defun package-upload-buffer ()
-  "Upload a single .el file to ELPA from the current buffer."
+  "Upload the current buffer as a single-file Emacs Lisp package.
+The variable `package-archive-upload-base' specifies the upload
+destination."
   (interactive)
   (save-excursion
     (save-restriction
@@ -205,6 +243,13 @@ If nil, the \"gnu\" archive is used."
         (package-upload-buffer-internal pkg-info "el")))))
 
 (defun package-upload-file (file)
+  "Upload the Emacs Lisp package FILE to the package archive.
+Interactively, prompt for FILE.  The package is considered a
+single-file package if FILE ends in \".el\", and a multi-file
+package if FILE ends in \".tar\".
+
+The variable `package-archive-upload-base' specifies the upload
+destination."
   (interactive "fPackage file name: ")
   (with-temp-buffer
     (insert-file-contents-literally file)
diff --git a/lisp/emacs-lisp/pcase.el b/lisp/emacs-lisp/pcase.el
index 3179672a3ec..916dcd4785c 100644
--- a/lisp/emacs-lisp/pcase.el
+++ b/lisp/emacs-lisp/pcase.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2010-2011  Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
-;; Keywords: 
+;; Keywords:
 
 ;; This file is part of GNU Emacs.
 
@@ -32,6 +32,14 @@
 ;;   could be defined this way, as a shorthand for (pred (lambda (_) BOOLEXP)).
 ;;   But better would be if we could define new ways to match by having the
 ;;   extension provide its own `pcase--split-<foo>' thingy.
+;; - provide something like (setq VAR) so a var can be set rather than
+;;   let-bound.
+;; - provide a way to fallthrough to other cases.
+;; - try and be more clever to reduce the size of the decision tree, and
+;;   to reduce the number of leafs that need to be turned into function:
+;;   - first, do the tests shared by all remaining branches (it will have
+;;     to be performed anyway, so better so it first so it's shared).
+;;   - then choose the test that discriminates more (?).
 ;; - ideally we'd want (pcase s ((re RE1) E1) ((re RE2) E2)) to be able to
 ;;   generate a lex-style DFA to decide whether to run E1 or E2.
 
@@ -67,12 +75,12 @@ If a SYMBOL is used twice in the same pattern (i.e. the pattern is
 QPatterns can take the following forms:
   (QPAT1 . QPAT2)       matches if QPAT1 matches the car and QPAT2 the cdr.
   ,UPAT                 matches if the UPattern UPAT matches.
-  STRING                        matches if the object is `equal' to STRING.
+  STRING                matches if the object is `equal' to STRING.
   ATOM                  matches if the object is `eq' to ATOM.
 QPatterns for vectors are not implemented yet.
 
 PRED can take the form
-  FUNCTION      in which case it gets called with one argument.
+  FUNCTION           in which case it gets called with one argument.
   (FUN ARG1 .. ARGN) in which case it gets called with N+1 arguments.
 A PRED of the form FUNCTION is equivalent to one of the form (FUNCTION).
 PRED patterns can refer to variables bound earlier in the pattern.
@@ -209,6 +217,7 @@ of the form (UPAT EXP)."
 (defun pcase--if (test then else)
   (cond
    ((eq else :pcase--dontcare) then)
+   ((eq then :pcase--dontcare) (debug) else) ;Can/should this ever happen?
    ((eq (car-safe else) 'if)
     (if (equal test (nth 1 else))
         ;; Doing a test a second time: get rid of the redundancy.
@@ -223,6 +232,8 @@ of the form (UPAT EXP)."
     `(cond (,test ,then)
            ;; Doing a test a second time: get rid of the redundancy, as above.
            ,@(remove (assoc test else) (cdr else))))
+   ;; Invert the test if that lets us reduce the depth of the tree.
+   ((memq (car-safe then) '(if cond)) (pcase--if `(not ,test) else then))
    (t `(if ,test ,then ,else))))
 
 (defun pcase--upat (qpattern)
@@ -264,6 +275,22 @@ MATCH is the pattern that needs to be matched, of the form:
 (defun pcase--and (match matches)
   (if matches `(and ,match ,@matches) match))
 
+(defconst pcase-mutually-exclusive-predicates
+  '((symbolp . integerp)
+    (symbolp . numberp)
+    (symbolp . consp)
+    (symbolp . arrayp)
+    (symbolp . stringp)
+    (integerp . consp)
+    (integerp . arrayp)
+    (integerp . stringp)
+    (numberp . consp)
+    (numberp . arrayp)
+    (numberp . stringp)
+    (consp . arrayp)
+    (consp . stringp)
+    (arrayp . stringp)))
+
 (defun pcase--split-match (sym splitter match)
   (case (car match)
     ((match)
@@ -324,8 +351,14 @@ MATCH is the pattern that needs to be matched, of the form:
       (cons `(and (match ,syma . ,(pcase--upat (car qpat)))
                   (match ,symd . ,(pcase--upat (cdr qpat))))
             :pcase--fail)))
-   ;; A QPattern but not for a cons, can only go the `else' side.
-   ((eq (car-safe pat) '\`) (cons :pcase--fail nil))))
+   ;; A QPattern but not for a cons, can only go to the `else' side.
+   ((eq (car-safe pat) '\`) (cons :pcase--fail nil))
+   ((and (eq (car-safe pat) 'pred)
+         (or (member (cons 'consp (cadr pat))
+                     pcase-mutually-exclusive-predicates)
+             (member (cons (cadr pat) 'consp)
+                     pcase-mutually-exclusive-predicates)))
+    (cons :pcase--fail nil))))
 
 (defun pcase--split-equal (elem pat)
   (cond
@@ -337,7 +370,12 @@ MATCH is the pattern that needs to be matched, of the form:
          ;; (or (integerp (cadr pat)) (symbolp (cadr pat))
          ;;     (consp (cadr pat)))
          )
-    (cons :pcase--fail nil))))
+    (cons :pcase--fail nil))
+   ((and (eq (car-safe pat) 'pred)
+         (symbolp (cadr pat))
+         (get (cadr pat) 'side-effect-free)
+         (funcall (cadr pat) elem))
+    (cons :pcase--succeed nil))))
 
 (defun pcase--split-member (elems pat)
   ;; Based on pcase--split-equal.
@@ -354,13 +392,39 @@ MATCH is the pattern that needs to be matched, of the form:
          ;; (or (integerp (cadr pat)) (symbolp (cadr pat))
          ;;     (consp (cadr pat)))
          )
-    (cons :pcase--fail nil))))
+    (cons :pcase--fail nil))
+   ((and (eq (car-safe pat) 'pred)
+         (symbolp (cadr pat))
+         (get (cadr pat) 'side-effect-free)
+         (let ((p (cadr pat)) (all t))
+           (dolist (elem elems)
+             (unless (funcall p elem) (setq all nil)))
+           all))
+    (cons :pcase--succeed nil))))
 
 (defun pcase--split-pred (upat pat)
   ;; FIXME: For predicates like (pred (> a)), two such predicates may
   ;; actually refer to different variables `a'.
-  (if (equal upat pat)
-      (cons :pcase--succeed :pcase--fail)))
+  (cond
+   ((equal upat pat) (cons :pcase--succeed :pcase--fail))
+   ((and (eq 'pred (car upat))
+         (eq 'pred (car-safe pat))
+         (or (member (cons (cadr upat) (cadr pat))
+                     pcase-mutually-exclusive-predicates)
+             (member (cons (cadr pat) (cadr upat))
+                     pcase-mutually-exclusive-predicates)))
+    (cons :pcase--fail nil))
+   ;; ((and (eq 'pred (car upat))
+   ;;       (eq '\` (car-safe pat))
+   ;;       (symbolp (cadr upat))
+   ;;       (or (symbolp (cadr pat)) (stringp (cadr pat)) (numberp (cadr pat)))
+   ;;       (get (cadr upat) 'side-effect-free)
+   ;;       (progn (message "Trying predicate %S" (cadr upat))
+   ;;              (ignore-errors
+   ;;                (funcall (cadr upat) (cadr pat)))))
+   ;;  (message "Simplify pred %S against %S" upat pat)
+   ;;  (cons nil :pcase--fail))
+   ))
 
 (defun pcase--fgrep (vars sexp)
   "Check which of the symbols VARS appear in SEXP."
@@ -375,7 +439,7 @@ MATCH is the pattern that needs to be matched, of the form:
 ;; bootstrapping problems.
 (defun pcase--u1 (matches code vars rest)
   "Return code that runs CODE (with VARS) if MATCHES match.
-and otherwise defers to REST which is a list of branches of the form
+Otherwise, it defers to REST which is a list of branches of the form
 \(ELSE-MATCH ELSE-CODE . ELSE-VARS)."
   ;; Depending on the order in which we choose to check each of the MATCHES,
   ;; the resulting tree may be smaller or bigger.  So in general, we'd want
@@ -433,6 +497,7 @@ and otherwise defers to REST which is a list of branches of the form
        ((eq upat 'dontcare) :pcase--dontcare)
        ((functionp upat)  (error "Feature removed, use (pred %s)" upat))
        ((memq (car-safe upat) '(guard pred))
+        (if (eq (car upat) 'pred) (put sym 'pcase-used t))
         (destructuring-bind (then-rest &rest else-rest)
             (pcase--split-rest
              sym (apply-partially #'pcase--split-pred upat) rest)
@@ -459,6 +524,7 @@ and otherwise defers to REST which is a list of branches of the form
                      (pcase--u1 matches code vars then-rest)
                      (pcase--u else-rest))))
        ((symbolp upat)
+        (put sym 'pcase-used t)
         (if (not (assq upat vars))
             (pcase--u1 matches code (cons (cons upat sym) vars) rest)
           ;; Non-linear pattern.  Turn it into an `eq' test.
@@ -466,6 +532,7 @@ and otherwise defers to REST which is a list of branches of the form
                            matches)
                      code vars rest)))
        ((eq (car-safe upat) '\`)
+        (put sym 'pcase-used t)
         (pcase--q1 sym (cadr upat) matches code vars rest))
        ((eq (car-safe upat) 'or)
         (let ((all (> (length (cdr upat)) 1))
@@ -524,7 +591,7 @@ and otherwise defers to REST which is a list of branches of the form
 
 (defun pcase--q1 (sym qpat matches code vars rest)
   "Return code that runs CODE if SYM matches QPAT and if MATCHES match.
-and if not, defers to REST which is a list of branches of the form
+Otherwise, it defers to REST which is a list of branches of the form
 \(OTHER_MATCH OTHER-CODE . OTHER-VARS)."
   (cond
    ((eq (car-safe qpat) '\,) (error "Can't use `,UPATTERN"))
@@ -539,14 +606,20 @@ and if not, defers to REST which is a list of branches of the form
           (pcase--split-rest sym
                              (apply-partially #'pcase--split-consp syma symd)
                              rest)
-        (pcase--if `(consp ,sym)
-                   `(let ((,syma (car ,sym))
-                          (,symd (cdr ,sym)))
-                      ,(pcase--u1 `((match ,syma . ,(pcase--upat (car qpat)))
-                                    (match ,symd . ,(pcase--upat (cdr qpat)))
-                                    ,@matches)
-                                  code vars then-rest))
-                   (pcase--u else-rest)))))
+        (let ((then-body (pcase--u1 `((match ,syma . ,(pcase--upat (car qpat)))
+                                      (match ,symd . ,(pcase--upat (cdr qpat)))
+                                      ,@matches)
+                                    code vars then-rest)))
+          (pcase--if
+           `(consp ,sym)
+           ;; We want to be careful to only add bindings that are used.
+           ;; The byte-compiler could do that for us, but it would have to pay
+           ;; attention to the `consp' test in order to figure out that car/cdr
+           ;; can't signal errors and our byte-compiler is not that clever.
+           `(let (,@(if (get syma 'pcase-used) `((,syma (car ,sym))))
+                  ,@(if (get symd 'pcase-used) `((,symd (cdr ,sym)))))
+              ,then-body)
+           (pcase--u else-rest))))))
    ((or (integerp qpat) (symbolp qpat) (stringp qpat))
     (destructuring-bind (then-rest &rest else-rest)
         (pcase--split-rest sym (apply-partially 'pcase--split-equal qpat) rest)
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index fae249da9d3..d9b79ccd317 100644
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -2375,7 +2375,7 @@ problems."
     (if (eq viper-intermediate-command 'viper-repeat)
         (viper-change-subr (mark t) (point))
       (viper-change (mark t) (point)))
-    ;; com is set to ?r when we repeat this comand with dot
+    ;; com is set to ?r when we repeat this command with dot
     (viper-set-destructive-command (list 'viper-substitute val ?r nil nil nil))
     ))
 
diff --git a/lisp/erc/ChangeLog.01 b/lisp/erc/ChangeLog.01
index 962acd5bfc6..4016586abc7 100644
--- a/lisp/erc/ChangeLog.01
+++ b/lisp/erc/ChangeLog.01
@@ -584,9 +584,9 @@
 
         * debian/maint/conffiles.in: new file
 
-        * debian/maint/conffiles: superceded by conffiles.in
+        * debian/maint/conffiles: superseded by conffiles.in
 
-        * debian/scripts/startup: superceded by startup.erc
+        * debian/scripts/startup: superseded by startup.erc
 
 2001-10-25  Mario Lang  <mlang@delysid.org>
 
@@ -609,7 +609,7 @@
 
         * debian/maint/postinst, debian/maint/prerm, debian/scripts/install, 
           debian/scripts/remove:
-        removed, superceded by it's .in counterpart
+        removed, superseded by its .in counterpart
 
 2001-10-25  Mario Lang  <mlang@delysid.org>
 
diff --git a/lisp/facemenu.el b/lisp/facemenu.el
index 360383aa32b..97862afb678 100644
--- a/lisp/facemenu.el
+++ b/lisp/facemenu.el
@@ -562,17 +562,23 @@ You can change the color sort order by customizing `list-colors-sort'."
       (let ((lc (nthcdr (1- (display-color-cells)) list)))
         (if lc
             (setcdr lc nil)))))
-  (let ((buf (get-buffer-create "*Colors*")))
-    (with-current-buffer buf
+  (unless buffer-name
+    (setq buffer-name "*Colors*"))
+  (with-help-window buffer-name
+    (with-current-buffer standard-output
       (erase-buffer)
-      (setq truncate-lines t)
-      ;; Display buffer before generating content to allow
-      ;; `list-colors-print' to get the right window-width.
+      (setq truncate-lines t)))
+  (let ((buf (get-buffer buffer-name))
+        (inhibit-read-only t))
+    ;; Display buffer before generating content, to allow
+    ;; `list-colors-print' to get the right window-width.
+    (with-selected-window (or (get-buffer-window buf t) (selected-window))
+      (with-current-buffer buf
+        (list-colors-print list callback)
+        (set-buffer-modified-p nil)))
+    (when callback
       (pop-to-buffer buf)
-      (list-colors-print list callback)
-      (set-buffer-modified-p nil)))
-  (if callback
-      (message "Click on a color to select it.")))
+      (message "Click on a color to select it."))))
 
 (defun list-colors-print (list &optional callback)
   (let ((callback-fn
diff --git a/lisp/files.el b/lisp/files.el
index 5890bf9b8c9..8849e264151 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -3394,8 +3394,19 @@ Return the new variables list."
                                  (cdr entry) root variables))))
              ((or (not key)
                   (derived-mode-p key))
-              (setq variables (dir-locals-collect-mode-variables
-                               (cdr entry) variables))))))
+              (let* ((alist (cdr entry))
+                     (subdirs (assq 'subdirs alist)))
+                (if (or (not subdirs)
+                        (progn
+                          (setq alist (delq subdirs alist))
+                          (cdr-safe subdirs))
+                        ;; TODO someone might want to extend this to allow
+                        ;; integer values for subdir, where N means
+                        ;; variables apply to this directory and N levels
+                        ;; below it (0 == nil).
+                        (equal root default-directory))
+                    (setq variables (dir-locals-collect-mode-variables
+                                     alist variables))))))))
       (error
        ;; The file's content might be invalid (e.g. have a merge conflict), but
        ;; that shouldn't prevent the user from opening the file.
@@ -5837,6 +5848,9 @@ normally equivalent short `-D' option is just passed on to
                                   (file-name-directory file)
                                 (file-name-directory (expand-file-name file))))
                             (pattern (file-name-nondirectory file)))
+                        ;; NB since switches is passed to the shell, be
+                        ;; careful of malicious values, eg "-l;reboot".
+                        ;; See eg dired-safe-switches-p.
                         (call-process
                          shell-file-name nil t nil
                          "-c"
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 9dd315782ff..4562d544a58 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,71 @@
+2011-03-01  Julien Danjou  <julien@danjou.info>
+
+        * gnus-art.el (list-identifier): Add list-identifier as a parameter
+        group.
+        (article-hide-list-identifiers): Use list-identifier group parameter.
+
+2011-02-28  Julien Danjou  <julien@danjou.info>
+
+        * sieve.el (sieve-buffer-script-name): New local variable to store
+        sieve script name.
+        (sieve-edit-script): Store sieve script name.
+        (sieve-upload): Use sieve script name when uploading.
+        (sieve-upload): Use substitute-command-keys.
+        (sieve-edit-script): Use substitute-command-keys.
+        (sieve-refresh-scriptlist): Use substitute-command-keys.
+        (sieve-manage-mode-map): Define keymap properly.
+        (sieve-manage-mode): Do not set mode name manually, change mode-name to
+        (sieve-refresh-scriptlist): Use substitute-command-keys."Sieve-manage".
+        Remove commented code about cvs.
+        (sieve-manage-quit): New function.
+        (sieve-manage-mode-map): Bind 'q' to sieve-manage-quit.
+
+2011-02-27  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-group.el (gnus-import-other-newsrc-file): New function.
+
+2011-02-25  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * auth-source.el (auth-source-search): Cache empty result sets.
+
+        * auth-source.el (auth-source-save-behavior): New variable to replace
+        `auth-source-never-create'.
+        (auth-source-netrc-create): Use it.
+        (auth-source-never-save): Remove.
+
+2011-02-25  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * nnimap.el (nnimap-stream): Doc fix.
+        (nnimap-open-connection-1): Reverse the order of the ports to that the
+        prompted-for port is first.
+
+        * gnus-start.el (gnus-get-unread-articles): Don't clobber the async
+        retrieval by the no-group selection.
+
+        * gnus-demon.el (gnus-demon-init): run-with-timer should be called with
+        numerical parameters.
+
+2011-02-25  Julien Danjou  <julien@danjou.info>
+
+        * gnus-gravatar.el: Use gnus-with-article-buffer.
+
+        * gnus-art.el (gnus-with-article-buffer): Check that the
+        gnus-article-buffer is alive.
+
+2011-02-24  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * auth-source.el (auth-source-creation-prompts): New variable to manage
+        creation-time prompts.
+        (auth-source-search): Document it.
+        (auth-source-format-prompt): Add utility function.
+        (auth-source-netrc-create): Don't default the user name to
+        user-login-name.  Use `auth-source-creation-prompts' and some default
+        prompts for user, host, port, and password (the default generic prompt
+        remains ugly).
+        (auth-source-never-save): Add customizable option to never save info.
+        (auth-source-netrc-create): Use it and improve save prompts.  Fix help
+        mode excursion.
+
 2011-02-24  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * auth-source.el (auth-source-netrc-create): Use `read-char' with no
diff --git a/lisp/gnus/auth-source.el b/lisp/gnus/auth-source.el
index 63ec93dd760..500de10b71c 100644
--- a/lisp/gnus/auth-source.el
+++ b/lisp/gnus/auth-source.el
@@ -137,8 +137,21 @@ let-binding."
 (defvar auth-source-creation-defaults nil
   "Defaults for creating token values.  Usually let-bound.")
 
+(defvar auth-source-creation-prompts nil
+  "Default prompts for token values.  Usually let-bound.")
+
 (make-obsolete 'auth-source-hide-passwords nil "Emacs 24.1")
 
+(defcustom auth-source-save-behavior 'ask
+  "If set, auth-source will respect it for save behavior."
+  :group 'auth-source
+  :version "23.2" ;; No Gnus
+  :type `(choice
+          :tag "auth-source new token save behavior"
+          (const :tag "Always save" t)
+          (const :tag "Never save" nil)
+          (const :tag "Ask" ask)))
+
 (defvar auth-source-magic "auth-source-magic ")
 
 (defcustom auth-source-do-cache t
@@ -435,12 +448,18 @@ parameter, that parameter will be required in the resulting
 token.  The value for that parameter will be obtained from the
 search parameters or from user input.  If any queries are needed,
 the alist `auth-source-creation-defaults' will be checked for the
-default prompt.
+default value.  If the user, host, or port are missing, the alist
+`auth-source-creation-prompts' will be used to look up the
+prompts IN THAT ORDER (so the 'user prompt will be queried first,
+then 'host, then 'port, and finally 'secret).  Each prompt string
+can use %u, %h, and %p to show the user, host, and port.
 
 Here's an example:
 
 \(let ((auth-source-creation-defaults '((user . \"defaultUser\")
-                                        (A    . \"default A\"))))
+                                        (A    . \"default A\")))
+       (auth-source-creation-prompts
+        '((password . \"Enter IMAP password for %h:%p: \"))))
   (auth-source-search :host '(\"nonesuch\" \"twosuch\") :type 'netrc :max 1
                       :P \"pppp\" :Q \"qqqq\"
                       :create '(A B Q)))
@@ -452,12 +471,11 @@ which says:
 
  Create a new entry if you found none.  The netrc backend will
  automatically require host, user, and port.  The host will be
- 'nonesuch' and Q will be 'qqqq'.  We prompt for A with default
- 'default A', for B and port with default nil, and for the
- user with default 'defaultUser'.  We will not prompt for Q.  The
- resulting token will have keys user, host, port, A, B, and Q.
- It will not have P with any value, even though P is used in the
- search to find only entries that have P set to 'pppp'.\"
+ 'nonesuch' and Q will be 'qqqq'.  We prompt for the password
+ with the shown prompt.  We will not prompt for Q.  The resulting
+ token will have keys user, host, port, A, B, and Q.  It will not
+ have P with any value, even though P is used in the search to
+ find only entries that have P set to 'pppp'.\"
 
 When multiple values are specified in the search parameter, the
 user is prompted for which one.  So :host (X Y Z) would ask the
@@ -506,10 +524,13 @@ must call it to obtain the actual value."
          (keys (loop for i below (length spec) by 2
                      unless (memq (nth i spec) ignored-keys)
                      collect (nth i spec)))
+         (cached (auth-source-remembered-p spec))
+         ;; note that we may have cached results but found is still nil
+         ;; (there were no results from the search)
          (found (auth-source-recall spec))
          filtered-backends accessor-key backend)
 
-    (if (and found auth-source-do-cache)
+    (if (and cached auth-source-do-cache)
         (auth-source-do-debug
          "auth-source-search: found %d CACHED results matching %S"
          (length found) spec)
@@ -562,7 +583,8 @@ must call it to obtain the actual value."
          "auth-source-search: CREATED %d results (max %d) matching %S"
          (length found) max spec))
 
-      (when (and found auth-source-do-cache)
+      ;; note we remember the lack of result too, if it's applicable
+      (when auth-source-do-cache
         (auth-source-remember spec found)))
 
       found))
@@ -636,6 +658,11 @@ Returns the deleted entries."
   (password-read-from-cache
    (concat auth-source-magic (format "%S" spec))))
 
+(defun auth-source-remembered-p (spec)
+  "Check if SPEC is remembered."
+  (password-in-cache-p
+   (concat auth-source-magic (format "%S" spec))))
+
 (defun auth-source-forget (spec)
   "Forget any cached data matching SPEC exactly.
 
@@ -646,7 +673,10 @@ Returns t or nil for forgotten or not found."
 ;;; (loop for sym being the symbols of password-data when (string-match (concat "^" auth-source-magic) (symbol-name sym)) collect (symbol-name sym))
 
 ;;; (auth-source-remember '(:host "wedd") '(4 5 6))
+;;; (auth-source-remembered-p '(:host "wedd"))
 ;;; (auth-source-remember '(:host "xedd") '(1 2 3))
+;;; (auth-source-remembered-p '(:host "xedd"))
+;;; (auth-source-remembered-p '(:host "zedd"))
 ;;; (auth-source-recall '(:host "xedd"))
 ;;; (auth-source-recall '(:host t))
 ;;; (auth-source-forget+ :host t)
@@ -903,6 +933,17 @@ See `auth-source-search' for details on SPEC."
       (nth 0 v)
     v))
 
+;; (auth-source-format-prompt "test %u %h %p" '((?u "user") (?h "host")))
+
+(defun auth-source-format-prompt (prompt alist)
+  "Format PROMPT using %x (for any character x) specifiers in ALIST."
+  (dolist (cell alist)
+    (let ((c (nth 0 cell))
+          (v (nth 1 cell)))
+      (when (and c v)
+        (setq prompt (replace-regexp-in-string (format "%%%c" c) v prompt)))))
+  prompt)
+
 ;;; (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)))
 
@@ -954,31 +995,50 @@ See `auth-source-search' for details on SPEC."
              ;; 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))
-                       (t given-default))))
+                       ;; don't default the user name
+                       ;; ((and (not given-default) (eq r 'user))
+                       ;;  (user-login-name))
+                       (t given-default)))
+             (printable-defaults (list
+                                  (cons 'user
+                                        (or
+                                         (auth-source-netrc-element-or-first
+                                          (aget valist 'user))
+                                         (plist-get artificial :user)
+                                         "[any user]"))
+                                  (cons 'host
+                                        (or
+                                         (auth-source-netrc-element-or-first
+                                          (aget valist 'host))
+                                         (plist-get artificial :host)
+                                         "[any host]"))
+                                  (cons 'port
+                                        (or
+                                         (auth-source-netrc-element-or-first
+                                          (aget valist 'port))
+                                         (plist-get artificial :port)
+                                         "[any port]"))))
+             (prompt (or (aget auth-source-creation-prompts r)
+                         (case r
+                           ('secret "%p password for user %u, host %h: ")
+                           ('user "%p user name: ")
+                           ('host "%p host name for user %u: ")
+                           ('port "%p port for user %u and host %h: "))
+                         (format "Enter %s (%%u@%%h:%%p): " r)))
+             (prompt (auth-source-format-prompt
+                      prompt
+                      `((?u ,(aget printable-defaults 'user))
+                        (?h ,(aget printable-defaults 'host))
+                        (?p ,(aget printable-defaults 'port))))))
 
         ;; 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]"))))
+                (read-passwd prompt))
+               ((null data)
+                (read-string prompt default))
                (t (or data default))))
 
         (when data
@@ -1026,22 +1086,42 @@ See `auth-source-search' for details on SPEC."
       (goto-char (point-max))
 
       ;; ask AFTER we've successfully opened the file
-      (let ((prompt (format "Add to file %s? %s: "
+      (let ((prompt (format "Save auth info to file %s? %s: "
                             file
-                            "(y)es/(n)o but use it/(e)dit line/(s)kip file"))
-            done k)
+                            "y/n/N/e/?"))
+            (done (not (eq auth-source-save-behavior 'ask)))
+            (bufname "*auth-source Help*")
+            k)
         (while (not done)
-          (message "%s" prompt)
+          (message "%s" prompt)
           (setq k (read-char))
           (case k
             (?y (setq done t))
+            (?? (save-excursion
+                  (with-output-to-temp-buffer bufname
+                    (princ
+                     (concat "(y)es, save\n"
+                             "(n)o but use the info\n"
+                             "(N)o and don't ask to save again\n"
+                             "(e)dit the line\n"
+                             "(?) for help as you can see.\n"))
+                  (set-buffer standard-output)
+                  (help-mode))))
             (?n (setq add ""
                       done t))
-            (?s (setq add ""
-                      done 'skip))
+            (?N (setq add ""
+                      done t
+                      auth-source-save-behavior nil))
             (?e (setq add (read-string "Line to add: " add)))
             (t nil)))
 
+        (when (get-buffer-window bufname)
+          (delete-window (get-buffer-window bufname)))
+
+        ;; make sure the info is not saved
+        (when (null auth-source-save-behavior)
+          (setq add ""))
+
         (when (< 0 (length add))
           (progn
             (unless (bolp)
diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el
index 204d63d37e4..989488c0995 100644
--- a/lisp/gnus/gnus-agent.el
+++ b/lisp/gnus/gnus-agent.el
@@ -441,7 +441,7 @@ manipulated as follows:
                      (setf (gnus-agent-cat-groups old-category)
                            (delete group (gnus-agent-cat-groups
                                           old-category))))))
-               ;; Purge cache as preceeding loop invalidated it.
+               ;; Purge cache as preceding loop invalidated it.
                (setq gnus-category-group-cache nil))
 
              (setcdr (or (assq 'agent-groups category)
@@ -1195,7 +1195,7 @@ downloadable."
             (mapc #'gnus-summary-remove-process-mark
                   (gnus-sorted-ndifference gnus-newsgroup-processable gnus-newsgroup-undownloaded))
 
-            ;; The preceeding call to (gnus-agent-summary-fetch-group)
+            ;; The preceding call to (gnus-agent-summary-fetch-group)
             ;; updated the temporary gnus-newsgroup-downloadable to
             ;; remove each article successfully fetched.  Now, I
             ;; update the real gnus-newsgroup-downloadable to only
@@ -1520,14 +1520,14 @@ downloaded into the agent."
            header-number)
       ;; Check each article
       (while (setq article (pop articles))
-        ;; Skip alist entries preceeding this article
+        ;; Skip alist entries preceding this article
         (while (> article (or (caar alist) (1+ article)))
           (setq alist (cdr alist)))
 
         ;; Prune off articles that we have already fetched.
         (unless (and (eq article (caar alist))
                      (cdar alist))
-          ;; Skip headers preceeding this article
+          ;; Skip headers preceding this article
           (while (> article
                     (setq header-number
                           (let* ((header (car headers)))
@@ -3437,7 +3437,7 @@ missing NOV entry.  Run gnus-agent-regenerate-group to restore it.")))
 
                    ;; If considering all articles is set, I can only
                    ;; expire article IDs that are no longer in the
-                   ;; active range (That is, articles that preceed the
+                   ;; active range (That is, articles that precede the
                    ;; first article in the new alist).
                    (if (and gnus-agent-consider-all-articles
                             (>= article-number (car active)))
@@ -3715,7 +3715,7 @@ has been fetched."
                    (gnus-agent-append-to-list tail-uncached v1))
                  (setq arts (cdr arts))
                  (setq ref (cdr ref)))
-                (t ; reference article (v2) preceeds the list being filtered
+                (t ; reference article (v2) precedes the list being filtered
                  (setq ref (cdr ref))))))
       (while arts
         (gnus-agent-append-to-list tail-uncached (pop arts)))
@@ -4020,7 +4020,7 @@ If REREAD is not nil, downloaded articles are marked as unread."
         ;; article (with the exception of the last ID in the list - it's
         ;; special) that no longer appears in the overview.  In this
         ;; situtation, the last article ID in the list implies that it,
-        ;; and every article ID preceeding it, have been fetched from the
+        ;; and every article ID preceding it, have been fetched from the
         ;; server.
 
         (if gnus-agent-consider-all-articles
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 5b3489a72ee..7469c4445c6 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -1253,6 +1253,24 @@ predicate.  See Info node `(gnus)Customizing Articles'."
   :link '(custom-manual "(gnus)Customizing Articles")
   :type gnus-article-treat-custom)
 
+(gnus-define-group-parameter
+ list-identifier
+ :variable-document
+ "Alist of regexps and correspondent identifiers."
+ :variable-group gnus-article-washing
+ :parameter-type
+ '(choice :tag "Identifier"
+          :value nil
+          (symbol :tag "Item in `gnus-list-identifiers'" none)
+          regexp
+          (const :tag "None" nil))
+ :parameter-document
+ "If non-nil, specify how to remove `identifiers' from articles' subject.
+
+Any symbol is used to look up a regular expression to match the
+banner in `gnus-list-identifiers'.  A string is used as a regular
+expression to match the identifier directly.")
+
 (make-obsolete-variable 'gnus-treat-strip-pgp nil
                         "Gnus 5.10 (Emacs 22.1)")
 
@@ -1725,9 +1743,10 @@ Initialized from `text-mode-syntax-table.")
 (put 'gnus-with-article-headers 'edebug-form-spec '(body))
 
 (defmacro gnus-with-article-buffer (&rest forms)
-  `(with-current-buffer gnus-article-buffer
-     (let ((inhibit-read-only t))
-       ,@forms)))
+  `(when (buffer-live-p gnus-article-buffer)
+     (with-current-buffer gnus-article-buffer
+       (let ((inhibit-read-only t))
+         ,@forms))))
 
 (put 'gnus-with-article-buffer 'lisp-indent-function 0)
 (put 'gnus-with-article-buffer 'edebug-form-spec '(body))
@@ -3055,10 +3074,11 @@ images if any to the browser, and deletes them when exiting the group
 The `gnus-list-identifiers' variable specifies what to do."
   (interactive)
   (let ((inhibit-point-motion-hooks t)
-        (regexp (if (consp gnus-list-identifiers)
-                    (mapconcat 'identity gnus-list-identifiers " *\\|")
-                  gnus-list-identifiers))
-        (inhibit-read-only t))
+        (regexp (or (gnus-parameter-list-identifier gnus-newsgroup-name)
+                    (if (consp gnus-list-identifiers)
+                        (mapconcat 'identity gnus-list-identifiers " *\\|")
+                      gnus-list-identifiers)))
+        (inhibit-read-only t))
     (when regexp
       (save-excursion
         (save-restriction
diff --git a/lisp/gnus/gnus-demon.el b/lisp/gnus/gnus-demon.el
index 2a45b9363f4..419346b7191 100644
--- a/lisp/gnus/gnus-demon.el
+++ b/lisp/gnus/gnus-demon.el
@@ -140,7 +140,7 @@ Emacs has been idle for IDLE `gnus-demon-timestep's."
              ;; (func number nil)
              ;; Call every `time'
              ((and (numberp time) (null idle))
-              (run-with-timer t time 'gnus-demon-run-callback func)))))
+              (run-with-timer time time 'gnus-demon-run-callback func)))))
       (when timer
         (add-to-list 'gnus-demon-timers timer)))))
 
diff --git a/lisp/gnus/gnus-gravatar.el b/lisp/gnus/gnus-gravatar.el
index 7208889a163..98b1f3bd18c 100644
--- a/lisp/gnus/gnus-gravatar.el
+++ b/lisp/gnus/gnus-gravatar.el
@@ -80,9 +80,8 @@ If nil, default to `gravatar-size'."
   "Insert GRAVATAR for ADDRESS in HEADER in current article buffer.
 Set image category to CATEGORY."
   (unless (eq gravatar 'error)
-    (with-current-buffer gnus-article-buffer
+    (gnus-with-article-buffer
       (let ((mark (point-marker))
-            (inhibit-read-only t)
             (inhibit-point-motion-hooks t)
             (case-fold-search t))
         (save-restriction
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 30cd1275e7b..832cd758b61 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -4400,6 +4400,21 @@ and the second element is the address."
 (defun gnus-group-set-params-info (group params)
   (gnus-group-set-info params group 'params))
 
+;; Ad-hoc function for inserting data from a different newsrc.eld
+;; file.  Use with caution, if at all.
+(defun gnus-import-other-newsrc-file (file)
+  (with-temp-buffer
+    (insert-file file)
+    (let (form)
+      (while (ignore-errors
+               (setq form (read (current-buffer))))
+        (when (and (consp form)
+                   (eq (cadr form) 'gnus-newsrc-alist))
+          (let ((infos (cadr (nth 2 form))))
+            (dolist (info infos)
+              (when (gnus-get-info (car info))
+                (gnus-set-info (car info) info)))))))))
+
 (defun gnus-add-marked-articles (group type articles &optional info force)
   ;; Add ARTICLES of TYPE to the info of GROUP.
   ;; If INFO is non-nil, use that info.  If FORCE is non-nil, don't
diff --git a/lisp/gnus/gnus-range.el b/lisp/gnus/gnus-range.el
index 794d1642cdd..ce5a837eaef 100644
--- a/lisp/gnus/gnus-range.el
+++ b/lisp/gnus/gnus-range.el
@@ -116,10 +116,10 @@ Both ranges must be in ascending order."
                ;; All done with range2
                (setq r nil))
               ((< max1 min2)
-               ;; No overlap: range1 preceeds range2
+               ;; No overlap: range1 precedes range2
                (pop r))
               ((< max2 min1)
-               ;; No overlap: range2 preceeds range1
+               ;; No overlap: range2 precedes range1
                (pop range2))
               ((and (<= min2 min1) (<= max1 max2))
                ;; Complete overlap: range1 removed
@@ -232,10 +232,10 @@ RANGE1 and RANGE2 have to be sorted over <."
     (setq range1 (cdr range1)
           range2 (cdr range2))
     (while (and min1 min2)
-      (cond ((< max1 min2)              ; range1 preceeds range2
+      (cond ((< max1 min2)              ; range1 precedes range2
              (setq range1 (cdr range1)
                    min1 nil))
-            ((< max2 min1)              ; range2 preceeds range1
+            ((< max2 min1)              ; range2 precedes range1
              (setq range2 (cdr range2)
                    min2 nil))
             (t                     ; some sort of overlap is occurring
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index dea6aabc75b..ebfa53f841e 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -1513,7 +1513,7 @@ If SCAN, request a scan of that group as well."
            (num 0))
 
       ;; These checks are present in gnus-activate-group but skipped
-      ;; due to setting dont-check in the preceeding call.
+      ;; due to setting dont-check in the preceding call.
 
       ;; If a cache is present, we may have to alter the active info.
       (when (and gnus-use-cache info)
@@ -1690,6 +1690,16 @@ If SCAN, request a scan of that group as well."
                             method))
               (setcar elem method))
             (push (list method 'ok) methods)))))
+
+    ;; If we have primary/secondary select methods, but no groups from
+    ;; them, we still want to issue a retrieval request from them.
+    (dolist (method (cons gnus-select-method
+                          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))))
+
     ;; Start early async retrieval of data.
     (dolist (elem type-cache)
       (destructuring-bind (method method-type infos dummy) elem
@@ -1712,15 +1722,6 @@ If SCAN, request a scan of that group as well."
               (setcar (nthcdr 3 elem)
                       (gnus-retrieve-group-data-early method infos)))))))
 
-    ;; If we have primary/secondary select methods, but no groups from
-    ;; them, we still want to issue a retrieval request from them.
-    (dolist (method (cons gnus-select-method
-                          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))))
-
     ;; Do the rest of the retrieval.
     (dolist (elem type-cache)
       (destructuring-bind (method method-type infos early-data) elem
@@ -1886,7 +1887,7 @@ If SCAN, request a scan of that group as well."
                             ;; OK - I'm done
                             (setq articles nil))
                            ((< range article)
-                            ;; this range preceeds the article. Leave the range unmodified.
+                            ;; this range precedes the article. Leave the range unmodified.
                             (pop ranges)
                             ranges)
                            ((= range article)
@@ -1909,11 +1910,11 @@ If SCAN, request a scan of that group as well."
                             (setcar ranges min)
                             ranges)
                            ((< max article)
-                            ;; this range preceeds the article. Leave the range unmodified.
+                            ;; this range precedes the article. Leave the range unmodified.
                             (pop ranges)
                             ranges)
                            ((< article min)
-                            ;; this article preceeds the range.  Return null to move to the
+                            ;; this article precedes the range.  Return null to move to the
                             ;; next article
                             nil)
                            (t
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 42acb65ff9f..a5c727925f6 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -3114,6 +3114,10 @@ Return nil if not defined."
 (defmacro gnus-get-info (group)
   `(nth 2 (gnus-gethash ,group gnus-newsrc-hashtb)))
 
+(defun gnus-set-info (group info)
+  (setcar (nthcdr 2 (gnus-gethash group gnus-newsrc-hashtb))
+          info))
+
 ;;; Load the compatibility functions.
 
 (require 'gnus-ems)
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index b2733407836..c579261e356 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -62,8 +62,9 @@ it will default to `imap'.")
 
 (defvoo nnimap-stream 'undecided
   "How nnimap will talk to the IMAP server.
-Values are `ssl', `network', `starttls' or `shell'.
-The default is to try `ssl' first, and then `network'.")
+Values are `ssl', `network', `network-only, `starttls' or
+`shell'.  The default is to try `ssl' first, and then
+`network'.")
 
 (defvoo nnimap-shell-program (if (boundp 'imap-shell-program)
                                  (if (listp imap-shell-program)
@@ -337,7 +338,7 @@ textual parts.")
                   (eq nnimap-stream 'starttls))
               (nnheader-message 7 "Opening connection to %s..."
                                 nnimap-address)
-              '("143" "imap"))
+              '("imap" "143"))
              ((eq nnimap-stream 'shell)
               (nnheader-message 7 "Opening connection to %s via shell..."
                                 nnimap-address)
@@ -345,16 +346,16 @@ textual parts.")
              ((memq nnimap-stream '(ssl tls))
               (nnheader-message 7 "Opening connection to %s via tls..."
                                 nnimap-address)
-              '("143" "993" "imap" "imaps"))
+              '("imaps" "imap" "993" "143"))
              (t
               (error "Unknown stream type: %s" nnimap-stream))))
            (proto-stream-always-use-starttls t)
            login-result credentials)
       (when nnimap-server-port
-        (setq ports (append ports (list nnimap-server-port))))
+        (push nnimap-server-port ports))
       (destructuring-bind (stream greeting capabilities stream-type)
           (open-protocol-stream
-           "*nnimap*" (current-buffer) nnimap-address (car (last ports))
+           "*nnimap*" (current-buffer) nnimap-address (car ports)
            :type nnimap-stream
            :shell-command nnimap-shell-program
            :capability-command "1 CAPABILITY\r\n"
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el
index 09ecfb8f6b7..66a6365cb3b 100644
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -1672,7 +1672,7 @@ password contained in '~/.nntp-authinfo'."
 
         ;; Some nntp servers seem to have an extension to the XOVER
         ;; extension.  On these servers, requesting an article range
-        ;; preceeding the active range does not return an error as
+        ;; preceding the active range does not return an error as
         ;; specified in the RFC.  What we instead get is the NOV entry
         ;; for the first available article.  Obviously, a client can
         ;; use that entry to avoid making unnecessary requests.  The
diff --git a/lisp/gnus/sieve.el b/lisp/gnus/sieve.el
index 31b2665a644..2111d34eac5 100644
--- a/lisp/gnus/sieve.el
+++ b/lisp/gnus/sieve.el
@@ -98,39 +98,40 @@ require \"fileinto\";
 
 (defvar sieve-manage-buffer nil)
 (defvar sieve-buffer-header-end nil)
+(defvar sieve-buffer-script-name nil
+  "The real script name of the buffer.")
+(make-local-variable 'sieve-buffer-script-name)
 
 ;; Sieve-manage mode:
 
-(defvar sieve-manage-mode-map nil
+(defvar sieve-manage-mode-map
+  (let ((map (make-sparse-keymap)))
+    ;; various
+    (define-key map "?" 'sieve-help)
+    (define-key map "h" 'sieve-help)
+    (define-key map "q" 'sieve-bury-buffer)
+    ;; activating
+    (define-key map "m" 'sieve-activate)
+    (define-key map "u" 'sieve-deactivate)
+    (define-key map "\M-\C-?" 'sieve-deactivate-all)
+    ;; navigation keys
+    (define-key map "\C-p" 'sieve-prev-line)
+    (define-key map [up] 'sieve-prev-line)
+    (define-key map "\C-n" 'sieve-next-line)
+    (define-key map [down] 'sieve-next-line)
+    (define-key map " " 'sieve-next-line)
+    (define-key map "n" 'sieve-next-line)
+    (define-key map "p" 'sieve-prev-line)
+    (define-key map "\C-m" 'sieve-edit-script)
+    (define-key map "f" 'sieve-edit-script)
+    (define-key map "o" 'sieve-edit-script-other-window)
+    (define-key map "r" 'sieve-remove)
+    (define-key map "q" 'sieve-manage-quit)
+    (define-key map [(down-mouse-2)] 'sieve-edit-script)
+    (define-key map [(down-mouse-3)] 'sieve-manage-mode-menu)
+    map)
   "Keymap for `sieve-manage-mode'.")
 
-(if sieve-manage-mode-map
-    ()
-  (setq sieve-manage-mode-map (make-sparse-keymap))
-  (suppress-keymap sieve-manage-mode-map)
-  ;; various
-  (define-key sieve-manage-mode-map "?" 'sieve-help)
-  (define-key sieve-manage-mode-map "h" 'sieve-help)
-  (define-key sieve-manage-mode-map "q" 'sieve-bury-buffer)
-  ;; activating
-  (define-key sieve-manage-mode-map "m" 'sieve-activate)
-  (define-key sieve-manage-mode-map "u" 'sieve-deactivate)
-  (define-key sieve-manage-mode-map "\M-\C-?" 'sieve-deactivate-all)
-  ;; navigation keys
-  (define-key sieve-manage-mode-map "\C-p" 'sieve-prev-line)
-  (define-key sieve-manage-mode-map [up] 'sieve-prev-line)
-  (define-key sieve-manage-mode-map "\C-n" 'sieve-next-line)
-  (define-key sieve-manage-mode-map [down] 'sieve-next-line)
-  (define-key sieve-manage-mode-map " " 'sieve-next-line)
-  (define-key sieve-manage-mode-map "n" 'sieve-next-line)
-  (define-key sieve-manage-mode-map "p" 'sieve-prev-line)
-  (define-key sieve-manage-mode-map "\C-m" 'sieve-edit-script)
-  (define-key sieve-manage-mode-map "f" 'sieve-edit-script)
-  (define-key sieve-manage-mode-map "o" 'sieve-edit-script-other-window)
-  (define-key sieve-manage-mode-map "r" 'sieve-remove)
-  (define-key sieve-manage-mode-map [(down-mouse-2)] 'sieve-edit-script)
-  (define-key sieve-manage-mode-map [(down-mouse-3)] 'sieve-manage-mode-menu))
-
 (easy-menu-define sieve-manage-mode-menu sieve-manage-mode-map
   "Sieve Menu."
   '("Manage Sieve"
@@ -138,21 +139,21 @@ require \"fileinto\";
     ["Activate script" sieve-activate t]
     ["Deactivate script" sieve-deactivate t]))
 
-(define-derived-mode sieve-manage-mode fundamental-mode "SIEVE"
+(define-derived-mode sieve-manage-mode fundamental-mode "Sieve-manage"
   "Mode used for sieve script management."
-  (setq mode-name "SIEVE")
   (buffer-disable-undo (current-buffer))
   (setq truncate-lines t)
   (easy-menu-add sieve-manage-mode-menu sieve-manage-mode-map))
 
 (put 'sieve-manage-mode 'mode-class 'special)
 
-;; This is necessary to allow correct handling of \\[cvs-mode-diff-map]
-;; in substitute-command-keys.
-;(fset 'sieve-manage-mode-map sieve-manage-mode-map)
-
 ;; Commands used in sieve-manage mode:
 
+(defun sieve-manage-quit ()
+  "Quit."
+  (interactive)
+  (kill-buffer (current-buffer)))
+
 (defun sieve-activate (&optional pos)
   (interactive "d")
   (let ((name (sieve-script-at-point)) err)
@@ -204,7 +205,10 @@ require \"fileinto\";
       (switch-to-buffer (get-buffer-create "template.siv"))
       (insert sieve-template))
     (sieve-mode)
-    (message "Press C-c C-l to upload script to server.")))
+    (setq sieve-buffer-script-name name)
+    (message
+     (substitute-command-keys
+      "Press \\[sieve-upload] to upload script to server."))))
 
 (defmacro sieve-change-region (&rest body)
   "Turns off sieve-region before executing BODY, then re-enables it after.
@@ -337,13 +341,18 @@ Server  : " server ":" (or port "2000") "
     ;; get list of script names and print them
     (let ((scripts (sieve-manage-listscripts sieve-manage-buffer)))
       (if (null scripts)
-          (insert (format (concat "No scripts on server, press RET on %s to "
-                                  "create a new script.\n") sieve-new-script))
-        (insert (format (concat "%d script%s on server, press RET on a script "
-                                "name edits it, or\npress RET on %s to create "
-                                "a new script.\n") (length scripts)
-                                (if (eq (length scripts) 1) "" "s")
-                                sieve-new-script)))
+          (insert
+           (substitute-command-keys
+            (format
+             "No scripts on server, press \\[sieve-edit-script] on %s to create a new script.\n"
+             sieve-new-script)))
+        (insert
+         (substitute-command-keys
+          (format (concat "%d script%s on server, press \\[sieve-edit-script] on a script "
+                          "name edits it, or\npress \\[sieve-edit-script] on %s to create "
+                          "a new script.\n") (length scripts)
+                          (if (eq (length scripts) 1) "" "s")
+                          sieve-new-script))))
       (save-excursion
         (sieve-insert-scripts (list sieve-new-script))
         (sieve-insert-scripts scripts)))
@@ -363,15 +372,15 @@ Server  : " server ":" (or port "2000") "
 ;;;###autoload
 (defun sieve-upload (&optional name)
   (interactive)
-  (unless name
-    (setq name (buffer-name)))
   (when (or (get-buffer sieve-buffer) (call-interactively 'sieve-manage))
     (let ((script (buffer-string)) err)
       (with-current-buffer (get-buffer sieve-buffer)
-        (setq err (sieve-manage-putscript name script sieve-manage-buffer))
+        (setq err (sieve-manage-putscript
+                   (or name sieve-buffer-script-name (buffer-name))
+                   script sieve-manage-buffer))
         (if (sieve-manage-ok-p err)
-            (message (concat
-                      "Sieve upload done.  Use `C-c RET' to manage scripts."))
+            (message (substitute-command-keys
+                      "Sieve upload done.  Use \\[sieve-manage] to manage scripts."))
           (message "Sieve upload failed: %s" (nth 2 err)))))))
 
 ;;;###autoload
diff --git a/lisp/ido.el b/lisp/ido.el
index d1f2cea83f8..2e67e367a8f 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -1472,8 +1472,8 @@ Removes badly formatted data and ignored directories."
   (add-hook 'choose-completion-string-functions 'ido-choose-completion-string))
 
 (define-minor-mode ido-everywhere
-  "Toggle using ido speed-ups everywhere file and directory names are read.
-With ARG, turn ido speed-up on if arg is positive, off otherwise."
+  "Toggle using ido-mode everywhere file and directory names are read.
+With ARG, turn ido-mode on if arg is positive, off otherwise."
   :global t
   :group 'ido
   (when (get 'ido-everywhere 'file)
@@ -1494,8 +1494,8 @@ With ARG, turn ido speed-up on if arg is positive, off otherwise."
 
 ;;;###autoload
 (defun ido-mode (&optional arg)
-  "Toggle ido speed-ups on or off.
-With ARG, turn ido speed-up on if arg is positive, off otherwise.
+  "Toggle ido mode on or off.
+With ARG, turn ido-mode on if arg is positive, off otherwise.
 Turning on ido-mode will remap (via a minor-mode keymap) the default
 keybindings for the `find-file' and `switch-to-buffer' families of
 commands to the ido versions of these functions.
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 8672fca3a85..5f4d3ea849e 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -366,7 +366,9 @@ This also sets the following values:
                  (coding-system-get coding-system 'ascii-compatible-p)))
         (setq default-file-name-coding-system coding-system)))
   (setq default-terminal-coding-system coding-system)
-  (setq default-keyboard-coding-system coding-system)
+  ;; Prevent default-terminal-coding-system from converting ^M to ^J.
+  (setq default-keyboard-coding-system
+        (coding-system-change-eol-conversion coding-system 'unix))
   ;; Preserve eol-type from existing default-process-coding-systems.
   ;; On non-unix-like systems in particular, these may have been set
   ;; carefully by the user, or by the startup code, to deal with the
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 7fe5383d865..9a892f493d7 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -503,7 +503,7 @@ FIELD is the plain text name of a field in the message, such as
 \"subject\" or \"from\".  A FIELD of \"to\" will automatically include
 all text from the \"cc\" field as well.
 
-REGEXP is an expression to match in the preceeding specified FIELD.
+REGEXP is an expression to match in the preceding specified FIELD.
 FIELD/REGEXP pairs continue in the list.
 
 examples:
@@ -4316,7 +4316,7 @@ With prefix argument N moves forward N messages with these labels.
 
 ;;;***
 
-;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "04902da045706fb7f2b0915529ed161b")
+;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "c530622b53038152ca84f2ec9313bd7a")
 ;;; Generated autoloads from rmailmm.el
 
 (autoload 'rmail-mime "rmailmm" "\
diff --git a/lisp/net/tramp-cmds.el b/lisp/net/tramp-cmds.el
index 7d266ad17d7..58f1e2c6a9e 100644
--- a/lisp/net/tramp-cmds.el
+++ b/lisp/net/tramp-cmds.el
@@ -281,6 +281,12 @@ buffer in your bug report.
         (insert ")\n"))
       (insert-buffer-substring elbuf)))
 
+  ;; Dump load-path shadows.
+  (insert "\nload-path shadows:\n==================\n")
+  (ignore-errors
+    (mapc (lambda (x) (when (string-match "tramp" x) (insert x "\n")))
+          (split-string (list-load-path-shadows t) "\n")))
+
   ;; Append buffers only when we are in message mode.
   (when (and
          (eq major-mode 'message-mode)
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index 57cc54935dc..b3278dc312d 100644
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -142,7 +142,7 @@
       (add-to-list 'tramp-methods (cons elt nil)))))
 
 (defconst tramp-gvfs-path-tramp (concat dbus-path-emacs "/Tramp")
-  "The preceeding object path for own objects.")
+  "The preceding object path for own objects.")
 
 (defconst tramp-gvfs-service-daemon "org.gtk.vfs.Daemon"
   "The well known name of the GVFS daemon.")
diff --git a/lisp/obsolete/sym-comp.el b/lisp/obsolete/sym-comp.el
index 6365a1075e0..7e9a460ea14 100644
--- a/lisp/obsolete/sym-comp.el
+++ b/lisp/obsolete/sym-comp.el
@@ -51,7 +51,7 @@ Uses `current-word' with the buffer narrowed to the part before
 point."
   (save-restriction
     ;; Narrow in case point is in the middle of a symbol -- we want
-    ;; just the preceeding part.
+    ;; just the preceding part.
     (narrow-to-region (point-min) (point))
     (current-word)))
 
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 5f0908e11c6..68d957584c6 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,14 @@
+2011-02-28  Juanma Barranquero  <lekktu@gmail.com>
+
+        * org.el (org-maybe-keyword-time-regexp):
+        * org-icalendar.el (org-icalendar-store-UID):
+        * org-agenda.el (org-agenda-scheduled-leaders)
+        (org-agenda-deadline-leaders, org-agenda-filter-preset):
+        * org-table.el (org-table-current-line-types)
+        (org-table-current-begin-line, org-table-current-begin-pos):
+        (org-table-current-field-formula):
+        Fix typos in docstrings.
+
 2011-02-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * org-remember.el (org-remember-mode-map):
diff --git a/lisp/password-cache.el b/lisp/password-cache.el
index 8738aa65a9f..a7f75a03add 100644
--- a/lisp/password-cache.el
+++ b/lisp/password-cache.el
@@ -76,6 +76,12 @@ regulate cache behavior."
        key
        (symbol-value (intern-soft key password-data))))
 
+(defun password-in-cache-p (key)
+  "Check if KEY is in the cache."
+  (and password-cache
+       key
+       (intern-soft key password-data)))
+
 (defun password-read (prompt &optional key)
   "Read password, for use with KEY, from user, or from cache if wanted.
 KEY indicate the purpose of the password, so the cache can
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 7c634d14e6a..f6d497569ba 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -2769,7 +2769,7 @@ Will not look before LIM."
                   (goto-char (cperl-beginning-of-property p look-prop))
                   (beginning-of-line)
                   (setq pre-indent-point (point)))))
-          (goto-char pre-indent-point)  ; Orig line skipping preceeding pod/etc
+          (goto-char pre-indent-point)  ; Orig line skipping preceding pod/etc
           (let* ((case-fold-search nil)
                  (s-s (cperl-get-state (car parse-data) (nth 1 parse-data)))
                  (start (or (nth 2 parse-data) ; last complete sexp terminated
@@ -2796,8 +2796,8 @@ Will not look before LIM."
                           (cperl-1+ char-after-pos) 'indentable)
                          p (1+ (cperl-beginning-of-property
                                 (point) 'indentable))
-                         is-block       ; misused for: preceeding line in REx
-                         (save-excursion ; Find preceeding line
+                         is-block       ; misused for: preceding line in REx
+                         (save-excursion ; Find preceding line
                            (cperl-backward-to-noncomment p)
                            (beginning-of-line)
                            (if (<= (point) p)
@@ -2813,10 +2813,10 @@ Will not look before LIM."
                          prop (parse-partial-sexp p char-after-pos))
                    (cond ((not delim)   ; End the REx, ignore is-block
                           (vector 'indentable 'terminator p is-block))
-                         (is-block      ; Indent w.r.t. preceeding line
+                         (is-block      ; Indent w.r.t. preceding line
                           (vector 'indentable 'cont-line char-after-pos
                                   is-block char-after p))
-                         (t             ; No preceeding line...
+                         (t             ; No preceding line...
                           (vector 'indentable 'first-line p))))
                   ((get-text-property char-after-pos 'REx-part2)
                    (vector 'REx-part2 (point)))
@@ -2897,7 +2897,7 @@ Will not look before LIM."
                          (cperl-backward-to-start-of-continued-exp containing-sexp))
                      (beginning-of-line)
                      (cperl-backward-to-noncomment containing-sexp))
-                   ;; Now we get non-label preceeding the indent point
+                   ;; Now we get non-label preceding the indent point
                    (if (not (or (eq (1- (point)) containing-sexp)
                                 (memq (preceding-char)
                                       (append (if is-block " ;{" " ,;{") '(nil)))
@@ -4835,7 +4835,7 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
 ;;; Moreover, one takes positive approach (looks for else,grep etc)
 ;;; another negative (looks for bless,tr etc)
 (defun cperl-after-block-p (lim &optional pre-block)
-  "Return true if the preceeding } (if PRE-BLOCK, following {) delimits a block.
+  "Return true if the preceding } (if PRE-BLOCK, following {) delimits a block.
 Would not look before LIM.  Assumes that LIM is a good place to begin a
 statement.  The kind of block we treat here is one after which a new
 statement would start; thus the block in ${func()} does not count."
@@ -4864,7 +4864,7 @@ statement would start; thus the block in ${func()} does not count."
                                (progn
                                  (forward-sexp -1)
                                  (looking-at "sub[ \t\n\f#]"))))))
-                ;; What preceeds is not word...  XXXX Last statement in sub???
+                ;; What precedes is not word...  XXXX Last statement in sub???
                 (cperl-after-expr-p lim))))
       (error nil))))
 
diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el
index 30d9fc21867..5b7e07a5aad 100644
--- a/lisp/progmodes/idlwave.el
+++ b/lisp/progmodes/idlwave.el
@@ -428,7 +428,7 @@ path \(the value of !PATH).  However, under Windows and MacOS
 variable can be set to specify the paths where IDLWAVE can find PRO
 files.  The shell will only be asked for a list of paths when this
 variable is nil.  The value is a list of directories.  A directory
-preceeded by a `+' will be searched recursively.  If you set this
+preceded by a `+' will be searched recursively.  If you set this
 variable on a UNIX system, the shell will not be queried.  See also
 `idlwave-system-directory'."
   :group 'idlwave-routine-info
@@ -1197,7 +1197,7 @@ As a user, you should not set this to t.")
           (2 font-lock-function-name-face)))
 
        ;; Keyword parameters, like /xlog or ,xrange=[]
-       ;; This is anchored to the comma preceeding the keyword.
+       ;; This is anchored to the comma preceding the keyword.
        ;; Treats continuation lines, works only during whole buffer
        ;; fontification.  Slow, use it only in fancy fontification.
        (keyword-parameters
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index cb1d3c24a94..75b706b74ec 100644
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -1775,7 +1775,7 @@ NOTE: Activate the new setting by restarting Emacs.
 
 (defcustom vhdl-intelligent-tab t
   "*Non-nil means `TAB' does indentation, word completion and tab insertion.
-That is, if preceeding character is part of a word then complete word,
+That is, if preceding character is part of a word then complete word,
 else if not at beginning of line then insert tab,
 else if last command was a `TAB' or `RET' then dedent one step,
 else indent current line (i.e. `TAB' is bound to `vhdl-electric-tab').
@@ -6946,7 +6946,7 @@ only-lines."
 ;; Indentation commands
 
 (defun vhdl-electric-tab (&optional prefix-arg)
-  "If preceeding character is part of a word or a paren then hippie-expand,
+  "If preceding character is part of a word or a paren then hippie-expand,
 else if right of non whitespace on line then insert tab,
 else if last command was a tab or return then dedent one step or if a comment
 toggle between normal indent and inline comment indent,
@@ -10396,7 +10396,7 @@ with double-quotes is to be inserted.  DEFAULT specifies a default string."
   (if vhdl-upper-case-keywords (upcase-word num) (downcase-word num)))
 
 (defun vhdl-minibuffer-tab (&optional prefix-arg)
-  "If preceeding character is part of a word or a paren then hippie-expand,
+  "If preceding character is part of a word or a paren then hippie-expand,
 else insert tab (used for word completion in VHDL minibuffer)."
   (interactive "P")
   (cond
@@ -13056,7 +13056,7 @@ hierarchy otherwise.")
 ;; Scan functions
 
 (defun vhdl-scan-context-clause ()
-  "Scan the context clause that preceeds a design unit."
+  "Scan the context clause that precedes a design unit."
   (let (lib-alist)
     (save-excursion
       (when (re-search-backward "^[ \t]*\\(architecture\\|configuration\\|entity\\|package\\)\\>" nil t)
diff --git a/lisp/replace.el b/lisp/replace.el
index 0f8adea2aca..928c3170c65 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -1531,7 +1531,7 @@ N     (match-string N)           (where N is a string of digits)
 #&    (string-to-number (match-string 0))
 #     replace-count
 
-Note that these symbols must be preceeded by a backslash in order to
+Note that these symbols must be preceded by a backslash in order to
 type them using Lisp syntax."
   (while (consp n)
     (cond
diff --git a/lisp/term/screen.el b/lisp/term/screen.el
new file mode 100644
index 00000000000..4931a422e09
--- /dev/null
+++ b/lisp/term/screen.el
@@ -0,0 +1,11 @@
+;; -*- no-byte-compile: t -*-
+;; Treat a screen terminal similar to an xterm.
+(load "term/xterm")
+
+(defun terminal-init-screen ()
+  "Terminal initialization function for screen."
+  ;; Use the xterm color initialization code.
+  (xterm-register-default-colors)
+  (tty-set-up-initial-frame-faces))
+
+;; screen.el ends here
diff --git a/lisp/textmodes/paragraphs.el b/lisp/textmodes/paragraphs.el
index 70f11cf66dc..a0892b5ebba 100644
--- a/lisp/textmodes/paragraphs.el
+++ b/lisp/textmodes/paragraphs.el
@@ -43,7 +43,7 @@ only considered as a candidate to match `paragraph-start' or
 
 Prefix argument says to turn mode on if positive, off if negative.
 When the mode is turned on, if there are newlines in the buffer but no hard
-newlines, ask the user whether to mark as hard any newlines preceeding a
+newlines, ask the user whether to mark as hard any newlines preceding a
 `paragraph-start' line.  From a program, second arg INSERT specifies whether
 to do this; it can be `never' to change nothing, t or `always' to force
 marking, `guess' to try to do the right thing with no questions, nil