Merge from trunk.

137 files changed, 2728 insertions, 1422 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 954daf68510..2ffd9ce77a8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,710 @@
+2012-04-21  Juanma Barranquero  <lekktu@gmail.com>
+
+        * progmodes/verilog-mode.el (verilog-mode): Check whether
+        which-func-modes is t before adding verilog-mode.
+        Reported by Andy Moreton <andrewjmoreton@gmail.com>.
+
+2012-04-21  Leo Liu  <sdl.web@gmail.com>
+
+        * net/rcirc.el (rcirc): Avoid error when process-contact returns t.
+
+2012-04-21  Michael Vehrs  <Michael.Burschik@gmx.de>
+
+        * woman.el: Add support for "T{ T}" tbl syntax, and fix the
+        filling of the last column of a table (Bug#5635).
+        (woman-find-next-control-line): New arg, specifying an additional
+        regexp component for the control line.
+        (woman2-roff-buffer): Use it.
+        (woman-break-table): New function.
+        (woman2-TS): Use it.
+
+2012-04-21  Chong Yidong  <cyd@gnu.org>
+
+        * woman.el (woman-set-buffer-display-table, woman-decode-region)
+        (woman-horizontal-escapes, woman-negative-vertical-space)
+        (woman-tab-to-tab-stop, woman2-fc, woman2-TS)
+        (WoMan-warn-ignored): Use ?\s instead of ?\ .
+
+2012-04-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * minibuffer.el (completion-file-name-table): Complete user names.
+
+2012-04-20  Leo Liu  <sdl.web@gmail.com>
+
+        * font-lock.el (lisp-font-lock-keywords-2): Add pcase, pcase-let
+        and pcase-let*.
+
+2012-04-20  Chong Yidong  <cyd@gnu.org>
+
+        * server.el (server-execute): Respect initial-buffer-choice if it
+        is a string and there are no files to open (Bug#2825).
+        (server-create-window-system-frame, server-create-tty-frame):
+        Don't switch buffers here.
+        (server-process-filter): Only try to open a window system frame if
+        compiled with graphical support (Bug#8314).
+
+2012-04-20  Dan Nicolaescu  <dann@gnu.org>
+
+        * battery.el (battery-echo-area-format): Display remaining time
+        for sysfs backend too (Bug#11269).
+        (battery-linux-sysfs): Fix conditional for the charge.
+
+2012-04-20  Chong Yidong  <cyd@gnu.org>
+
+        * progmodes/gdb-mi.el (gdb): Revert previous change.
+        (gdb-inferior-io--init-proc): New function.
+        (gdb-init-1): Use it.
+        (gdb-inferior-io-sentinel): New sentinel for the gdb-inferior pty,
+        responsible for allocating a new pty and hooking it to gdb when
+        the old pty gets an EIO due to process exit.
+        (gdb-delchar-or-quit): New command.  Bind it in gdb-mi buffers.
+        (gdb-tooltip-print): Don't use obsolete tooltip-use-echo-area.
+        (gdb-inferior-io--maybe-delete-pty): Move into gdb-reset.
+
+2012-04-20  Eli Zaretskii  <eliz@gnu.org>
+
+        * window.el (window-min-size, window-sizable, window-min-delta)
+        (window-max-delta, window--resizable, window-resizable)
+        (window-total-size, window-full-height-p, window-full-width-p)
+        (window-in-direction, window--resize-mini-window, window-resize)
+        (window--resize-child-windows-normal)
+        (window--resize-child-windows, window--resize-siblings)
+        (window--resize-this-window, adjust-window-trailing-edge)
+        (enlarge-window, shrink-window): Doc fixes.
+
+2012-04-20  Chong Yidong  <cyd@gnu.org>
+
+        * progmodes/gdb-mi.el (gdb-inferior-io--maybe-delete-pty): New
+        function to call delete-process on the gdb-inferior buffer's pty.
+        (gdb-reset): Use it, instead of relying on kill-buffer to kill the
+        pty process (Bug#11273).
+        (gdb-update): New arg to suppress talking to the gdb process.
+        (gdb-done-or-error): Use it.
+        (gdb-stopped-functions): Rename from gdb-stopped-hooks.
+        (gdb): Call gdb-inferior-io--maybe-delete-pty as a workaround for
+        sentinel not being called.
+
+        * comint.el (make-comint-in-buffer, comint-exec): Doc fix.
+
+        * progmodes/grep.el (grep, rgrep): Doc fix (Bug#11268).
+
+2012-04-20  Glenn Morris  <rgm@gnu.org>
+
+        * net/network-stream.el (open-network-stream): Doc fix.
+
+2012-04-20  Chong Yidong  <cyd@gnu.org>
+
+        * emacs-lisp/tabulated-list.el (tabulated-list-print): Fix typos.
+
+2012-04-20  Alan Mackenzie  <acm@muc.de>
+
+        Ensure searching for keywords is case sensitive.
+
+        * progmodes/cc-cmds.el (c-electric-brace, c-electric-lt-gt)
+        (c-electric-paren, c-beginning-of-defun, c-end-of-defun)
+        (c-defun-name, c-mark-function, c-cpp-define-name)
+        (c-comment-indent, c-scan-conditionals, c-indent-defun)
+        (c-context-line-break): Bind case-fold-search to nil.
+
+        * progmodes/cc-mode.el (c-font-lock-fontify-region): Bind
+        case-fold-search to nil.
+
+2012-04-20  Chong Yidong  <cyd@gnu.org>
+
+        * mail/sendmail.el (mail-bury): Call return action with the right
+        Rmail buffer (Bug#11242).
+
+        * server.el (server-process-filter): Handle corner case where both
+        tty and nowait options are present (Bug#11102).
+
+2012-04-20  Eli Zaretskii  <eliz@gnu.org>
+
+        * version.el (emacs-bzr-version, emacs-bzr-get-version): Doc fixes.
+        (top level): Put into the executable the ident-style '$Id:' tag on
+        windows-nt as well.
+
+2012-04-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * electric.el (electric-indent-post-self-insert-function): Check that
+        electric-indent-mode is enabled in current buffer.
+
+2012-04-19  Juanma Barranquero  <lekktu@gmail.com>
+
+        * imenu.el (imenu-progress-message): Restore; it is "used" in
+        erc/erc-imenu.el and net/snmp-mode.el.
+
+2012-04-19  Juanma Barranquero  <lekktu@gmail.com>
+
+        * avoid.el (mouse-avoidance-mode): Mark unused arg.
+        (mouse-avoidance-nudge-mouse): Remove unused binding.
+
+        * bs.el (bs-toggle-readonly): Call `toggle-read-only' interactively.
+
+        * descr-text.el (describe-char):
+        * progmodes/python.el (python-describe-symbol):
+        Don't call `toggle-read-only', set `buffer-read-only'.
+
+        * imenu.el (imenu-default-goto-function): Mark unused args.
+        (imenu-progress-message): Remove obsolete macro; all callers changed.
+
+        * subr.el (keymap-canonicalize): Remove unused binding.
+        (read-passwd): Mark unused arg.
+
+        * tutorial.el (tutorial--display-changes): Remove unused binding.
+        (tutorial--save-tutorial-to): Remove unused variable.
+
+        * emacs-lisp/package.el (define-package, package-menu-mark-delete)
+        (package-menu-mark-install, package-menu-mark-unmark): Mark unused args.
+        (package-generate-autoloads, package-menu--generate)
+        (package-menu--find-upgrades): Remove unused bindings.
+
+        * emulation/cua-rect.el (cua-restrict-regexp-rectangle)
+        (cua-restrict-prefix-rectangle): Doc fixes.  Remove unused bindings.
+        (cua--mouse-ignore, cua--delete-rectangle, cua--extract-rectangle)
+        (cua--indent-rectangle, cua-open-rectangle, cua-close-rectangle)
+        (cua-blank-rectangle, cua-string-rectangle, cua-replace-in-rectangle)
+        (cua-incr-rectangle, cua-sequence-rectangle, cua--convert-rectangle-as)
+        (cua--rectangle-aux-replace, cua--left-fill-rectangle)
+        (cua-scroll-rectangle-up, cua-scroll-rectangle-down)
+        (cua-delete-char-rectangle): Mark unused args.
+        (cua-align-rectangle): Remove unused binding.
+
+        * mail/rmail.el (compilation--message->loc)
+        (epa--find-coding-system-for-mime-charset): Declare.
+
+        * net/dbus.el (dbus-register-service): Declare.
+        (dbus-name-owner-changed-handler): Remove unused binding.
+
+        * nxml/nxml-mode.el (nxml-electric-slash, nxml-in-mixed-content-p)
+        (nxml-compute-indent-from-matching-start-tag): Remove unused variables.
+        (nxml-scan-backward-within): Mark unused arg.
+        (nxml-dynamic-markup-word): Remove unused binding.
+
+        * mouse.el (mouse-menu-major-mode-map):
+        * emacs-lisp/authors.el (authors-scan-change-log)
+        (authors-add-to-author-list):
+        * emacs-lisp/avl-tree.el (avl-tree--enter-balance):
+        * emacs-lisp/smie.el (smie-auto-fill):
+        * mail/sendmail.el (mail-bury):
+        * mail/unrmail.el (unrmail):
+        * net/tls.el (open-tls-stream):
+        * textmodes/picture.el (picture-mouse-set-point):
+        Remove unused bindings.
+
+2012-04-19  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-action-password): Let-bind
+        `enable-recursive-minibuffers' to t.
+
+2012-04-18  Sam Steingold  <sds@gnu.org>
+
+        * progmodes/gud.el (gud-key-prefix): Use :type 'key-sequence
+        instead of 'string to accommodate values like [f11].
+        Always use `vconcat' instead of `concat' on it, like in `gud-def'.
+        * progmodes/gdb-mi.el: Likewise.
+
+2012-04-18  Leo Liu  <sdl.web@gmail.com>
+
+        * abbrev.el (edit-abbrevs): Move point to the abbrev table of
+        current buffer.
+        (prepare-abbrev-list-buffer): Enter edit-abbrevs-mode only if
+        LOCAL is nil.
+
+2012-04-18  Chong Yidong  <cyd@gnu.org>
+
+        * simple.el (line-move): Use forward-line if in batch mode
+        (Bug#11053).
+
+2012-04-18  Christopher Schmidt  <christopher@ch.ristopher.com>
+
+        * files.el (after-find-file): Do not try to add a final newline if
+        the buffer is read-only (Bug#11156).
+
+2012-04-17  Richard Stallman  <rms@gnu.org>
+
+        * mail/rmail.el (rmail-start-mail):
+        Pass (rmail-mail-return...) for the return-action.
+        Pass (rmail-yank-current-message...) for the yank-action.
+        (rmail-yank-current-message): New function.
+        (rmail-mail): Pass the Rmail buffer, not view buffer, for replybuffer.
+        (rmail-reply): Likewise.
+        (rmail-forward): Pass the Rmail buffer, not nil, for replybuffer.
+
+        * mail/sendmail.el (mail-bury): Choose the first rmail-mode
+        buffer, not the last.  Reject temp buffers.  Use the rmail-mode
+        buffer, not newbuf.
+
+2012-04-17  Juanma Barranquero  <lekktu@gmail.com>
+
+        * server.el (server-ensure-safe-dir): Simplify.
+
+2012-04-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/smie.el: Provide smarter auto-filling.
+        (smie-auto-fill): New function.
+        (smie-setup): Use it.
+
+        * newcomment.el (comment-choose-indent): Obey comment-inline-offset.
+
+2012-04-17  Philipp Haselwarter  <philipp.haselwarter@gmx.de>  (tiny change)
+
+        * newcomment.el (comment-inline-offset): New custom var (bug#11090).
+        (comment-indent): Use it.
+
+2012-04-17  Vincent Belaïche  <vincentb1@users.sourceforge.net>
+
+        * ses.el: The overall change is to add cell renaming, that is
+        setting fancy names for cell symbols other than name matching
+        "\\`[A-Z]+[0-9]+\\'" regexp .
+        (ses-localvars): Add ses--renamed-cell-symb-list.
+        (ses-create-cell-variable): New defun.
+        (ses-destroy-cell-variable-range): Respect ses--numrows, ses--numcols.
+        (ses-relocate-formula): Relocate formulas only for cells the
+        symbols of which are not renamed, i.e. symbols whose names do not
+        match regexp "\\`[A-Z]+[0-9]+\\'".
+        (ses-relocate-all): Relocate values only for cells the symbols of
+        which are not renamed.
+        (ses-load): Create cells variables as the (ses-cell ...) are read,
+        in order to check row col consistency with cell symbol name only
+        for cells that are not renamed.
+        (ses-replace-name-in-formula): New defun.
+        (ses-rename-cell): New defun.
+
+2012-04-17  Peter Oliver  <bzr@mavit.org.uk>  (tiny change)
+
+        * progmodes/perl-mode.el (perl-indent-parens-as-block):
+        New option (bug#11118).
+        (perl-calculate-indent): Respect it.
+
+2012-04-17  Glenn Morris  <rgm@gnu.org>
+
+        * dired-aux.el (dired-mark-read-string): Doc fix.
+
+2012-04-17  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * dired-aux.el (dired-mark-read-string): Offer optional completion.
+        (dired-do-chxxx): Complete chown, chgrp over users, groups.  (Bug#7900)
+
+2012-04-17  Glenn Morris  <rgm@gnu.org>
+
+        * mouse.el (mouse-drag-track):
+        * speedbar.el (speedbar-frame-mode):
+        Use auto-hscroll-mode rather than the alias automatic-hscrolling.
+
+2012-04-16  Leo Liu  <sdl.web@gmail.com>
+
+        * progmodes/python.el: Trivial cleanup.
+
+2012-04-16  Glenn Morris  <rgm@gnu.org>
+
+        * vc/vc.el (vc-string-prefix-p):
+        * vc/pcvs-util.el (cvs-string-prefix-p):
+        * textmodes/tex-mode.el (latex-string-prefix-p, tex-string-prefix-p):
+        * mpc.el (mpc-string-prefix-p):
+        Make all of these into obsolete aliases for string-prefix-p.
+        Update callers.
+        * vc/pcvs.el, vc/vc-dispatcher.el, vc/vc-dir.el: Update callers.
+
+        * textmodes/two-column.el: Move custom options to the start.
+        (frame-width): Remove compat definition.
+        (2C-associate-buffer, 2C-dissociate):
+        Use with-current-buffer rather than save-excursion.
+        (2C-dissociate): Force a mode-line update.
+        (2C-autoscroll): Use ignore-errors.
+
+        * emacs-lisp/eieio-opt.el (describe-class, describe-generic):
+        Autoload trivia.
+
+        * emacs-lisp/cl-extra.el (*random-state*):
+        Remove unnecessary declaration.
+
+        * calendar/cal-tex.el (cal-tex-end-document): Trivial clarification.
+
+        * play/cookie1.el (cookie-snarf):
+        Give an explicit error if input file cannot be read.
+
+        * play/yow.el (yow-file): Use expand-file-name rather than concat.
+
+        * progmodes/perl-mode.el (c-macro-expand):
+        Remove unnecessary autoload (it is in loaddefs.el).
+
+        * textmodes/picture.el (picture-desired-column)
+        (picture-update-desired-column): Convert comments to doc-strings.
+        (picture-substitute): Remove function.
+        (picture-mode-map): Initialize in the defvar.
+
+        * woman.el: Remove eval-after-load for tar-mode.
+        * tar-mode.el (tar-mode-map): Add woman binding and menu entry.
+        (woman-tar-extract-file): Autoload it.
+
+        * frame.el (automatic-hscrolling): Make this alias obsolete.
+
+2012-04-12  Agustín Martín Domingo  <agustin.martin@hispalinux.es>
+
+        * ispell.el (ispell-set-spellchecker-params): Post-process
+        `ispell-dictionary-alist' to use [:alpha:] and utf-8 if possible.
+        (ispell-dictionary-base-alist): Revert to original XEmacs
+        friendly version for default.  [:alpha:] will be added in
+        `ispell-set-spellchecker-params' if needed
+
+2012-04-16  Chong Yidong  <cyd@gnu.org>
+
+        * image.el (imagemagick--extension-regexp): New variable.
+        (imagemagick-register-types): Use it.
+        (imagemagick-types-inhibit): Add :set function.  Allow new value
+        of t to inhibit all types.
+
+        * emacs-lisp/regexp-opt.el (regexp-opt-charset): Avoid cl macros,
+        so we can preload it.
+
+        * loadup.el (fboundp): Preload regexp-opt, needed by
+        imagemagick-register-types.
+
+2012-04-15  Chong Yidong  <cyd@gnu.org>
+
+        * frame.el (scrolling): Remove nearly unused customization group.
+
+        * scroll-all.el (scroll-all-mode): Move to windows group.
+
+2012-04-15  Chong Yidong  <cyd@gnu.org>
+
+        * bindings.el (goto-map): Bind goto-char to M-g c (Bug#11240).
+
+2012-04-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        Avoid the use of ((lambda ...) ...) in lexical-binding code.
+        * emacs-lisp/easy-mmode.el (define-minor-mode): Use funcall (bug#11241).
+
+2012-04-15  Glenn Morris  <rgm@gnu.org>
+
+        * simple.el (process-file-side-effects): Doc fix.
+
+2012-04-15  Glenn Morris  <rgm@gnu.org>
+
+        * international/mule-cmds.el (set-language-environment): Doc fix.
+
+2012-04-14  Juanma Barranquero  <lekktu@gmail.com>
+
+        * server.el (server-auth-key, server-generate-key): Doc fixes.
+        (server-get-auth-key): Doc fix.  Use `string-match-p'.
+        (server-start): Reflow docstring.
+
+2012-04-14  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * server.el (server-generate-key): `called-interactively-p'
+        requires a parameter.
+
+2012-04-14  Michal Nazarewicz  <mina86@mina86.com>
+
+        * server.el (server-auth-key): New variable.
+        (server-generate-key, server-get-auth-key): New function.
+        (server-start): Use the new variable and functions to allow
+        setting a permanent server key (bug#9423).
+
+2012-04-14  Leo Liu  <sdl.web@gmail.com>
+
+        * vc/diff-mode.el (diff-file-prev/next): Fix typo.
+
+2012-04-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Spelling fixes.
+        * hexl.el (hexl-rulerize): Rename from hexl-rulerise, since
+        Emacs uses American spelling.
+
+2012-04-14  Juanma Barranquero  <lekktu@gmail.com>
+
+        * emacs-lock.el (emacs-lock-locked-buffer-functions): New hook.
+        (emacs-lock--exit-locked-buffer): Return the locked buffer.  Doc fix.
+        (emacs-lock--kill-emacs-hook, emacs-lock--kill-emacs-query-functions)
+        (emacs-lock--kill-buffer-query-functions): Run new hook.  (Bug#11017)
+
+2012-04-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/which-func.el (which-func-modes): Change default.
+
+2012-04-14  Kim F. Storm  <storm@cua.dk>
+
+        * emulation/cua-base.el (cua-exchange-point-and-mark): Just call
+        exchange-point-and-mark if cua-enable-cua-keys is nil (Bug#11191).
+
+2012-04-14  Chong Yidong  <cyd@gnu.org>
+
+        * custom.el (custom-theme-set-variables): Doc fix.
+
+2012-04-14  Glenn Morris  <rgm@gnu.org>
+
+        * international/mule.el (set-auto-coding-for-load): Doc fix.
+
+2012-04-14  Alan Mackenzie  <acm@muc.de>
+
+        * progmodes/cc-menus.el (cc-imenu-objc-generic-expression): Make
+        imenu work again for Objective C Mode.  Correct the *-index values,
+        these having been disturbed by a previous change in 2011-08.
+
+        * progmodes/cc-engine.el (c-before-change-check-<>-operators):
+        Correct two search limits.
+
+2012-04-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * startup.el (command-line-1): Inhibit splash from daemon (bug#10996).
+
+2012-04-14  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * international/characters.el: Fix sorting.
+
+2012-04-14  Eli Zaretskii  <eliz@gnu.org>
+
+        * international/characters.el: Add more missing Latin case pairs.
+
+2012-04-14  Glenn Morris  <rgm@gnu.org>
+
+        * files.el (dir-locals-set-class-variables): Doc fix.
+
+2012-04-14  Eli Zaretskii  <eliz@gnu.org>
+
+        * international/characters.el: Add set-case-syntax-pair call for
+        LATIN CAPITAL LETTER Y WITH DIAERESIS RET and its lower-case
+        counterpart.  (Bug#11209)
+
+        * simple.el (shell-command-on-region): Doc fix.  (Bug#11208)
+
+2012-04-14  Glenn Morris  <rgm@gnu.org>
+
+        * calendar/holidays.el (calendar-check-holidays): Doc fix.
+
+2012-04-14  Eli Zaretskii  <eliz@gnu.org>
+
+        * textmodes/ispell.el (ispell-dictionary-base-alist):
+        Add data for Hebrew.
+
+2012-04-14  Chong Yidong  <cyd@gnu.org>
+
+        * net/rcirc.el (rcirc-cmd-quit):
+        Revert 2012-03-18 change (Bug#11192).
+
+2012-04-14  Glenn Morris  <rgm@gnu.org>
+
+        * pcmpl-rpm.el (pcomplete/rpm): Handle -qf.
+
+2012-04-14  Eli Zaretskii  <eliz@gnu.org>
+
+        * minibuffer.el (completion-in-region-mode-map):
+        Bind completion-help-at-point to M-? rather than ?.  (Bug#11182)
+
+2012-04-13  Vivek Dasmohapatra  <vivek@etla.org>
+
+        * hexl.el (hexl-insert-char): Make display sizes other than 16 work.
+
+2012-04-13  Masatake YAMATO  <yamato@redhat.com>
+
+        * minibuffer.el (minibuffer-local-filename-syntax): New variable
+        to allow `C-M-f' and `C-M-b' to move to the nearest path
+        separator (bug#9511).
+
+2012-04-13  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * avoid.el: Require cl when compiling.  And also move the
+        `provide' to the end.
+
+2012-04-13  Thierry Volpiatto  <thierry.volpiatto@gmail.com>
+
+        * avoid.el (mouse-avoidance-banish-position): New variable.
+        (mouse-avoidance-banish-destination): Use it (bug#10165).
+
+2012-04-13  Leo Liu  <sdl.web@gmail.com>
+
+        * progmodes/which-func.el (which-func-modes): Add objc-mode.
+
+2012-04-13  Ken Brown  <kbrown@cornell.edu>
+
+        * net/browse-url.el (browse-url-file-url): Remove Cygwin hack;
+        this is no longer needed now that cygstart understands file:// URLs.
+        (browse-url-filename-alist): For the same reason, don't modify
+        file:// URLs on Cygwin.
+
+2012-04-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emulation/cua-base.el (cua--pre-command-handler-1): Don't activate
+        the region on shift if the binding is already shifted (bug#11221).
+
+2012-04-12  Glenn Morris  <rgm@gnu.org>
+
+        * mail/mailpost.el: Move to obsolete/.
+
+2012-04-12  Drew Adams  <drew.adams@oracle.com>
+
+        * imenu.el (imenu--generic-function): Ignore invisible definitions
+        (bug#10123).
+
+2012-04-12  Vivek Dasmohapatra  <vivek@etla.org>
+
+        * hexl.el (hexl-bits): New variable.
+        (hexl-options): Mention the variable in the doc string.
+        (hexl-rulerise, hexl-line-displen): New functions.
+        (hexl-mode): Mention the new variable.
+        (hexl-mode, hexl-current-address, hexl-current-address):
+        Use the displen.
+        (hexl-ascii-start-column): New function.
+        (hexl-address-to-marker, hexl-beginning-of-line, hexl-options)
+        (hexl-insert-char, hexl-mode-ruler): Use the displen (bug#4941).
+
+2012-04-12  Agustín Martín Domingo  <agustin.martin@hispalinux.es>
+
+        * textmodes/flyspell.el (flyspell-large-region): For hunspell, use
+        '("-i" ENCODING), in 2 separate command-line arguments, to specify
+        the encoding, as expected by hunspell.
+
+2012-04-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * battery.el (battery--linux-sysfs-regexp): New const.
+        (battery-status-function): Use it.  Remove yeeloong special case.
+        (battery-yeeloong-sysfs): Remove.
+        (battery-echo-area-format): Remove yeeloong special case.
+
+2012-04-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * imenu.el (imenu-add-to-menubar): `current-local-map' can be nil.
+        Reported by Noah Friedman.
+
+        * subr.el (read-passwd): Use read-string.
+
+2012-04-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * vcursor.el (vcursor-move): Increase the priority of the overlay
+        (bug#9663).
+
+2012-04-11  Deniz Dogan  <deniz.a.m.dogan@gmail.com>
+
+        * net/rcirc.el (rcirc-kill-channel-buffers): New variable.
+        (rcirc-kill-buffer-hook): Use it to kill channel buffers (bug#5128).
+
+2012-04-11  William Stevenson  <yhvh2000@gmail.com>
+
+        * textmodes/artist.el (artist-mode): Convert artist-mode to use
+        define-minor-mode (bug#10760).
+
+2012-04-11  Wolfgang Jenkner  <wjenkner@inode.at>  (tiny change)
+
+        * progmodes/grep.el (rgrep): Tweak the find command line so
+        that directories matching `grep-find-ignored-files' won't be
+        pruned (bug#10351).
+
+2012-04-11  Chong Yidong  <cyd@gnu.org>
+
+        * startup.el (command-line): Remove support for long-obsolete
+        variable font-lock-face-attributes.
+
+2012-04-11  Glenn Morris  <rgm@gnu.org>
+
+        * vc/vc-bzr.el (vc-bzr-status): Avoid condition-case-unless-debug.
+
+2012-04-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * window.el (window--state-get-1): Obey window-point-insertion-type.
+
+2012-04-11  Lennart Borgman  <lennart.borgman@gmail.com>
+
+        * emacs-lisp/lisp.el (narrow-to-defun): `beginning-of-defun' goes
+        to previous function when point is on the first character of a
+        function.  Take care of that in `narrow-to-defun' (bug#6157).
+
+2012-04-11  Glenn Morris  <rgm@gnu.org>
+
+        * vc/vc-bzr.el (vc-bzr-status): Handle all errors,
+        not just file-errors.
+
+        * vc/vc-bzr.el (vc-bzr-sha1-program, sha1-program): Remove.
+        (vc-bzr-sha1): Use internal sha1.
+
+2012-04-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/flymake.el (flymake-mode): Beware read-only dirs (bug#8954).
+
+2012-04-10  Sébastien Gross  <seb@chezwam.org>  (tiny change)
+
+        * progmodes/hideshow.el (hs-hide-all): Don't infloop on comments
+        that start in the middle of the line (bug#10496).
+
+2012-04-10  Dan Nicolaescu  <dann@gnu.org>
+
+        * battery.el (battery-linux-proc-acpi): Only one battery is
+        discharged at a time, but that seems to confuse battery.el when
+        computing `rate-type' for the battery not being discharged
+        (bug#10332).
+
+2012-04-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/autoload.el (autoload-make-program): Remove, unused.
+
+        * international/quail.el: Use dolist and simplify.
+        (quail-define-package, quail-update-keyboard-layout)
+        (quail-define-rules): Use dolist.
+        (quail-insert-kbd-layout, quail-get-translation): CSE.
+
+        * tmm.el: Use dolist, remove left over hook.
+        (tmm-prompt, tmm-define-keys, tmm-shortcut, tmm-get-keybind):
+        Use dolist.
+        (calendar-load-hook): Don't mess with it.
+
+        * vc/vc-annotate.el (vc-annotate-show-diff-revision-at-line-internal):
+        Use derived-mode-p.  Run the diff asynchronously.
+
+2012-04-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * obsolete/mouse-sel.el: Add an Obsolete-since header.
+
+2012-04-10  Juanma Barranquero  <lekktu@gmail.com>
+
+        * misc.el: Display absolute path of loaded DLLs (bug#10424).
+        (list-dynamic-libraries--loaded): New function.
+        (list-dynamic-libraries--refresh): Use it.
+
+2012-04-10  Nathan Weizenbaum  <nweiz@google.com>
+
+        * progmodes/python.el (python-fill-paragraph):
+        Make python-fill-region in a multiline string work when font-lock is
+        disabled (bug#7018).
+
+2012-04-10  Laimonas Vėbra  <laimonas.vebra@gmail.com>  (tiny change)
+
+        * language/european.el (cp775): Add oem/legacy (en)coding on
+        DOS/MS Windows for the Baltic languages.  There are still plenty
+        of texts written in this encoding/codepage (bug#6519).
+
+2012-04-10  Glenn Morris  <rgm@gnu.org>
+
+        * cus-start.el (eol-mnemonic-unix, eol-mnemonic-dos, eol-mnemonic-mac):
+        Add :standard values, reducing "rogue" customs in emacs -Q a bit more.
+
+2012-04-10  Florian Adamsky  <florian@adamsky.it>  (tiny change)
+
+        * recentf.el (recentf-dialog-mode-map): Add two keybindings for
+        next-line "n" and previous-line "p" in order to make recentf more
+        consistent with ibuffer, dired or org-mode (bug#9387).
+
+2012-04-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * image.el (put-image): Return the overlay created instead of the
+        optional input string (bug#7834).  Note that this may break code
+        that is (for some reason or other) depending on `put-image'
+        returning the string.
+
+        * mouse-sel.el (mouse-sel-mode): Mark as obsolete (bug#6174).
+
+        * simple.el (zap-to-char): Allow zapping using input methods
+        (bug#1580).
+
+        * textmodes/fill.el (fill-region): Leave point and mark where they
+        were before filling (bug#5399).
+
+2012-04-09  Glenn Morris  <rgm@gnu.org>
+
+        * version.el (emacs-bzr-get-version):
+        Handle lightweight checkouts of local branches.
+
 2012-04-09  Andreas Schwab  <schwab@linux-m68k.org>
 
-        * international/characters.el: Recover lost case pairs.
-        (Bug#11209)
+        * international/characters.el: Recover lost case pairs.  (Bug#11209)
 
 2012-04-09  Chong Yidong  <cyd@gnu.org>
 
@@ -156,8 +859,8 @@
 2012-03-30  Agustín Martín Domingo  <agustin.martin@hispalinux.es>
 
         * ispell.el (ispell-get-extended-character-mode): Disable
-        extended-char-mode for hunspell. hunspell does not support it and
-        treats ~word as ordinary words in pipe mode.
+        extended-char-mode for hunspell.  hunspell does not support it
+        and treats ~word as ordinary words in pipe mode.
 
 2012-03-30  Glenn Morris  <rgm@gnu.org>
 
@@ -387,7 +1090,7 @@
         (hfy-face-to-css-default): Same as the earlier `hfy-face-to-css'.
         (hfy-face-to-css): Re-defined to be a variable.
         (hfy-compile-stylesheet): Modify.  Allow stylesheet to be built
-        over multiple runs. This is made possible by having the caller let
+        over multiple runs.  This is made possible by having the caller let
         bind a special variable `hfy-user-sheet-assoc'.
         (htmlfontify-string): New defun.
         (hfy-compile-face-map): Make sure that the last char in the
@@ -620,7 +1323,7 @@
 
 2012-03-09  Michael Albinus  <michael.albinus@gmx.de>
 
-        * net/dbus.el: (dbus-property-handler): Return empty array if
+        * net/dbus.el (dbus-property-handler): Return empty array if
         there are no properties.
 
 2012-03-09  Leo Liu  <sdl.web@gmail.com>
@@ -957,10 +1660,6 @@
 
 2012-02-24  Thierry Volpiatto  <thierry.volpiatto@gmail.com>
 
-        * files.el (file-subdir-of-p): Fix typo.
-
-2012-02-24  Thierry Volpiatto  <thierry.volpiatto@gmail.com>
-
         * files.el (files-equal-p, file-subdir-of-p): New functions.
         (copy-directory): Error when trying to copy a directory on itself.
         Add missing copy-contents arg to tramp handler.
@@ -1224,7 +1923,7 @@
 2012-02-12  Alan Mackenzie  <acm@muc.de>
 
         Fix infinite loop with long macros.
-        * cc-engine.el (c-state-safe-place): Handle macros properly.
+        * progmodes/cc-engine.el (c-state-safe-place): Handle macros properly.
 
 2012-02-12  Chong Yidong  <cyd@gnu.org>
 
@@ -1487,11 +2186,10 @@
 
 2012-02-06  Lars Ingebrigtsen  <larsi@gnus.org>
 
-        * progmodes/cc-mode.el
-        (c-standard-font-lock-fontify-region-function): Set the default at
-        load time, too, so that `font-lock-fontify-buffer' can be called
-        without setting up the entire mode first.  This fixes a bug in
-        `mm-inline-text' with C MIME parts.
+        * progmodes/cc-mode.el (c-standard-font-lock-fontify-region-function):
+        Set the default at load time, too, so that `font-lock-fontify-buffer'
+        can be called without setting up the entire mode first.  This fixes
+        a bug in `mm-inline-text' with C MIME parts.
 
 2012-02-06  Chong Yidong  <cyd@gnu.org>
 
diff --git a/lisp/ChangeLog.11 b/lisp/ChangeLog.11
index 0b4e62f9e91..8ea7d40c004 100644
--- a/lisp/ChangeLog.11
+++ b/lisp/ChangeLog.11
@@ -10889,7 +10889,7 @@
 2004-01-29  Jari Aalto  <jari.aalto@poboxes.com>
 
         * progmodes/executable.el (executable-command-find-posix-p):
-        New.  Check if find handles arguments Posix-style.
+        New.  Check if find handles arguments POSIX-style.
 
         * progmodes/grep.el (grep-compute-defaults):
         Use executable-command-find-posix-p.
diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12
index 9611eaa21b4..2361528abb3 100644
--- a/lisp/ChangeLog.12
+++ b/lisp/ChangeLog.12
@@ -12449,7 +12449,7 @@
 
         * calendar/appt.el (diary-selective-display): Add defvar.
 
-        * sort.el (sort-columns): Use Posix arg syntax for `sort'.
+        * sort.el (sort-columns): Use POSIX arg syntax for `sort'.
 
         * isearch.el (search-whitespace-regexp): Fix custom type.
 
diff --git a/lisp/ChangeLog.6 b/lisp/ChangeLog.6
index 85301ef78e1..5d79470bd2a 100644
--- a/lisp/ChangeLog.6
+++ b/lisp/ChangeLog.6
@@ -715,7 +715,7 @@
 
         * ediff-diff.el (ediff-setup-fine-diff-regions):
         Allow diff options to be passed to the diff program.
-        (ediff-make-diff2-buffer): Don't run Posix diff on remote files.
+        (ediff-make-diff2-buffer): Don't run POSIX diff on remote files.
         (ediff-make-diff2-buffer): Refuses to diff remote files.
         (ediff-make-diff2-buffer, ediff-setup-diff-regions): Changed functions.
         (ediff-make-diff2-buffer): New function.
diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index 3845c4ce4e6..7f54d3dc253 100644
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@ -134,10 +134,13 @@ Otherwise display all abbrevs."
                 (push table empty-tables)
               (insert-abbrev-table-description table t)))
           (dolist (table (nreverse empty-tables))
-            (insert-abbrev-table-description table t))))
+            (insert-abbrev-table-description table t)))
+        ;; Note: `list-abbrevs' can dispaly only local abbrevs, in
+        ;; which case editing could lose abbrevs of other tables. Thus
+        ;; enter `edit-abbrevs-mode' only if LOCAL is nil.
+        (edit-abbrevs-mode))
       (goto-char (point-min))
       (set-buffer-modified-p nil)
-      (edit-abbrevs-mode)
       (current-buffer))))
 
 (defun edit-abbrevs-mode ()
@@ -152,7 +155,8 @@ Otherwise display all abbrevs."
 
 (defun edit-abbrevs ()
   "Alter abbrev definitions by editing a list of them.
-Selects a buffer containing a list of abbrev definitions.
+Selects a buffer containing a list of abbrev definitions with
+point located in the abbrev table of current buffer.
 You can edit them and type \\<edit-abbrevs-map>\\[edit-abbrevs-redefine] to redefine abbrevs
 according to your editing.
 Buffer contains a header line for each abbrev table,
@@ -163,7 +167,12 @@ where NAME and EXPANSION are strings with quotes,
 USECOUNT is an integer, and HOOK is any valid function
 or may be omitted (it is usually omitted)."
   (interactive)
-  (switch-to-buffer (prepare-abbrev-list-buffer)))
+  (let ((table-name (abbrev-table-name local-abbrev-table)))
+    (switch-to-buffer (prepare-abbrev-list-buffer))
+    (when (and table-name
+               (search-forward
+                (concat "(" (symbol-name table-name) ")\n\n") nil t))
+      (goto-char (match-end 0)))))
 
 (defun edit-abbrevs-redefine ()
   "Redefine abbrevs according to current buffer contents."
diff --git a/lisp/avoid.el b/lisp/avoid.el
index 17d99fd6517..bfe15de0ca2 100644
--- a/lisp/avoid.el
+++ b/lisp/avoid.el
@@ -67,7 +67,7 @@
 
 ;;; Code:
 
-(provide 'avoid)
+(eval-when-compile (require 'cl))
 
 (defgroup avoid nil
   "Make mouse pointer stay out of the way of editing."
@@ -80,7 +80,7 @@
 See function `mouse-avoidance-mode' for possible values.
 Setting this variable directly does not take effect;
 use either \\[customize] or the function `mouse-avoidance-mode'."
-  :set (lambda (symbol value)
+  :set (lambda (_symbol value)
          ;; 'none below prevents toggling when value is nil.
          (mouse-avoidance-mode (or value 'none)))
   :initialize 'custom-initialize-default
@@ -115,6 +115,23 @@ Only applies in Mouse Avoidance modes `animate' and `jump'."
   :type 'integer
   :group 'avoid)
 
+(defcustom mouse-avoidance-banish-position '((frame-or-window . frame)
+                                             (side . right)
+                                             (side-pos . 3)
+                                             (top-or-bottom . top)
+                                             (top-or-bottom-pos . 0))
+  "Position to which Mouse Avoidance mode `banish' moves the mouse.
+An alist where keywords mean:
+FRAME-OR-WINDOW: banish the mouse to corner of frame or window.
+SIDE: banish the mouse on right or left corner of frame or window.
+SIDE-POS: Distance from right or left edge of frame or window.
+TOP-OR-BOTTOM: banish the mouse to top or bottom of frame or window.
+TOP-OR-BOTTOM-POS: Distance from top or bottom edge of frame or window."
+  :group   'avoid
+  :type    '(alist :key-type symbol :value-type symbol)
+  :options '(frame-or-window side (side-pos integer)
+             top-or-bottom (top-or-bottom-pos integer)))
+
 ;; Internal variables
 (defvar mouse-avoidance-state nil)
 (defvar mouse-avoidance-pointer-shapes nil)
@@ -183,13 +200,45 @@ Acceptable distance is defined by `mouse-avoidance-threshold'."
 
 (defun mouse-avoidance-banish-destination ()
   "The position to which Mouse Avoidance mode `banish' moves the mouse.
-You can redefine this if you want the mouse banished to a different corner."
-  (let* ((pos (window-edges)))
-    (cons (- (nth 2 pos) 2)
-          (nth 1 pos))))
+
+If you want the mouse banished to a different corner set
+`mouse-avoidance-banish-position' as you need."
+  (let* ((fra-or-win         (assoc-default
+                              'frame-or-window
+                              mouse-avoidance-banish-position 'eq))
+         (list-values        (case fra-or-win
+                               (frame (list 0 0 (frame-width) (frame-height)))
+                               (window (window-edges))))
+         (alist              (loop for v in list-values
+                                   for k in '(left top right bottom)
+                                   collect (cons k v)))
+         (side               (assoc-default
+                              'side
+                              mouse-avoidance-banish-position 'eq))
+         (side-dist          (assoc-default
+                              'side-pos
+                              mouse-avoidance-banish-position 'eq))
+         (top-or-bottom      (assoc-default
+                              'top-or-bottom
+                              mouse-avoidance-banish-position 'eq))
+         (top-or-bottom-dist (assoc-default
+                              'top-or-bottom-pos
+                              mouse-avoidance-banish-position 'eq))
+         (side-fn            (case side
+                               (left '+)
+                               (right '-)))
+         (top-or-bottom-fn   (case top-or-bottom
+                               (top '+)
+                               (bottom '-))))
+    (cons (funcall side-fn                        ; -/+
+                   (assoc-default side alist 'eq) ; right or left
+                   side-dist)                     ; distance from side
+          (funcall top-or-bottom-fn                        ; -/+
+                   (assoc-default top-or-bottom alist 'eq) ; top/bottom
+                   top-or-bottom-dist)))) ; distance from top/bottom
 
 (defun mouse-avoidance-banish-mouse ()
-  ;; Put the mouse pointer in the upper-right corner of the current frame.
+  "Put the mouse pointer to `mouse-avoidance-banish-position'."
   (mouse-avoidance-set-mouse-position (mouse-avoidance-banish-destination)))
 
 (defsubst mouse-avoidance-delta (cur delta dist var min max)
@@ -218,7 +267,6 @@ You can redefine this if you want the mouse banished to a different corner."
   ;; For these modes, state keeps track of the total offset that we've
   ;; accumulated, and tries to keep it close to zero.
   (let* ((cur (mouse-position))
-         (cur-frame (car cur))
          (cur-pos (cdr cur))
          (pos (window-edges))
          (wleft (pop pos))
@@ -408,4 +456,6 @@ definition of \"random distance\".)"
 (if mouse-avoidance-mode
     (mouse-avoidance-mode mouse-avoidance-mode))
 
+(provide 'avoid)
+
 ;;; avoid.el ends here
diff --git a/lisp/battery.el b/lisp/battery.el
index 586be9e8938..dcfe07121b3 100644
--- a/lisp/battery.el
+++ b/lisp/battery.el
@@ -39,6 +39,9 @@
   :prefix "battery-"
   :group 'hardware)
 
+;; Either BATn or yeeloong-bat, basically.
+(defconst battery--linux-sysfs-regexp "[bB][aA][tT][0-9]?$")
+
 (defcustom battery-status-function
   (cond ((and (eq system-type 'gnu/linux)
               (file-readable-p "/proc/apm"))
@@ -48,12 +51,9 @@
          'battery-linux-proc-acpi)
         ((and (eq system-type 'gnu/linux)
               (file-directory-p "/sys/class/power_supply/")
-              (directory-files "/sys/class/power_supply/" nil "BAT[0-9]$"))
+              (directory-files "/sys/class/power_supply/" nil
+                               battery--linux-sysfs-regexp))
          'battery-linux-sysfs)
-        ((and (eq system-type 'gnu/linux)
-              (file-directory-p "/sys/class/power_supply/yeeloong-bat/")
-              (directory-files "/sys/class/power_supply/yeeloong-bat/" nil "charge_"))
-         'battery-yeeloong-sysfs)
         ((and (eq system-type 'darwin)
               (condition-case nil
                   (with-temp-buffer
@@ -78,11 +78,9 @@ introduced by a `%' character in a control string."
   (cond ((eq battery-status-function 'battery-linux-proc-acpi)
          "Power %L, battery %B at %r (%p%% load, remaining time %t)")
         ((eq battery-status-function 'battery-linux-sysfs)
-         "Power %L, battery %B (%p%% load)")
+         "Power %L, battery %B (%p%% load, remaining time %t)")
         ((eq battery-status-function 'battery-pmset)
          "%L power, battery %B (%p%% load, remaining time %t)")
-        ((eq battery-status-function 'battery-yeeloong-sysfs)
-         "%L power, battery %B (%p%% load, remaining time %t)")
         (battery-status-function
          "Power %L, battery %B (%p%% load, remaining time %t)"))
   "Control string formatting the string to display in the echo area.
@@ -344,14 +342,15 @@ The following %-sequences are provided:
                (setq charging-state (match-string 1)))
           (when (re-search-forward "present rate: +\\([0-9]+\\) \\(m[AW]\\)$"
                                    nil t)
-            (setq rate (+ (or rate 0) (string-to-number (match-string 1)))
-                  rate-type (or (and rate-type
+            (setq rate (+ (or rate 0) (string-to-number (match-string 1))))
+            (when (> rate 0)
+              (setq rate-type (or (and rate-type
                                      (if (string= rate-type (match-string 2))
                                          rate-type
                                        (error
                                         "Inconsistent rate types (%s vs. %s)"
                                         rate-type (match-string 2))))
-                                (match-string 2))))
+                                  (match-string 2)))))
           (when (re-search-forward "remaining capacity: +\\([0-9]+\\) m[AW]h$"
                                    nil t)
             (setq capacity
@@ -447,7 +446,8 @@ The following %-sequences are provided:
     (with-temp-buffer
       (dolist (dir (ignore-errors
                     (directory-files
-                     "/sys/class/power_supply/" t "BAT[0-9]$")))
+                     "/sys/class/power_supply/" t
+                     battery--linux-sysfs-regexp)))
         (erase-buffer)
         (ignore-errors (insert-file-contents
                         (expand-file-name "uevent" dir)))
@@ -509,7 +509,7 @@ The following %-sequences are provided:
                      "N/A"))
           (cons ?d (or temperature "N/A"))
           (cons ?B (or charging-state "N/A"))
-          (cons ?p (cond ((> charge-full 0)
+          (cons ?p (cond ((and (> charge-full 0) (> charge-now 0))
                           (format "%.1f"
                                   (/ (* 100 charge-now) charge-full)))
                          ((> energy-full 0)
@@ -524,91 +524,6 @@ The following %-sequences are provided:
                            "AC"
                          "BAT")
                      "N/A")))))
-
-(defun battery-yeeloong-sysfs ()
-  "Get ACPI status information from Linux (the kernel).
-This function works only on the Lemote Yeeloong.
-
-The following %-sequences are provided:
-%c Current capacity (mAh)
-%r Current rate
-%B Battery status (verbose)
-%b Battery status, empty means high, `-' means low,
-   `!' means critical, and `+' means charging
-%L AC line status (verbose)
-%p Battery load percentage
-%m Remaining time (to charge or discharge) in minutes
-%h Remaining time (to charge or discharge) in hours
-%t Remaining time (to charge or discharge) in the form `h:min'"
-
-  (let (capacity
-        capacity-level
-        status
-        ac-online
-        hours
-        current-now
-        charge-full
-        charge-now)
-
-    (with-temp-buffer
-      (ignore-errors
-        (insert-file-contents "/sys/class/power_supply/yeeloong-bat/uevent")
-        (goto-char 1)
-        (search-forward "POWER_SUPPLY_CHARGE_NOW=")
-        (setq charge-now (read (current-buffer)))
-        (goto-char 1)
-        (search-forward "POWER_SUPPLY_CHARGE_FULL=")
-        (setq charge-full (read (current-buffer)))
-        (goto-char 1)
-        (search-forward "POWER_SUPPLY_CURRENT_NOW=")
-        (setq current-now (read (current-buffer)))
-        (goto-char 1)
-        (search-forward "POWER_SUPPLY_CAPACITY_LEVEL=")
-        (setq capacity-level (buffer-substring (point) (line-end-position)))
-        (goto-char 1)
-        (search-forward "POWER_SUPPLY_STATUS=")
-        (setq status (buffer-substring (point) (line-end-position))))
-        
-      (erase-buffer)
-      (ignore-errors
-        (insert-file-contents
-         "/sys/class/power_supply/yeeloong-ac/online")
-        (goto-char 1)
-        (setq ac-online (read (current-buffer)))
-        (erase-buffer)))
-
-
-    (setq capacity (round (/ (* charge-now 100.0) charge-full)))
-    (when (and current-now (not (= current-now 0)))
-      (if (< current-now 0)
-          ;; Charging
-          (setq hours (/ (- charge-now charge-full) (+ 0.0 current-now)))
-        ;; Discharging
-        (setq hours (/ charge-now (+ 0.0 current-now)))))
-
-    (list (cons ?c (if charge-now
-                       (number-to-string charge-now)
-                     "N/A"))
-          (cons ?r current-now)
-          (cons ?B (cond ((equal capacity-level "Full") "full")
-                         ((equal status "Charging") "charging")
-                         ((equal capacity-level "Low") "low")
-                         ((equal capacity-level "Critical") "critical")
-                         (t "high")))
-          (cons ?b (cond ((equal capacity-level "Full") " ")
-                         ((equal status "Charging") "+")
-                         ((equal capacity-level "Low") "-")
-                         ((equal capacity-level "Critical") "!")
-                         (t " ")))
-          (cons ?h (if hours (number-to-string hours) "N/A"))
-          (cons ?m (if hours (number-to-string (* 60 hours)) "N/A"))
-          (cons ?t (if hours
-                       (format "%d:%d"
-                               (/ (round (* 60 hours)) 60)
-                               (% (round (* 60 hours)) 60))
-                     "N/A"))
-          (cons ?p (if capacity (number-to-string capacity) "N/A"))
-          (cons ?L (if (eq ac-online 1) "AC" "BAT")))))
 
 ;;; `pmset' interface for Darwin (OS X).
 
diff --git a/lisp/bindings.el b/lisp/bindings.el
index a87f321c936..8cfeecf5b40 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -868,6 +868,7 @@ if `inhibit-field-text-motion' is non-nil."
   "Keymap for navigation commands.")
 (define-key esc-map "g" goto-map)
 
+(define-key goto-map    "c" 'goto-char)
 (define-key goto-map    "g" 'goto-line)
 (define-key goto-map "\M-g" 'goto-line)
 (define-key goto-map    "n" 'next-error)
diff --git a/lisp/bs.el b/lisp/bs.el
index 64c1183b64d..08d05a946e3 100644
--- a/lisp/bs.el
+++ b/lisp/bs.el
@@ -964,7 +964,7 @@ Default is `bs--current-sort-function'."
 Uses function `toggle-read-only'."
   (interactive)
   (with-current-buffer (bs--current-buffer)
-    (toggle-read-only))
+    (call-interactively 'toggle-read-only))
   (bs--update-current-line))
 
 (defun bs-clear-modified ()
diff --git a/lisp/calendar/cal-tex.el b/lisp/calendar/cal-tex.el
index 14899431e2a..0ae2b38eaf6 100644
--- a/lisp/calendar/cal-tex.el
+++ b/lisp/calendar/cal-tex.el
@@ -1,6 +1,6 @@
 ;;; cal-tex.el --- calendar functions for printing calendars with LaTeX
 
-;; Copyright (C) 1995, 2001-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2001-2012 Free Software Foundation, Inc.
 
 ;; Author: Steve Fisk <fisk@bowdoin.edu>
 ;;         Edward M. Reingold <reingold@cs.uiuc.edu>
@@ -1588,8 +1588,7 @@ informative header, and run HOOK."
   (cal-tex-e-document)
   (or (and cal-tex-preamble-extra
            (string-match "inputenc" cal-tex-preamble-extra))
-      (not (re-search-backward "[^[:ascii:]]" nil 'move))
-      (progn
+      (when (re-search-backward "[^[:ascii:]]" nil 'move)
         (goto-char (point-min))
         (when (search-forward "documentclass" nil t)
           (forward-line 1)
diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el
index 37f511f7990..9edd353b889 100644
--- a/lisp/calendar/holidays.el
+++ b/lisp/calendar/holidays.el
@@ -634,7 +634,7 @@ The optional LABEL is used to label the buffer created."
   "Check the list of holidays for any that occur on DATE.
 DATE is a list (month day year).  This function considers the
 holidays from the list `calendar-holidays', and returns a list of
-strings describing those holidays that apply on DATE."
+strings describing those holidays that apply on DATE, or nil if none do."
   (let ((displayed-month (calendar-extract-month date))
         (displayed-year (calendar-extract-year date))
         holiday-list)
diff --git a/lisp/comint.el b/lisp/comint.el
index 68fedeb88a9..10981675971 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -699,16 +699,21 @@ BUFFER can be either a buffer or the name of one."
 (defun make-comint-in-buffer (name buffer program &optional startfile &rest switches)
   "Make a Comint process NAME in BUFFER, running PROGRAM.
 If BUFFER is nil, it defaults to NAME surrounded by `*'s.
-PROGRAM should be either a string denoting an executable program to create
-via `start-file-process', or a cons pair of the form (HOST . SERVICE) denoting
-a TCP connection to be opened via `open-network-stream'.  If there is already
-a running process in that buffer, it is not restarted.  Optional fourth arg
-STARTFILE is the name of a file, whose contents are sent to the
-process as its initial input.
+If there is a running process in BUFFER, it is not restarted.
+
+PROGRAM should be one of the following:
+- a string, denoting an executable program to create via
+  `start-file-process'
+- a cons pair of the form (HOST . SERVICE), denoting a TCP
+  connection to be opened via `open-network-stream'
+- nil, denoting a newly-allocated pty.
+
+Optional fourth arg STARTFILE is the name of a file, whose
+contents are sent to the process as its initial input.
 
 If PROGRAM is a string, any more args are arguments to PROGRAM.
 
-Returns the (possibly newly created) process buffer."
+Return the (possibly newly created) process buffer."
   (or (fboundp 'start-file-process)
       (error "Multi-processing is not supported for this system"))
   (setq buffer (get-buffer-create (or buffer (concat "*" name "*"))))
@@ -752,9 +757,18 @@ See `make-comint' and `comint-exec'."
 (defun comint-exec (buffer name command startfile switches)
   "Start up a process named NAME in buffer BUFFER for Comint modes.
 Runs the given COMMAND with SWITCHES, and initial input from STARTFILE.
-Blasts any old process running in the buffer.  Doesn't set the buffer mode.
-You can use this to cheaply run a series of processes in the same Comint
-buffer.  The hook `comint-exec-hook' is run after each exec."
+
+COMMAND should be one of the following:
+- a string, denoting an executable program to create via
+  `start-file-process'
+- a cons pair of the form (HOST . SERVICE), denoting a TCP
+  connection to be opened via `open-network-stream'
+- nil, denoting a newly-allocated pty.
+
+This function blasts any old process running in the buffer, and
+does not set the buffer mode.  You can use this to cheaply run a
+series of processes in the same Comint buffer.  The hook
+`comint-exec-hook' is run after each exec."
   (with-current-buffer buffer
     (let ((proc (get-buffer-process buffer)))   ; Blast any old process.
       (if proc (delete-process proc)))
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index fbba49951d1..83973e4a534 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -138,9 +138,18 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
              ;; coding.c
              (inhibit-eol-conversion mule boolean)
              (eol-mnemonic-undecided mule string)
-             (eol-mnemonic-unix mule string)
-             (eol-mnemonic-dos mule string)
-             (eol-mnemonic-mac mule string)
+             ;; startup.el fiddles with the values.  IMO, would be
+             ;; simpler to just use #ifdefs in coding.c.
+             (eol-mnemonic-unix mule string nil
+                                :standard
+                                (if (memq system-type '(ms-dos windows-nt))
+                                    "(Unix)" ":"))
+             (eol-mnemonic-dos mule string nil
+                               :standard
+                               (if (memq system-type '(ms-dos windows-nt))
+                                   "\\" "(DOS)"))
+             (eol-mnemonic-mac mule string nil
+                               :standard "(Mac)")
              (file-coding-system-alist
               mule
               (alist
diff --git a/lisp/custom.el b/lisp/custom.el
index d8909f8be92..611d5688f30 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -936,16 +936,21 @@ Each of the arguments in ARGS should be a list of this form:
 
   (SYMBOL EXP [NOW [REQUEST [COMMENT]]])
 
-This stores EXP (without evaluating it) as the saved value for SYMBOL.
-If NOW is present and non-nil, then also evaluate EXP and set
-the default value for the SYMBOL to the value of EXP.
+SYMBOL is the variable name, and EXP is an expression which
+evaluates to the customized value.  EXP will also be stored,
+without evaluating it, in SYMBOL's `saved-value' property, so
+that it can be restored via the Customize interface.  It is also
+added to the alist in SYMBOL's `theme-value' property \(by
+calling `custom-push-theme').
 
-REQUEST is a list of features we must require in order to
-handle SYMBOL properly.
-COMMENT is a comment string about SYMBOL.
+NOW, if present and non-nil, means to install the variable's
+value directly now, even if its `defcustom' declaration has not
+been executed.  This is for internal use only.
+
+REQUEST is a list of features to `require' (which are loaded
+prior to evaluating EXP).
 
-EXP itself is saved unevaluated as SYMBOL property `saved-value' and
-in SYMBOL's list property `theme-value' \(using `custom-push-theme')."
+COMMENT is a comment string about SYMBOL."
   (custom-check-theme theme)
 
   ;; Process all the needed autoloads before anything else, so that the
diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index d2995ab790d..50b32fc8f2e 100644
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -806,7 +806,7 @@ relevant to POS."
                             (format "  %s: %s\n" elt val)))))))
 
           (if text-props-desc (insert text-props-desc))
-          (toggle-read-only 1))))))
+          (setq buffer-read-only t))))))
 
 (define-obsolete-function-alias 'describe-char-after 'describe-char "22.1")
 
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 0795b0175a2..8a499c47464 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -245,7 +245,11 @@ List has a form of (file-name full-file-name (attribute-list))."
                              " (default now): "
                            ": ")))
          (new-attribute (dired-mark-read-string prompt nil op-symbol
-                                                arg files default))
+                                                arg files default
+                                                (cond ((eq op-symbol 'chown)
+                                                       (system-users))
+                                                      ((eq op-symbol 'chgrp)
+                                                       (system-groups)))))
          (operation (concat program " " new-attribute))
          failures)
     (setq failures
@@ -385,7 +389,7 @@ Uses the shell command coming from variables `lpr-command' and
     (dired-run-shell-command (dired-shell-stuff-it command file-list nil))))
 
 (defun dired-mark-read-string (prompt initial op-symbol arg files
-                               &optional default-value)
+                               &optional default-value collection)
   "Read args for a Dired marked-files command, prompting with PROMPT.
 Return the user input (a string).
 
@@ -397,11 +401,14 @@ FILES should be a list of file names.
 DEFAULT-VALUE, if non-nil, should be a \"standard\" value or list
 of such values, available via history commands.  Note that if the
 user enters empty input, this function returns the empty string,
-not DEFAULT-VALUE."
+not DEFAULT-VALUE.
+
+Optional argument COLLECTION is a collection of possible completions,
+suitable for use by `completing-read'."
   (dired-mark-pop-up nil op-symbol files
-                     'read-from-minibuffer
+                     'completing-read
                      (format prompt (dired-mark-prompt arg files))
-                     initial nil nil nil default-value))
+                     collection nil nil initial nil default-value nil))
 
 ;;; Cleaning a directory: flagging some backups for deletion.
 
diff --git a/lisp/dired.el b/lisp/dired.el
index d322752e15f..77fe9cb7614 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -3736,7 +3736,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" "58d623eb8e68e472e6164a1bcae83360")
+;;;;;;  dired-diff) "dired-aux" "dired-aux.el" "de7e4c64718c8ba8438a6397a460bf23")
 ;;; Generated autoloads from dired-aux.el
 
 (autoload 'dired-diff "dired-aux" "\
diff --git a/lisp/electric.el b/lisp/electric.el
index 50c9010a74e..6a31ba1f1d3 100644
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -215,6 +215,7 @@ point right after that char, and it should return t to cause indentation,
   ;; it looks challenging.
   (let (pos)
     (when (and
+           electric-indent-mode
            ;; Don't reindent while inserting spaces at beginning of line.
            (or (not (memq last-command-event '(?\s ?\t)))
                (save-excursion (skip-chars-backward " \t") (not (bolp))))
diff --git a/lisp/emacs-lisp/authors.el b/lisp/emacs-lisp/authors.el
index 6f2c6f73eca..a7f8dad54ed 100644
--- a/lisp/emacs-lisp/authors.el
+++ b/lisp/emacs-lisp/authors.el
@@ -1,4 +1,4 @@
-;;; authors.el --- utility for maintaining Emacs's AUTHORS file -*-coding: utf-8;-*-
+;;; authors.el --- utility for maintaining Emacs's AUTHORS file -*-coding: utf-8 -*-
 
 ;; Copyright (C) 2000-2012 Free Software Foundation, Inc.
 
@@ -829,7 +829,7 @@ with the file and the number of each action:
          (enable-local-eval nil)
          (existing-buffer (get-file-buffer log-file))
          (buffer (find-file-noselect log-file))
-         authors file pos)
+         authors pos)
     (with-current-buffer buffer
       (save-restriction
         (widen)
@@ -943,8 +943,7 @@ and changed by AUTHOR."
                (file (car change))
                (filestat (if (authors-public-domain-p file)
                              (concat file " (public domain)")
-                           file))
-               slot)
+                           file)))
           (cond ((assq :wrote actions)
                  (setq wrote-list (cons filestat wrote-list)))
                 ((assq :cowrote actions)
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index 5af666b9ded..921b08b10a8 100644
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -762,9 +762,6 @@ write its autoloads into the specified file instead."
 (define-obsolete-function-alias 'update-autoloads-from-directories
     'update-directory-autoloads "22.1")
 
-(defvar autoload-make-program (or (getenv "MAKE") "make")
-  "Name of the make program in use during the Emacs build process.")
-
 ;;;###autoload
 (defun batch-update-autoloads ()
   "Update loaddefs.el autoloads in batch mode.
diff --git a/lisp/emacs-lisp/avl-tree.el b/lisp/emacs-lisp/avl-tree.el
index 9f348767478..1f00677cd00 100644
--- a/lisp/emacs-lisp/avl-tree.el
+++ b/lisp/emacs-lisp/avl-tree.el
@@ -260,7 +260,7 @@ Return t if the height of the tree has grown."
         (opp (avl-tree--switch-dir dir))
         ;; direction 0,1 -> sign factor -1,+1
         (sgn (avl-tree--dir-to-sign dir))
-        p1 p2 b2 result)
+        p1 p2 b2)
     (cond
      ((< (* sgn (avl-tree--node-balance br)) 0)
       (setf (avl-tree--node-balance br) 0)
diff --git a/lisp/emacs-lisp/cl-extra.el b/lisp/emacs-lisp/cl-extra.el
index 9ac5ce7d2f0..9a3d8cf705b 100644
--- a/lisp/emacs-lisp/cl-extra.el
+++ b/lisp/emacs-lisp/cl-extra.el
@@ -1,6 +1,6 @@
 ;;; cl-extra.el --- Common Lisp features, part 2
 
-;; Copyright (C) 1993, 2000-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1993, 2000-2012 Free Software Foundation, Inc.
 
 ;; Author: Dave Gillespie <daveg@synaptics.com>
 ;; Keywords: extensions
@@ -430,7 +430,6 @@ With two arguments, return rounding and remainder of their quotient."
 
 ;; Random numbers.
 
-(defvar *random-state*)
 ;;;###autoload
 (defun random* (lim &optional state)
   "Return a random nonnegative number less than LIM, an integer or float.
diff --git a/lisp/emacs-lisp/cl-loaddefs.el b/lisp/emacs-lisp/cl-loaddefs.el
index 5bb86628bb8..9e0099bb649 100644
--- a/lisp/emacs-lisp/cl-loaddefs.el
+++ b/lisp/emacs-lisp/cl-loaddefs.el
@@ -10,7 +10,7 @@
 ;;;;;;  ceiling* floor* isqrt lcm gcd cl-progv-before cl-set-frame-visible-p
 ;;;;;;  cl-map-overlays cl-map-intervals cl-map-keymap-recursively
 ;;;;;;  notevery notany every some mapcon mapcan mapl maplist map
-;;;;;;  cl-mapcar-many equalp coerce) "cl-extra" "cl-extra.el" "c172dda6770ce18b556561481bfefbb2")
+;;;;;;  cl-mapcar-many equalp coerce) "cl-extra" "cl-extra.el" "5a8a7f7ec2dc453113b8cbda577f2acb")
 ;;; Generated autoloads from cl-extra.el
 
 (autoload 'coerce "cl-extra" "\
diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index 88698a1f069..0d6716a2e63 100644
--- a/lisp/emacs-lisp/easy-mmode.el
+++ b/lisp/emacs-lisp/easy-mmode.el
@@ -260,7 +260,7 @@ the mode if ARG is omitted or nil, and toggle it if ARG is `toggle'.
          ;; repeat-command still does the toggling correctly.
          (interactive (list (or current-prefix-arg 'toggle)))
          (let ((,last-message (current-message)))
-           (,@(if setter (list setter)
+           (,@(if setter `(funcall #',setter)
                 (list (if (symbolp mode) 'setq 'setf) mode))
             (if (eq arg 'toggle)
                 (not ,mode)
diff --git a/lisp/emacs-lisp/eieio-opt.el b/lisp/emacs-lisp/eieio-opt.el
index 10816aaa43c..a899839f68a 100644
--- a/lisp/emacs-lisp/eieio-opt.el
+++ b/lisp/emacs-lisp/eieio-opt.el
@@ -72,8 +72,7 @@ Argument CH-PREFIX is another character prefix to display."
 
 ;;; CLASS COMPLETION / DOCUMENTATION
 
-;;;###autoload
-(defalias 'describe-class 'eieio-describe-class)
+;;;###autoload(defalias 'describe-class 'eieio-describe-class)
 
 ;;;###autoload
 (defun eieio-describe-class (class &optional headerfcn)
@@ -305,8 +304,7 @@ are not abstract."
 ;;; METHOD COMPLETION / DOC
 
 (defalias 'describe-method 'eieio-describe-generic)
-;;;###autoload
-(defalias 'describe-generic 'eieio-describe-generic)
+;;;###autoload(defalias 'describe-generic 'eieio-describe-generic)
 (defalias 'eieio-describe-method 'eieio-describe-generic)
 
 ;;;###autoload
diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el
index f1c1bf8965c..768eba58ee1 100644
--- a/lisp/emacs-lisp/eieio.el
+++ b/lisp/emacs-lisp/eieio.el
@@ -3051,7 +3051,7 @@ Optional argument GROUP is the sub-group of slots to display.
 
 ;;;### (autoloads (eieio-help-mode-augmentation-maybee eieio-describe-generic
 ;;;;;;  eieio-describe-constructor eieio-describe-class eieio-browse)
-;;;;;;  "eieio-opt" "eieio-opt.el" "e2814881441ad23759409687502f0ee1")
+;;;;;;  "eieio-opt" "eieio-opt.el" "d808328f9c0156ecbd412d77ba8c569e")
 ;;; Generated autoloads from eieio-opt.el
 
 (autoload 'eieio-browse "eieio-opt" "\
@@ -3060,7 +3060,6 @@ If optional ROOT-CLASS, then start with that, otherwise start with
 variable `eieio-default-superclass'.
 
 \(fn &optional ROOT-CLASS)" t nil)
-
 (defalias 'describe-class 'eieio-describe-class)
 
 (autoload 'eieio-describe-class "eieio-opt" "\
@@ -3075,7 +3074,6 @@ Describe the constructor function FCN.
 Uses `eieio-describe-class' to describe the class being constructed.
 
 \(fn FCN)" t nil)
-
 (defalias 'describe-generic 'eieio-describe-generic)
 
 (autoload 'eieio-describe-generic "eieio-opt" "\
diff --git a/lisp/emacs-lisp/ert-x.el b/lisp/emacs-lisp/ert-x.el
index 257d0528cbc..a7916354c91 100644
--- a/lisp/emacs-lisp/ert-x.el
+++ b/lisp/emacs-lisp/ert-x.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2008, 2010-2012 Free Software Foundation, Inc.
 
 ;; Author: Lennart Borgman (lennart O borgman A gmail O com)
-;; Author: Christian Ohler <ohler@gnu.org>
+;;         Christian Ohler <ohler@gnu.org>
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el
index 4efdc3240cd..bcb7fab026b 100644
--- a/lisp/emacs-lisp/lisp.el
+++ b/lisp/emacs-lisp/lisp.el
@@ -447,7 +447,21 @@ Optional ARG is ignored."
       ;; Try first in this order for the sake of languages with nested
       ;; functions where several can end at the same place as with
       ;; the offside rule, e.g. Python.
-      (beginning-of-defun)
+
+      ;; Finding the start of the function is a bit problematic since
+      ;; `beginning-of-defun' when we are on the first character of
+      ;; the function might go to the previous function.
+      ;;
+      ;; Therefore we first move one character forward and then call
+      ;; `beginning-of-defun'.  However now we must check that we did
+      ;; not move into the next function.
+      (let ((here (point)))
+        (unless (eolp)
+          (forward-char))
+        (beginning-of-defun)
+        (when (< (point) here)
+          (goto-char here)
+          (beginning-of-defun)))
       (setq beg (point))
       (end-of-defun)
       (setq end (point))
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 5b158eb994f..4b868f72899 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -524,7 +524,7 @@ Required package `%s-%s' is unavailable"
 
 (defun define-package (name-string version-string
                                 &optional docstring requirements
-                                &rest extra-properties)
+                                &rest _extra-properties)
   "Define a new package.
 NAME-STRING is the name of the package, as a string.
 VERSION-STRING is the version of the package, as a string.
@@ -584,7 +584,7 @@ EXTRA-PROPERTIES is currently unused."
 (defun package-generate-autoloads (name pkg-dir)
   (require 'autoload)         ;Load before we let-bind generated-autoload-file!
   (let* ((auto-name (concat name "-autoloads.el"))
-         (ignore-name (concat name "-pkg.el"))
+         ;;(ignore-name (concat name "-pkg.el"))
          (generated-autoload-file (expand-file-name auto-name pkg-dir))
          (version-control 'never))
     (unless (fboundp 'autoload-ensure-default-file)
@@ -1389,7 +1389,7 @@ If REMEMBER-POS is non-nil, keep point on the same entry.
 PACKAGES should be t, which means to display all known packages,
 or a list of package names (symbols) to display."
   ;; Construct list of ((PACKAGE . VERSION) STATUS DESCRIPTION).
-  (let (info-list name builtin)
+  (let (info-list name)
     ;; Installed packages:
     (dolist (elt package-alist)
       (setq name (car elt))
@@ -1474,21 +1474,21 @@ If optional arg BUTTON is non-nil, describe its associated package."
         (describe-package package))))
 
 ;; fixme numeric argument
-(defun package-menu-mark-delete (&optional num)
+(defun package-menu-mark-delete (&optional _num)
   "Mark a package for deletion and move to the next line."
   (interactive "p")
   (if (member (package-menu-get-status) '("installed" "obsolete"))
       (tabulated-list-put-tag "D" t)
     (forward-line)))
 
-(defun package-menu-mark-install (&optional num)
+(defun package-menu-mark-install (&optional _num)
   "Mark a package for installation and move to the next line."
   (interactive "p")
   (if (string-equal (package-menu-get-status) "available")
       (tabulated-list-put-tag "I" t)
     (forward-line)))
 
-(defun package-menu-mark-unmark (&optional num)
+(defun package-menu-mark-unmark (&optional _num)
   "Clear any marks on a package and move to the next line."
   (interactive "p")
   (tabulated-list-put-tag " " t))
@@ -1530,8 +1530,7 @@ If optional arg BUTTON is non-nil, describe its associated package."
     (dolist (entry tabulated-list-entries)
       ;; ENTRY is ((NAME . VERSION) [NAME VERSION STATUS DOC])
       (let ((pkg (car entry))
-            (status (aref (cadr entry) 2))
-            old)
+            (status (aref (cadr entry) 2)))
         (cond ((equal status "installed")
                (push pkg installed))
               ((equal status "available")
diff --git a/lisp/emacs-lisp/regexp-opt.el b/lisp/emacs-lisp/regexp-opt.el
index 6d12fe19277..72e3c398dc0 100644
--- a/lisp/emacs-lisp/regexp-opt.el
+++ b/lisp/emacs-lisp/regexp-opt.el
@@ -136,9 +136,6 @@ This means the number of non-shy regexp grouping constructs
 
 ;;; Workhorse functions.
 
-(eval-when-compile
-  (require 'cl))
-
 (defun regexp-opt-group (strings &optional paren lax)
   "Return a regexp to match a string in the sorted list STRINGS.
 If PAREN non-nil, output regexp parentheses around returned regexp.
@@ -248,15 +245,15 @@ Merges keywords to avoid backtracking in Emacs's regexp matcher."
     ;;
     ;; Make a character map but extract character set meta characters.
     (dolist (char chars)
-      (case char
-        (?\]
-         (setq bracket "]"))
-        (?^
-         (setq caret "^"))
-        (?-
-         (setq dash "-"))
-        (otherwise
-         (aset charmap char t))))
+      (cond
+       ((eq char ?\])
+        (setq bracket "]"))
+       ((eq char ?^)
+        (setq caret "^"))
+       ((eq char ?-)
+        (setq dash "-"))
+       (t
+        (aset charmap char t))))
     ;;
     ;; Make a character set from the map using ranges where applicable.
     (map-char-table
@@ -268,14 +265,14 @@ Merges keywords to avoid backtracking in Emacs's regexp matcher."
                    (setq charset (format "%s%c-%c" charset start end))
                  (while (>= end start)
                    (setq charset (format "%s%c" charset start))
-                   (incf start)))
+                   (setq start (1+ start))))
                (setq start (car c) end (cdr c)))
            (if (= (1- c) end) (setq end c)
              (if (> end (+ start 2))
                (setq charset (format "%s%c-%c" charset start end))
              (while (>= end start)
                (setq charset (format "%s%c" charset start))
-               (incf start)))
+               (setq start (1+ start))))
              (setq start c end c)))))
      charmap)
     (when (>= end start)
@@ -283,7 +280,7 @@ Merges keywords to avoid backtracking in Emacs's regexp matcher."
           (setq charset (format "%s%c-%c" charset start end))
         (while (>= end start)
           (setq charset (format "%s%c" charset start))
-          (incf start))))
+          (setq start (1+ start)))))
     ;;
     ;; Make sure a caret is not first and a dash is first or last.
     (if (and (string-equal charset "") (string-equal bracket ""))
diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el
index 2a12f03e514..cafa1942a09 100644
--- a/lisp/emacs-lisp/smie.el
+++ b/lisp/emacs-lisp/smie.el
@@ -1602,6 +1602,36 @@ to which that point should be aligned, if we were to reindent it.")
           (save-excursion (indent-line-to indent))
         (indent-line-to indent)))))
 
+(defun smie-auto-fill ()
+  (let ((fc (current-fill-column)))
+    (while (and fc (> (current-column) fc))
+      (cond
+       ((not (or (nth 8 (save-excursion
+                          (syntax-ppss (line-beginning-position))))
+                 (nth 8 (syntax-ppss))))
+        (save-excursion
+          (beginning-of-line)
+          (smie-indent-forward-token)
+          (let ((bsf (point))
+                (gain 0)
+                curcol)
+            (while (<= (setq curcol (current-column)) fc)
+              ;; FIXME?  `smie-indent-calculate' can (and often will)
+              ;; return a result that actually depends on the presence/absence
+              ;; of a newline, so the gain computed here may not be accurate,
+              ;; but in practice it seems to works well enough.
+              (let* ((newcol (smie-indent-calculate))
+                     (newgain (- curcol newcol)))
+                (when (> newgain gain)
+                  (setq gain newgain)
+                  (setq bsf (point))))
+              (smie-indent-forward-token))
+            (when (> gain 0)
+              (goto-char bsf)
+              (newline-and-indent)))))
+       (t (do-auto-fill))))))
+
+
 (defun smie-setup (grammar rules-function &rest keywords)
   "Setup SMIE navigation and indentation.
 GRAMMAR is a grammar table generated by `smie-prec2->grammar'.
@@ -1612,6 +1642,7 @@ KEYWORDS are additional arguments, which can use the following keywords:
   (set (make-local-variable 'smie-rules-function) rules-function)
   (set (make-local-variable 'smie-grammar) grammar)
   (set (make-local-variable 'indent-line-function) 'smie-indent-line)
+  (set (make-local-variable 'normal-auto-fill-function) 'smie-auto-fill)
   (set (make-local-variable 'forward-sexp-function)
        'smie-forward-sexp-command)
   (while keywords
diff --git a/lisp/emacs-lisp/tabulated-list.el b/lisp/emacs-lisp/tabulated-list.el
index f17b12da6a0..9439fba2b86 100644
--- a/lisp/emacs-lisp/tabulated-list.el
+++ b/lisp/emacs-lisp/tabulated-list.el
@@ -215,7 +215,7 @@ buffer and inserts the entries with `tabulated-list-printer'.
 Optional argument REMEMBER-POS, if non-nil, means to move point
 to the entry with the same ID element as the current line."
   (let ((inhibit-read-only t)
-        (entries (if (functionp 'tabulated-list-entries)
+        (entries (if (functionp tabulated-list-entries)
                      (funcall tabulated-list-entries)
                    tabulated-list-entries))
         entry-id saved-pt saved-col)
@@ -246,7 +246,7 @@ to the entry with the same ID element as the current line."
           (setq entries (sort entries sorter))
           (if (cdr tabulated-list-sort-key)
               (setq entries (nreverse entries)))
-          (unless (functionp 'tabulated-list-entries)
+          (unless (functionp tabulated-list-entries)
             (setq tabulated-list-entries entries)))))
     ;; Print the resulting list.
     (dolist (elt entries)
diff --git a/lisp/emacs-lock.el b/lisp/emacs-lock.el
index 743b828326c..f5954564a2f 100644
--- a/lisp/emacs-lock.el
+++ b/lisp/emacs-lock.el
@@ -81,6 +81,13 @@ for both actions (NOT RECOMMENDED)."
   :group 'emacs-lock
   :version "24.1")
 
+(defcustom emacs-lock-locked-buffer-functions nil
+  "Abnormal hook run when Emacs Lock prevents exiting Emacs, or killing a buffer.
+The functions get one argument, the first locked buffer found."
+  :type 'hook
+  :group 'emacs-lock
+  :version "24.2")
+
 (defvar emacs-lock-mode nil
   "If non-nil, the current buffer is locked.
 It can be one of the following values:
@@ -119,40 +126,45 @@ See `emacs-lock-unlockable-modes'."
              (or (eq unlock 'all) (eq unlock action))))))
 
 (defun emacs-lock--exit-locked-buffer ()
-  "Return the name of the first exit-locked buffer found."
+  "Return the first exit-locked buffer found."
   (save-current-buffer
     (catch :found
       (dolist (buffer (buffer-list))
         (set-buffer buffer)
         (unless (or (emacs-lock--can-auto-unlock 'exit)
                     (memq emacs-lock-mode '(nil kill)))
-          (throw :found (buffer-name))))
+          (throw :found buffer)))
       nil)))
 
 (defun emacs-lock--kill-emacs-hook ()
   "Signal an error if any buffer is exit-locked.
 Used from `kill-emacs-hook' (which see)."
-  (let ((buffer-name (emacs-lock--exit-locked-buffer)))
-    (when buffer-name
-      (error "Emacs cannot exit because buffer %S is locked" buffer-name))))
+  (let ((locked (emacs-lock--exit-locked-buffer)))
+    (when locked
+      (run-hook-with-args 'emacs-lock-locked-buffer-functions locked)
+      (error "Emacs cannot exit because buffer %S is locked"
+             (buffer-name locked)))))
 
 (defun emacs-lock--kill-emacs-query-functions ()
   "Display a message if any buffer is exit-locked.
 Return a value appropriate for `kill-emacs-query-functions' (which see)."
   (let ((locked (emacs-lock--exit-locked-buffer)))
-    (or (not locked)
-        (progn
-          (message "Emacs cannot exit because buffer %S is locked" locked)
-          nil))))
+    (if (not locked)
+        t
+      (run-hook-with-args 'emacs-lock-locked-buffer-functions locked)
+      (message "Emacs cannot exit because buffer %S is locked"
+               (buffer-name locked))
+      nil)))
 
 (defun emacs-lock--kill-buffer-query-functions ()
   "Display a message if the current buffer is kill-locked.
 Return a value appropriate for `kill-buffer-query-functions' (which see)."
-  (or (emacs-lock--can-auto-unlock 'kill)
-      (memq emacs-lock-mode '(nil exit))
-      (progn
-        (message "Buffer %S is locked and cannot be killed" (buffer-name))
-        nil)))
+  (if (or (emacs-lock--can-auto-unlock 'kill)
+          (memq emacs-lock-mode '(nil exit)))
+      t
+    (run-hook-with-args 'emacs-lock-locked-buffer-functions (current-buffer))
+    (message "Buffer %S is locked and cannot be killed" (buffer-name))
+    nil))
 
 (defun emacs-lock--set-mode (mode arg)
   "Setter function for `emacs-lock-mode'."
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index a918f298a4e..ba6127b4cba 100644
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -1002,15 +1002,21 @@ behavior, see `cua-paste-pop-rotate-temporarily'."
     (setq this-command 'cua-paste-pop))))
 
 (defun cua-exchange-point-and-mark (arg)
-  "Exchanges point and mark, but don't activate the mark.
-Activates the mark if a prefix argument is given."
+  "Exchange point and mark.
+Don't activate the mark if `cua-enable-cua-keys' is non-nil.
+Otherwise, just activate the mark if a prefix ARG is given.
+
+See also `exchange-point-and-mark'."
   (interactive "P")
-  (if arg
-      (setq mark-active t)
-    (let (mark-active)
-      (exchange-point-and-mark)
-      (if cua--rectangle
-          (cua--rectangle-corner 0)))))
+  (cond ((null cua-enable-cua-keys)
+         (exchange-point-and-mark arg))
+        (arg
+         (setq mark-active t))
+        (t
+         (let (mark-active)
+           (exchange-point-and-mark)
+           (if cua--rectangle
+               (cua--rectangle-corner 0))))))
 
 ;; Typed text that replaced the highlighted region.
 (defvar cua--repeat-replace-text nil)
@@ -1246,22 +1252,7 @@ If ARG is the atom `-', scroll upward by nearly full screen."
    ;;   (and region not started with C-SPC).
    ;; If rectangle is active, expand rectangle in specified direction and
    ;;   ignore the movement.
-   ((if window-system
-        ;; Shortcut for window-system, assuming that input-decode-map is empty.
-        (memq 'shift (event-modifiers
-                      (aref (this-single-command-raw-keys) 0)))
-      (or
-       ;; Check if the final key-sequence was shifted.
-       (memq 'shift (event-modifiers
-                     (aref (this-single-command-keys) 0)))
-       ;; If not, maybe the raw key-sequence was mapped by input-decode-map
-       ;; to a shifted key (and then mapped down to its unshifted form).
-       (let* ((keys (this-single-command-raw-keys))
-              (ev (lookup-key input-decode-map keys)))
-         (or (and (vector ev) (memq 'shift (event-modifiers (aref ev 0))))
-             ;; Or maybe, the raw key-sequence was not an escape sequence
-             ;; and was shifted (and then mapped down to its unshifted form).
-             (memq 'shift (event-modifiers (aref keys 0)))))))
+   (this-command-keys-shift-translated
     (unless mark-active
       (push-mark-command nil t))
     (setq cua--last-region-shifted t)
diff --git a/lisp/emulation/cua-rect.el b/lisp/emulation/cua-rect.el
index e3aade760dc..4286afba938 100644
--- a/lisp/emulation/cua-rect.el
+++ b/lisp/emulation/cua-rect.el
@@ -465,7 +465,7 @@ If command is repeated at same position, delete the rectangle."
       (cua-copy-rectangle arg)
       (setq cua--mouse-last-pos (cons (point) cua--last-killed-rectangle)))))
 
-(defun cua--mouse-ignore (event)
+(defun cua--mouse-ignore (_event)
   (interactive "e")
   (setq this-command last-command))
 
@@ -609,12 +609,12 @@ If command is repeated at same position, delete the rectangle."
   (let ((lines 0))
     (if (not (cua--rectangle-virtual-edges))
         (cua--rectangle-operation nil nil t 2 t
-          (lambda (s e l r v)
+          (lambda (s e _l _r _v)
             (setq lines (1+ lines))
             (if (and (> e s) (<= e (point-max)))
                 (delete-region s e))))
       (cua--rectangle-operation nil 1 t nil t
-        (lambda (s e l r v)
+        (lambda (s e _l _r _v)
            (setq lines (1+ lines))
            (when (and (> e s) (<= e (point-max)))
              (delete-region s e)))))
@@ -624,10 +624,10 @@ If command is repeated at same position, delete the rectangle."
   (let (rect)
     (if (not (cua--rectangle-virtual-edges))
         (cua--rectangle-operation nil nil nil nil nil ; do not tabify
-          (lambda (s e l r)
+          (lambda (s e _l _r)
              (setq rect (cons (cua--filter-buffer-noprops s e) rect))))
       (cua--rectangle-operation nil 1 nil nil nil ; do not tabify
-        (lambda (s e l r v)
+        (lambda (s e l r _v)
            (let ((copy t) (bs 0) (as 0) row)
              (if (= s e) (setq e (1+ e)))
              (goto-char s)
@@ -840,7 +840,7 @@ If command is repeated at same position, delete the rectangle."
         (pad (cua--rectangle-virtual-edges))
         indent)
     (cua--rectangle-operation (if clear 'clear 'corners) nil t pad nil
-      (lambda (s e l r)
+      (lambda (_s _e l _r)
          (move-to-column col pad)
          (if (and (eolp)
                   (< (current-column) col))
@@ -905,10 +905,10 @@ With prefix argument, activate previous rectangle if possible."
         (cua-help-for-region t))))
 
 (defun cua-restrict-regexp-rectangle (arg)
-  "Restrict rectangle to lines (not) matching REGEXP.
-With prefix argument, the toggle restriction."
+  "Restrict rectangle to lines (not) matching regexp.
+With prefix argument, toggle restriction."
   (interactive "P")
-  (let ((r (cua--rectangle-restriction)) regexp)
+  (let ((r (cua--rectangle-restriction)))
     (if (and r (null (car (cdr r))))
       (if arg
           (cua--rectangle-restriction (car r) nil (not (car (cdr (cdr r)))))
@@ -919,9 +919,9 @@ With prefix argument, the toggle restriction."
 
 (defun cua-restrict-prefix-rectangle (arg)
   "Restrict rectangle to lines (not) starting with CHAR.
-With prefix argument, the toggle restriction."
+With prefix argument, toggle restriction."
   (interactive "P")
-  (let ((r (cua--rectangle-restriction)) regexp)
+  (let ((r (cua--rectangle-restriction)))
     (if (and r (car (cdr r)))
       (if arg
           (cua--rectangle-restriction (car r) t (not (car (cdr (cdr r)))))
@@ -1000,7 +1000,7 @@ The text previously in the region is not overwritten by the blanks,
 but instead winds up to the right of the rectangle."
   (interactive)
   (cua--rectangle-operation 'corners nil t 1 nil
-   (lambda (s e l r)
+   (lambda (_s _e l r)
       (skip-chars-forward " \t")
       (let ((ws (- (current-column) l))
             (p (point)))
@@ -1015,7 +1015,7 @@ at that column is deleted.
 With prefix arg, also delete whitespace to the left of that column."
   (interactive "P")
   (cua--rectangle-operation 'clear nil t 1 nil
-   (lambda (s e l r)
+   (lambda (s _e _l _r)
       (when arg
         (skip-syntax-backward " " (line-beginning-position))
         (setq s (point)))
@@ -1027,7 +1027,7 @@ With prefix arg, also delete whitespace to the left of that column."
 The text previously in the rectangle is overwritten by the blanks."
   (interactive)
   (cua--rectangle-operation 'keep nil nil 1 nil
-   (lambda (s e l r)
+   (lambda (s e _l _r)
       (goto-char e)
       (skip-syntax-forward " " (line-end-position))
       (setq e (point))
@@ -1040,20 +1040,19 @@ The text previously in the rectangle is overwritten by the blanks."
 (defun cua-align-rectangle ()
   "Align rectangle lines to left column."
   (interactive)
-  (let (x)
-    (cua--rectangle-operation 'clear nil t t nil
-     (lambda (s e l r)
-        (let ((b (line-beginning-position)))
-          (skip-syntax-backward "^ " b)
-          (skip-syntax-backward " " b)
-          (setq s (point)))
-        (skip-syntax-forward " " (line-end-position))
-        (delete-region s (point))
-        (indent-to l))
-     (lambda (l r)
-        (move-to-column l)
-        ;; (setq cua-save-point (point))
-        ))))
+  (cua--rectangle-operation 'clear nil t t nil
+   (lambda (s _e l _r)
+      (let ((b (line-beginning-position)))
+        (skip-syntax-backward "^ " b)
+        (skip-syntax-backward " " b)
+        (setq s (point)))
+      (skip-syntax-forward " " (line-end-position))
+      (delete-region s (point))
+      (indent-to l))
+   (lambda (l _r)
+      (move-to-column l)
+      ;; (setq cua-save-point (point))
+      )))
 
 (declare-function cua--cut-rectangle-to-global-mark  "cua-gmrk" (as-text))
 (declare-function cua--copy-rectangle-to-global-mark "cua-gmrk" (as-text))
@@ -1087,7 +1086,7 @@ The text previously in the rectangle is overwritten by the blanks."
 The length of STRING need not be the same as the rectangle width."
   (interactive "sString rectangle: ")
   (cua--rectangle-operation 'keep nil t t nil
-     (lambda (s e l r)
+     (lambda (s e l _r)
         (delete-region s e)
         (skip-chars-forward " \t")
         (let ((ws (- (current-column) l)))
@@ -1095,7 +1094,7 @@ The length of STRING need not be the same as the rectangle width."
           (insert string)
           (indent-to (+ (current-column) ws))))
      (unless (cua--rectangle-restriction)
-       (lambda (l r)
+       (lambda (l _r)
           (cua--rectangle-right (max l (+ l (length string) -1)))))))
 
 (defun cua-fill-char-rectangle (character)
@@ -1113,7 +1112,7 @@ The length of STRING need not be the same as the rectangle width."
   (if buffer-read-only
       (message "Cannot replace in read-only buffer")
     (cua--rectangle-operation 'keep nil t 1 nil
-     (lambda (s e l r)
+     (lambda (_s e _l _r)
         (if (re-search-forward regexp e t)
             (replace-match newtext nil nil))))))
 
@@ -1121,7 +1120,7 @@ The length of STRING need not be the same as the rectangle width."
   "Increment each line of CUA rectangle by prefix amount."
   (interactive "p")
   (cua--rectangle-operation 'keep nil t 1 nil
-     (lambda (s e l r)
+     (lambda (_s e _l _r)
         (cond
          ((re-search-forward "0x\\([0-9a-fA-F]+\\)" e t)
           (let* ((txt (cua--filter-buffer-noprops (match-beginning 1) (match-end 1)))
@@ -1154,14 +1153,14 @@ The numbers are formatted according to the FORMAT string."
       (setq format cua--rectangle-seq-format)
     (setq cua--rectangle-seq-format format))
   (cua--rectangle-operation 'clear nil t 1 nil
-     (lambda (s e l r)
+     (lambda (s e _l _r)
          (delete-region s e)
          (insert (format format first))
          (setq first (+ first incr)))))
 
 (defmacro cua--convert-rectangle-as (command tabify)
   `(cua--rectangle-operation 'clear nil nil nil ,tabify
-    (lambda (s e l r)
+    (lambda (s e _l _r)
        (,command s e))))
 
 (defun cua-upcase-rectangle ()
@@ -1218,7 +1217,7 @@ The numbers are formatted according to the FORMAT string."
       (if cua--debug
           (print z auxbuf))
       (cua--rectangle-operation nil nil t pad nil
-        (lambda (s e l r)
+        (lambda (s e l _r)
            (let (cc)
              (goto-char e)
              (skip-chars-forward " \t")
@@ -1249,7 +1248,7 @@ The numbers are formatted according to the FORMAT string."
 
 (put 'cua--rectangle-aux-replace 'lisp-indent-function 4)
 
-(defun cua--left-fill-rectangle (start end)
+(defun cua--left-fill-rectangle (_start _end)
   (beginning-of-line)
   (while (< (point) (point-max))
     (delete-horizontal-space nil)
@@ -1298,7 +1297,7 @@ With prefix arg, replace rectangle with output from command."
   "Remove the first line of the rectangle and scroll remaining lines up."
   (interactive)
   (cua--rectangle-aux-replace 0 t t t t
-    (lambda (s e)
+    (lambda (s _e)
        (if (= (forward-line 1) 0)
            (delete-region s (point))))))
 
@@ -1307,7 +1306,7 @@ With prefix arg, replace rectangle with output from command."
 The remaining lines are scrolled down, losing the last line."
   (interactive)
   (cua--rectangle-aux-replace 0 t t t t
-    (lambda (s e)
+    (lambda (s _e)
        (goto-char s)
        (insert "\n"))))
 
@@ -1337,7 +1336,7 @@ With prefix arg, indent to that column."
         (pad (cua--rectangle-virtual-edges))
         indent)
     (cua--rectangle-operation 'corners nil t pad nil
-     (lambda (s e l r)
+     (lambda (_s _e l r)
         (move-to-column
          (if (cua--rectangle-right-side t)
              (max (1+ r) col) l)
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 34aa015d7ac..06c6d42ed39 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,23 @@
+2012-04-11  Vivek Dasmohapatra  <vivek@etla.org>
+
+        * erc-services.el (erc-nickserv-passwords): Don't display the
+        password (bug#4459).
+
+2012-04-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * erc-join.el (erc-server-join-channel): New function to look up
+        the channel password via auth-source.
+        (erc-autojoin-channels): Use it.
+        (erc-autojoin-after-ident): Ditto.
+        (erc-autojoin-channels-alist): Mention auth-source.
+
+2012-04-10  Deniz Dogan  <deniz@dogan.se>  (tiny change)
+
+        * erc.el (erc-display-prompt): Adds the field text property to the
+        ERC prompt.  This allows users to use `kill-whole-line' to kill
+        all text back to the prompt given that it's on a single line
+        (bug#10841).
+
 2012-04-09  Chong Yidong  <cyd@gnu.org>
 
         * erc.el (erc-cmd-SET): Call custom-variable-p instead of
diff --git a/lisp/erc/erc-join.el b/lisp/erc/erc-join.el
index da894ba5977..85d1edf6427 100644
--- a/lisp/erc/erc-join.el
+++ b/lisp/erc/erc-join.el
@@ -32,6 +32,7 @@
 ;;; Code:
 
 (require 'erc)
+(require 'auth-source)
 (eval-when-compile (require 'cl))
 
 (defgroup erc-autojoin nil
@@ -56,6 +57,13 @@ Every element in the alist has the form (SERVER . CHANNELS).
 SERVER is a regexp matching the server, and channels is the
 list of channels to join.
 
+If the channel(s) require channel keys for joining, the passwords
+are found via auth-source.  For instance, if you use ~/.authinfo
+as your auth-source backend, then put something like the
+following in that file:
+
+machine irc.example.net login \"#fsf\" password sEcReT
+
 Customize this variable to set the value for your first connect.
 Once you are connected and join and part channels, this alist
 keeps track of what channels you are on, and will join them
@@ -131,7 +139,7 @@ This function is run from `erc-nickserv-identified-hook'."
         (when (string-match (car l) server)
           (dolist (chan (cdr l))
             (unless (erc-member-ignore-case chan joined)
-              (erc-server-send (concat "join " chan))))))))
+              (erc-server-join-channel server chan)))))))
   nil)
 
 (defun erc-autojoin-channels (server nick)
@@ -148,10 +156,25 @@ This function is run from `erc-nickserv-identified-hook'."
     (dolist (l erc-autojoin-channels-alist)
       (when (string-match (car l) server)
         (dolist (chan (cdr l))
-          (erc-server-send (concat "join " chan))))))
+          (erc-server-join-channel server chan)))))
   ;; Return nil to avoid stomping on any other hook funcs.
   nil)
 
+(defun erc-server-join-channel (server channel)
+  (let* ((secret (plist-get (nth 0 (auth-source-search
+                                    :max 1
+                                    :host server
+                                    :port "irc"
+                                    :user channel))
+                            :secret))
+         (password (if (functionp secret)
+                       (funcall secret)
+                     secret)))
+    (erc-server-send (concat "join " channel
+                             (if password
+                                 (concat " " password)
+                               "")))))
+
 (defun erc-autojoin-add (proc parsed)
   "Add the channel being joined to `erc-autojoin-channels-alist'."
   (let* ((chnl (erc-response.contents parsed))
diff --git a/lisp/erc/erc-services.el b/lisp/erc/erc-services.el
index 66eb341b47a..5986d81efed 100644
--- a/lisp/erc/erc-services.el
+++ b/lisp/erc/erc-services.el
@@ -195,7 +195,8 @@ Example of use:
                 (repeat :tag "Nickname and password"
                         (cons :tag "Identity"
                               (string :tag "Nick")
-                              (string :tag "Password"))))))
+                              (string :tag "Password"
+                                      :secret ?*))))))
 
 ;; Variables:
 
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 62b701204d1..b79c2fd6c5e 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -3646,6 +3646,7 @@ If FACE is non-nil, it will be used to propertize the prompt.  If it is nil,
                                      'start-open t ; XEmacs
                                      'rear-nonsticky t ; Emacs
                                      'erc-prompt t
+                                     'field t
                                      'front-sticky t
                                      'read-only t))
         (erc-put-text-property 0 (1- (length prompt))
diff --git a/lisp/files.el b/lisp/files.el
index e623bc66080..d757e1a277c 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2152,6 +2152,7 @@ unless NOMODES is non-nil."
          (/= (char-after (1- (point-max))) ?\n)
          (not (and (eq selective-display t)
                    (= (char-after (1- (point-max))) ?\r)))
+         (not buffer-read-only)
          (save-excursion
            (goto-char (point-max))
            (insert "\n")))
@@ -3523,7 +3524,7 @@ LIST is a list of the form accepted by the function.
 When a file is visited, the file's class is found.  A directory
 may be assigned a class using `dir-locals-set-directory-class'.
 Then variables are set in the file's buffer according to the
-class' LIST.  The list is processed in order.
+VARIABLES list of the class.  The list is processed in order.
 
 * If the element is of the form (MAJOR-MODE . ALIST), and the
   buffer's major mode is derived from MAJOR-MODE (as determined
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 910585f21f1..2f76687983b 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -2285,10 +2285,10 @@ in which C preprocessor directives are used. e.g. `asm-mode' and
        (,(concat
           "(" (regexp-opt
                '("cond" "if" "while" "while-no-input" "let" "let*" "letrec"
-                 "prog" "progn" "progv" "prog1" "prog2" "prog*"
-                 "inline" "lambda" "save-restriction" "save-excursion"
-                 "save-selected-window" "save-window-excursion"
-                 "save-match-data" "save-current-buffer"
+                 "pcase" "pcase-let" "pcase-let*" "prog" "progn" "progv"
+                 "prog1" "prog2" "prog*" "inline" "lambda"
+                 "save-restriction" "save-excursion" "save-selected-window"
+                 "save-window-excursion" "save-match-data" "save-current-buffer"
                  "combine-after-change-calls" "unwind-protect"
                  "condition-case" "condition-case-unless-debug"
                  "track-mouse" "eval-after-load" "eval-and-compile"
diff --git a/lisp/frame.el b/lisp/frame.el
index 1cd6c0cf181..1ee9d966ef1 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1557,21 +1557,6 @@ left untouched.  FRAME nil or omitted means use the selected frame."
     'delete-frame-functions "22.1")
 
 
-;; Highlighting trailing whitespace.
-
-(make-variable-buffer-local 'show-trailing-whitespace)
-
-
-;; Scrolling
-
-(defgroup scrolling nil
-  "Scrolling windows."
-  :version "21.1"
-  :group 'frames)
-
-(defvaralias 'automatic-hscrolling 'auto-hscroll-mode)
-
-
 ;; Blinking cursor
 
 (defgroup cursor nil
@@ -1663,6 +1648,14 @@ terminals, cursor blinking is controlled by the terminal."
 (define-key ctl-x-5-map "0" 'delete-frame)
 (define-key ctl-x-5-map "o" 'other-frame)
 
+
+;; Misc.
+
+;; Only marked as obsolete in 24.2.
+(define-obsolete-variable-alias 'automatic-hscrolling 'auto-hscroll-mode "22.1")
+
+(make-variable-buffer-local 'show-trailing-whitespace)
+
 (provide 'frame)
 
 ;;; frame.el ends here
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index ef0f1c5c852..52f140d9192 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,23 @@
+2012-04-16  Glenn Morris  <rgm@gnu.org>
+
+        * nndraft.el (nndraft-request-list): Fix declaration.
+
+2012-04-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-msg.el (gnus-inews-insert-gcc): Don't do the alist stuff when we
+        don't have a current group.
+
+        * gnus-msg.el (gnus-inews-insert-gcc): Protect against when we don't
+        have a group name.
+
+        * gnus-art.el (article-wash-html): Ensure that we insert the HTML into
+        a multibyte buffer (bug#7410).
+        (article-wash-html): Parse the original article buffer to get the
+        unencoded data (bug#7410).
+
+        * gnus-start.el (gnus-read-newsrc-el-file): Protect against broken
+        .newsrc.el files.
+
 2012-03-22  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * auth-source.el (auth-source-netrc-create): Quote tokens that contain
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 048f8956567..b04615dc5a9 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -2754,9 +2754,11 @@ If READ-CHARSET, ask for a coding system."
   (let ((handles nil)
         (buffer-read-only nil))
     (when (gnus-buffer-live-p gnus-original-article-buffer)
-      (setq handles (mm-dissect-buffer t t)))
+      (with-current-buffer gnus-original-article-buffer
+        (setq handles (mm-dissect-buffer t t))))
     (article-goto-body)
     (delete-region (point) (point-max))
+    (mm-enable-multibyte)
     (mm-inline-text-html handles)))
 
 (defvar gnus-article-browse-html-temp-list nil
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index 500ace9e8ff..815bd9e44a6 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -1664,17 +1664,19 @@ this is a reply."
            ((functionp var)
             ;; A function.
             (funcall var group))
-           (t
+           (group
             ;; An alist of regexps/functions/forms.
             (while (and var
                         (not
                          (setq result
                                (cond
-                                ((stringp (caar var))
+                                ((and group
+                                      (stringp (caar var)))
                                  ;; Regexp.
                                  (when (string-match (caar var) group)
                                    (cdar var)))
-                                ((functionp (car var))
+                                ((and group
+                                      (functionp (car var)))
                                  ;; Function.
                                  (funcall (car var) group))
                                 (t
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index bb7dd76d590..f025960c348 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -2442,7 +2442,9 @@ If FORCE is non-nil, the .newsrc file is read."
         (when gnus-newsrc-assoc
           (setq gnus-newsrc-alist gnus-newsrc-assoc))))
     (dolist (elem gnus-newsrc-alist)
-      (setcar elem (mm-string-as-unibyte (car elem))))
+      ;; Protect against broken .newsrc.el files.
+      (when (car elem)
+        (setcar elem (mm-string-as-unibyte (car elem)))))
     (gnus-make-hashtable-from-newsrc-alist)
     (when (file-newer-than-file-p file ding-file)
       ;; Old format quick file
diff --git a/lisp/gnus/nndraft.el b/lisp/gnus/nndraft.el
index 1800d0c02de..da50720ebbe 100644
--- a/lisp/gnus/nndraft.el
+++ b/lisp/gnus/nndraft.el
@@ -37,7 +37,8 @@
 (require 'mm-util)
 (eval-when-compile (require 'cl))
 
-(declare-function nndraft-request-list "nnmh" (&rest args))
+;; The nnoo-import at the end, I think.
+(declare-function nndraft-request-list "nndraft" (&rest args) t)
 
 (nnoo-declare nndraft
   nnmh)
diff --git a/lisp/hexl.el b/lisp/hexl.el
index 538d218e38e..bedcc6b10b9 100644
--- a/lisp/hexl.el
+++ b/lisp/hexl.el
@@ -51,6 +51,14 @@
   "Edit a file in a hex dump format using the hexl filter."
   :group 'data)
 
+(defcustom hexl-bits 16
+  "The bit grouping that hexl will use."
+  :type '(choice (const 8 )
+                 (const 16)
+                 (const 32)
+                 (const 64))
+  :group 'hexl
+  :version "24.2")
 
 (defcustom hexl-program "hexl"
   "The program that will hexlify and dehexlify its stdin.
@@ -67,7 +75,9 @@ and \"-de\" when dehexlifying a buffer."
 
 (defcustom hexl-options (format "-hex %s" hexl-iso)
   "Space separated options to `hexl-program' that suit your needs.
-Quoting cannot be used, so the arguments cannot themselves contain spaces."
+Quoting cannot be used, so the arguments cannot themselves contain spaces.
+If you wish to set the `-group-by-X-bits' options, set `hexl-bits' instead,
+as that will override any bit grouping options set here."
   :type 'string
   :group 'hexl)
 
@@ -212,10 +222,34 @@ Quoting cannot be used, so the arguments cannot themselves contain spaces."
      (2 'hexl-ascii-region t t)))
   "Font lock keywords used in `hexl-mode'.")
 
+(defun hexl-rulerize (string bits)
+  (let ((size (/ bits 4)) (strlen (length string)) (pos 0) (ruler ""))
+    (while (< pos strlen)
+      (setq ruler (concat ruler " " (substring string pos (+ pos size))))
+      (setq pos (+ pos size)))
+    (substring ruler 1) ))
+
+(defvar hexl-rulers
+  (mapcar
+   (lambda (bits)
+     (cons bits
+           (concat " 87654321  "
+                   (hexl-rulerize "00112233445566778899aabbccddeeff" bits)
+                   "  0123456789abcdef")))
+   '(8 16 32 64)))
 ;; routines
 
 (put 'hexl-mode 'mode-class 'special)
 
+;; 10 chars for the "address: "
+;; 32 chars for the hexlified bytes
+;; 1 char for the space
+;; 16 chars for the character display
+;; X chars for the spaces (128 bits divided by the hexl-bits)
+;; 1 char for the newline.
+(defun hexl-line-displen ()
+  "The length of a hexl display line (varies with `hexl-bits')."
+  (+ 60 (/ 128 (or hexl-bits 16))))
 
 (defun hexl-mode--minor-mode-p (var)
   (memq var '(ruler-mode hl-line-mode)))
@@ -248,7 +282,7 @@ using the function `hexlify-buffer'.
 Each line in the buffer has an \"address\" (displayed in hexadecimal)
 representing the offset into the file that the characters on this line
 are at and 16 characters from the file (displayed as hexadecimal
-values grouped every 16 bits) and as their ASCII values.
+values grouped every `hexl-bits' bits) and as their ASCII values.
 
 If any of the characters (displayed as ASCII characters) are
 unprintable (control or meta characters) they will be replaced as
@@ -330,10 +364,7 @@ You can use \\[hexl-find-file] to visit a file in Hexl mode.
         (hexlify-buffer)
         (restore-buffer-modified-p modified))
       (set (make-local-variable 'hexl-max-address)
-           (let* ((full-lines (/ (buffer-size) 68))
-                  (last-line (% (buffer-size) 68))
-                  (last-line-bytes (% last-line 52)))
-             (+ last-line-bytes (* full-lines 16) -1)))
+           (+ (* (/ (1- (buffer-size)) (hexl-line-displen)) 16) 15))
       (condition-case nil
           (hexl-goto-address original-point)
         (error nil)))
@@ -510,17 +541,20 @@ Ask the user for confirmation."
 (defun hexl-current-address (&optional validate)
   "Return current hexl-address."
   (interactive)
-  (let ((current-column (- (% (- (point) (point-min) -1) 68) 11))
+  (let ((current-column
+         (- (% (- (point) (point-min) -1) (hexl-line-displen)) 11))
         (hexl-address 0))
     (if (< current-column 0)
         (if validate
             (error "Point is not on a character in the file")
           (setq current-column 0)))
     (setq hexl-address
-          (+ (* (/ (- (point) (point-min) -1) 68) 16)
-             (if (>= current-column 41)
-                 (- current-column 41)
-               (/ (- current-column  (/ current-column 5)) 2))))
+          (+ (* (/ (- (point) (point-min) -1)
+                   (hexl-line-displen)) 16)
+             (if (>= current-column (- (hexl-ascii-start-column) 10))
+                 (- current-column (- (hexl-ascii-start-column) 10))
+               (/ (- current-column
+                     (/ current-column (1+ (/ hexl-bits 4)))) 2))))
     (when (called-interactively-p 'interactive)
       (message "Current address is %d/0x%08x" hexl-address hexl-address))
     hexl-address))
@@ -531,10 +565,18 @@ This function is intended to be used as eldoc callback."
   (let ((addr (hexl-current-address)))
     (format "Current address is %d/0x%08x" addr addr)))
 
+(defun hexl-ascii-start-column ()
+  "Column at which the ascii portion of the hexl display starts."
+  (+ 43 (/ 128 hexl-bits)))
+
 (defun hexl-address-to-marker (address)
   "Return buffer position for ADDRESS."
   (interactive "nAddress: ")
-  (+ (* (/ address 16) 68) 10 (point-min) (/ (* (% address 16) 5) 2)))
+  (let ((N (* (% address 16) 2)))
+    (+ (* (/ address 16) (hexl-line-displen)) ; hexl line no * display length
+       10                      ; 10 chars for the "address: " prefix
+       (point-min)             ; base offset (point usually starts at 1, not 0)
+       (+ N (/ N (/ hexl-bits 4))) )) ) ; char offset into hexl display line
 
 (defun hexl-goto-address (address)
   "Go to hexl-mode (decimal) address ADDRESS.
@@ -700,7 +742,7 @@ With prefix arg N, puts point N bytes of the way from the true beginning."
 (defun hexl-beginning-of-line ()
   "Goto beginning of line in hexl mode."
   (interactive)
-  (goto-char (+ (* (/ (point) 68) 68) 11)))
+  (goto-char (+ (* (/ (point) (hexl-line-displen)) (hexl-line-displen)) 11)))
 
 (defun hexl-end-of-line ()
   "Goto end of line in hexl mode."
@@ -776,6 +818,17 @@ You may also type octal digits, to insert a character with that code."
 
 ;00000000: 0011 2233 4455 6677 8899 aabb ccdd eeff  0123456789ABCDEF
 
+(defun hexl-options (&optional test)
+  "Combine `hexl-bits' with `hexl-options', altering `hexl-options' as needed
+to produce the command line options to pass to the hexl command."
+  (let ((opts (or test hexl-options)))
+    (when (memq hexl-bits '(8 16 32 64))
+      (when (string-match "\\(.*\\)-group-by-[0-9]+-bits\\(.*\\)" opts)
+        (setq opts (concat (match-string 1 opts)
+                           (match-string 2 opts))))
+      (setq opts (format "%s -group-by-%d-bits " opts hexl-bits)) )
+    opts))
+
 ;;;###autoload
 (defun hexlify-buffer ()
   "Convert a binary buffer to hexl format.
@@ -798,7 +851,7 @@ This discards the buffer's undo information."
            (mapcar (lambda (s)
                      (if (not (multibyte-string-p s)) s
                        (encode-coding-string s locale-coding-system)))
-                   (split-string hexl-options)))
+                   (split-string (hexl-options))))
     (if (> (point) (hexl-address-to-marker hexl-max-address))
         (hexl-goto-address hexl-max-address))))
 
@@ -815,7 +868,7 @@ This discards the buffer's undo information."
         (buffer-undo-list t))
     (apply 'call-process-region (point-min) (point-max)
            (expand-file-name hexl-program exec-directory)
-           t t nil "-de" (split-string hexl-options))))
+           t t nil "-de" (split-string (hexl-options)))))
 
 (defun hexl-char-after-point ()
   "Return char for ASCII hex digits at point."
@@ -911,13 +964,12 @@ CH must be a unibyte character whose value is between 0 and 255."
       (error "Invalid character 0x%x -- must be in the range [0..255]" ch))
   (let ((address (hexl-current-address t)))
     (while (> num 0)
-      (let ((hex-position
-             (+ (* (/ address 16) 68)
-                10 (point-min)
-                (* 2 (% address 16))
-                (/ (% address 16) 2)))
+      (let ((hex-position (hexl-address-to-marker address))
             (ascii-position
-             (+ (* (/ address 16) 68) 51 (point-min) (% address 16)))
+             (+ (* (/ address 16) (hexl-line-displen))
+                (hexl-ascii-start-column)
+                (point-min)
+                (% address 16)))
             at-ascii-position)
         (if (= (point) ascii-position)
             (setq at-ascii-position t))
@@ -933,7 +985,7 @@ CH must be a unibyte character whose value is between 0 and 255."
         (if at-ascii-position
             (progn
               (beginning-of-line)
-              (forward-char 51)
+              (forward-char (hexl-ascii-start-column))
               (forward-char (% address 16)))))
       (setq num (1- num)))))
 
@@ -1041,7 +1093,7 @@ This function is assumed to be used as callback function for `hl-line-mode'."
 
 (defun hexl-follow-ascii-find ()
   "Find and highlight the ASCII element corresponding to current point."
-  (let ((pos (+ 51
+  (let ((pos (+ (hexl-ascii-start-column)
                 (- (point) (current-column))
                 (mod (hexl-current-address) 16))))
     (move-overlay hexl-ascii-overlay pos (1+ pos))
@@ -1050,7 +1102,7 @@ This function is assumed to be used as callback function for `hl-line-mode'."
 (defun hexl-mode-ruler ()
   "Return a string ruler for hexl mode."
   (let* ((highlight (mod (hexl-current-address) 16))
-         (s " 87654321  0011 2233 4455 6677 8899 aabb ccdd eeff  0123456789abcdef")
+         (s (cdr (assq hexl-bits hexl-rulers)))
          (pos 0))
     (set-text-properties 0 (length s) nil s)
     ;; Turn spaces in the header into stretch specs so they work
@@ -1062,12 +1114,12 @@ This function is assumed to be used as callback function for `hl-line-mode'."
                          `(space :align-to ,(1- pos))
                          s))
     ;; Highlight the current column.
-    (put-text-property (+ 11 (/ (* 5 highlight) 2))
-                       (+ 13 (/ (* 5 highlight) 2))
-                       'face 'highlight s)
+    (let ( (offset (+ (* 2 highlight) (/ (* 8 highlight) hexl-bits))) )
+      (put-text-property (+ 11 offset) (+ 13 offset) 'face 'highlight s))
     ;; Highlight the current ascii column
-    (put-text-property (+ 13 39 highlight) (+ 13 40 highlight)
-                       'face 'highlight s)
+    (put-text-property (+ (hexl-ascii-start-column) highlight 1)
+                       (+ (hexl-ascii-start-column) highlight 2)
+                       'face 'highlight s)
     s))
 
 ;; startup stuff.
diff --git a/lisp/image.el b/lisp/image.el
index be1b1ef8f48..348c208781e 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -412,7 +412,8 @@ means display it in the right marginal area."
           (prop (if (null area) image (list (list 'margin area) image))))
       (put-text-property 0 (length string) 'display prop string)
       (overlay-put overlay 'put-image t)
-      (overlay-put overlay 'before-string string))))
+      (overlay-put overlay 'before-string string)
+      overlay)))
 
 
 ;;;###autoload
@@ -684,26 +685,16 @@ The minimum delay between successive frames is 0.01s."
                       image n count time-elapsed limit))))
 
 
-(defcustom imagemagick-types-inhibit
-  '(C HTML HTM TXT PDF)
-  "ImageMagick types that should not be visited in Image mode.
-This should be a list of symbols, each of which should be one of
-the ImageMagick types listed in `imagemagick-types'.  These image
-types are not registered by `imagemagick-register-types'.
-
-If Emacs is compiled without ImageMagick support, this variable
-has no effect."
-  :type '(choice (const :tag "Let ImageMagick handle all types it can" nil)
-                 (repeat symbol))
-  ;; Ideally, would have a :set function that checks if we already did
-  ;; imagemagick-register-types, and if so undoes it, then redoes it.
-  :version "24.1"
-  :group 'image)
+(defvar imagemagick--file-regexp nil
+  "File extension regexp for ImageMagick files, if any.
+This is the extension installed into `auto-mode-alist' and
+`image-type-file-name-regexps' by `imagemagick-register-types'.")
 
 ;;;###autoload
 (defun imagemagick-register-types ()
   "Register file types that can be handled by ImageMagick.
-This registers the ImageMagick types listed in `imagemagick-types',
+This function is called at startup, after loading the init file.
+It registers the ImageMagick types listed in `imagemagick-types',
 excluding those listed in `imagemagick-types-inhibit'.
 
 Registered image types are added to `auto-mode-alist', so that
@@ -713,14 +704,45 @@ recognizes these files as having image type `imagemagick'.
 
 If Emacs is compiled without ImageMagick support, do nothing."
   (when (fboundp 'imagemagick-types)
-    (let ((im-types '()))
-      (dolist (im-type (imagemagick-types))
-        (unless (memq im-type imagemagick-types-inhibit)
-          (push (downcase (symbol-name im-type)) im-types)))
-      (let ((extension (concat "\\." (regexp-opt im-types) "\\'")))
-        (push (cons extension 'image-mode) auto-mode-alist)
-        (push (cons extension 'imagemagick)
-              image-type-file-name-regexps)))))
+    (let ((re (if (eq imagemagick-types-inhibit t)
+                  ;; Use a bogus regexp to inhibit matches.
+                  "\\'a"
+                (let ((types))
+                  (dolist (type (imagemagick-types))
+                    (unless (memq type imagemagick-types-inhibit)
+                      (push (downcase (symbol-name type)) types)))
+                  (concat "\\." (regexp-opt types) "\\'"))))
+          (ama-elt (car (member (cons imagemagick--file-regexp 'image-mode)
+                                auto-mode-alist)))
+          (itfnr-elt (car (member (cons imagemagick--file-regexp 'imagemagick)
+                                  image-type-file-name-regexps))))
+      (if ama-elt
+          (setcar ama-elt re)
+        (push (cons re 'image-mode) auto-mode-alist))
+      (if itfnr-elt
+          (setcar itfnr-elt re)
+        (push (cons re 'imagemagick) image-type-file-name-regexps))
+      (setq imagemagick--file-regexp re))))
+
+(defcustom imagemagick-types-inhibit
+  '(C HTML HTM TXT PDF)
+  "List of ImageMagick types that should not be treated as images.
+This should be a list of symbols, each of which should be one of
+the ImageMagick types listed in `imagemagick-types'.  The listed
+image types are not registered by `imagemagick-register-types'.
+
+If the value is t, inhibit the use of ImageMagick for images.
+
+If Emacs is compiled without ImageMagick support, this variable
+has no effect."
+  :type '(choice (const :tag "Support all ImageMagick types" nil)
+                 (const :tag "Disable all ImageMagick types" t)
+                 (repeat symbol))
+  :set (lambda (symbol value)
+         (set-default symbol value)
+         (imagemagick-register-types))
+  :version "24.1"
+  :group 'image)
 
 (provide 'image)
 
diff --git a/lisp/imenu.el b/lisp/imenu.el
index 8363956355b..12ac3540925 100644
--- a/lisp/imenu.el
+++ b/lisp/imenu.el
@@ -280,13 +280,13 @@ The function in this variable is called when selecting a normal index-item.")
 ;;  `(and
 ;;    imenu-scanning-message
 ;;    (let ((pos ,(if relpos
-;;                  relpos
-;;                `(imenu--relative-position ,reverse))))
-;;      (if ,(if relpos t
-;;           `(> pos (+ 5 ,prevpos)))
-;;        (progn
-;;          (message imenu-scanning-message pos)
-;;          (setq ,prevpos pos)))))
+;;                 relpos
+;;               `(imenu--relative-position ,reverse))))
+;;      (if ,(if relpos t
+;;          `(> pos (+ 5 ,prevpos)))
+;;       (progn
+;;         (message imenu-scanning-message pos)
+;;         (setq ,prevpos pos)))))
 )
 
 
@@ -338,13 +338,10 @@ Don't move point."
   (let ((index-alist '())
         (index-var-alist '())
         (index-type-alist '())
-        (index-unknown-alist '())
-        prev-pos)
+        (index-unknown-alist '()))
     (goto-char (point-max))
-    (imenu-progress-message prev-pos 0)
     ;; Search for the function
     (while (beginning-of-defun)
-      (imenu-progress-message prev-pos nil t)
           (save-match-data
             (and (looking-at "(def")
                  (save-excursion
@@ -371,7 +368,6 @@ Don't move point."
                      (forward-sexp 2)
                      (push (imenu-example--name-and-position)
                        index-unknown-alist)))))))
-    (imenu-progress-message prev-pos 100)
     (and index-var-alist
          (push (cons "Variables" index-var-alist)
                index-alist))
@@ -396,15 +392,13 @@ Don't move point."
 
 (defun imenu-example--create-c-index (&optional regexp)
   (let ((index-alist '())
-        prev-pos char)
+        char)
     (goto-char (point-min))
-    (imenu-progress-message prev-pos 0)
     ;; Search for the function
     (save-match-data
       (while (re-search-forward
               (or regexp imenu-example--function-name-regexp-c)
               nil t)
-        (imenu-progress-message prev-pos)
         (backward-up-list 1)
         (save-excursion
           (goto-char (scan-sexps (point) 1))
@@ -412,7 +406,6 @@ Don't move point."
         ;; Skip this function name if it is a prototype declaration.
         (if (not (eq char ?\;))
             (push (imenu-example--name-and-position) index-alist))))
-    (imenu-progress-message prev-pos 100)
     (nreverse index-alist)))
 (make-obsolete 'imenu-example--create-c-index "your own" "23.2")
 
@@ -684,22 +677,19 @@ The alternate method, which is the one most often used, is to call
   (cond ((and imenu-prev-index-position-function
               imenu-extract-index-name-function)
          (let ((index-alist '()) (pos (point))
-               prev-pos name)
+               name)
            (goto-char (point-max))
-           (imenu-progress-message prev-pos 0 t)
            ;; Search for the function
            (while (funcall imenu-prev-index-position-function)
              (when (= pos (point))
                (error "Infinite loop at %s:%d: imenu-prev-index-position-function does not move point" (buffer-name) pos))
              (setq pos (point))
-             (imenu-progress-message prev-pos nil t)
              (save-excursion
                (setq name (funcall imenu-extract-index-name-function)))
              (and (stringp name)
                   ;; [ydi] updated for imenu-use-markers
                   (push (cons name (if imenu-use-markers (point-marker) (point)))
                         index-alist)))
-           (imenu-progress-message prev-pos 100 t)
            index-alist))
         ;; Use generic expression if possible.
         ((and imenu-generic-expression)
@@ -765,7 +755,6 @@ They may also be nested index alists like:
 depending on PATTERNS."
 
   (let ((index-alist (list 'dummy))
-        prev-pos
         (case-fold-search (if (or (local-variable-p 'imenu-case-fold-search)
                                   (not (local-variable-p 'font-lock-defaults)))
                               imenu-case-fold-search
@@ -782,7 +771,6 @@ depending on PATTERNS."
                 (modify-syntax-entry c (cdr syn) table))
               (car syn))))
     (goto-char (point-max))
-    (imenu-progress-message prev-pos 0 t)
     (unwind-protect                     ; for syntax table
         (save-match-data
           (set-syntax-table table)
@@ -800,7 +788,17 @@ depending on PATTERNS."
               (goto-char (point-max))
               (while (and (if (functionp regexp)
                               (funcall regexp)
-                            (re-search-backward regexp nil t))
+                            (and
+                             (re-search-backward regexp nil t)
+                             ;; Do not count invisible definitions.
+                             (let ((invis (invisible-p (point))))
+                               (or (not invis)
+                                   (progn
+                                     (while (and invis
+                                                 (not (bobp)))
+                                       (setq invis (not (re-search-backward
+                                                         regexp nil 'move))))
+                                     (not invis))))))
                           ;; Exit the loop if we get an empty match,
                           ;; because it means a bad regexp was specified.
                           (not (= (match-beginning 0) (match-end 0))))
@@ -810,7 +808,6 @@ depending on PATTERNS."
                 (goto-char (match-beginning index))
                 (beginning-of-line)
                 (setq beg (point))
-                (imenu-progress-message prev-pos nil t)
                 ;; Add this sort of submenu only when we've found an
                 ;; item for it, avoiding empty, duff menus.
                 (unless (assoc menu-title index-alist)
@@ -835,7 +832,6 @@ depending on PATTERNS."
                 ;; keep making progress backwards.
                 (goto-char start))))
           (set-syntax-table old-table)))
-    (imenu-progress-message prev-pos 100 t)
     ;; Sort each submenu by position.
     ;; This is in case one submenu gets items from two different regexps.
     (dolist (item index-alist)
@@ -963,7 +959,8 @@ See the command `imenu' for more information."
           imenu-generic-expression
           (not (eq imenu-create-index-function
                    'imenu-default-create-index-function)))
-      (unless (keymapp (lookup-key (current-local-map) [menu-bar index]))
+      (unless (and (current-local-map)
+                   (keymapp (lookup-key (current-local-map) [menu-bar index])))
         (let ((newmap (make-sparse-keymap)))
           (set-keymap-parent newmap (current-local-map))
           (setq imenu--last-menubar-index-alist nil)
@@ -1028,7 +1025,7 @@ to `imenu-update-menubar'.")
     (imenu item)
     nil))
 
-(defun imenu-default-goto-function (name position &optional rest)
+(defun imenu-default-goto-function (_name position &optional _rest)
   "Move to the given position.
 
 NAME is ignored.  POSITION is where to move.  REST is also ignored.
diff --git a/lisp/international/characters.el b/lisp/international/characters.el
index 99985fa72c7..c75ca8106ac 100644
--- a/lisp/international/characters.el
+++ b/lisp/international/characters.el
@@ -577,8 +577,6 @@ with L, LRE, or LRO Unicode bidi character type.")
           (setq from (+ from 2))))))
 
   (set-case-syntax-pair ?Ÿ ?ÿ tbl)
-  (set-case-syntax-pair #x189 #x256 tbl)
-  (set-case-syntax-pair #x18A #x257 tbl)
 
   ;; In some languages, such as Turkish, U+0049 LATIN CAPITAL LETTER I
   ;; and U+0131 LATIN SMALL LETTER DOTLESS I make a case pair, and so
@@ -594,6 +592,8 @@ with L, LRE, or LRO Unicode bidi character type.")
 
   (set-case-syntax-pair ?Ɓ ?ɓ tbl)
   (set-case-syntax-pair ?Ɔ ?ɔ tbl)
+  (set-case-syntax-pair ?Ɖ ?ɖ tbl)
+  (set-case-syntax-pair ?Ɗ ?ɗ tbl)
   (set-case-syntax-pair ?Ǝ ?ǝ tbl)
   (set-case-syntax-pair ?Ə ?ə tbl)
   (set-case-syntax-pair ?Ɛ ?ɛ tbl)
@@ -622,6 +622,12 @@ with L, LRE, or LRO Unicode bidi character type.")
   (set-case-syntax-pair ?Dz ?dz tbl)
   (set-case-syntax-pair ?Ƕ ?ƕ tbl)
   (set-case-syntax-pair ?Ƿ ?ƿ tbl)
+  (set-case-syntax-pair ?Ⱥ ?ⱥ tbl)
+  (set-case-syntax-pair ?Ƚ ?ƚ tbl)
+  (set-case-syntax-pair ?Ⱦ ?ⱦ tbl)
+  (set-case-syntax-pair ?Ƀ ?ƀ tbl)
+  (set-case-syntax-pair ?Ʉ ?ʉ tbl)
+  (set-case-syntax-pair ?Ʌ ?ʌ tbl)
 
   ;; Latin Extended Additional
   (modify-category-entry '(#x1e00 . #x1ef9) ?l)
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 6d609b67d63..02d37f86da0 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1834,7 +1834,11 @@ The default status is as follows:
 This sets the coding system priority and the default input method
 and sometimes other things.  LANGUAGE-NAME should be a string
 which is the name of a language environment.  For example, \"Latin-1\"
-specifies the character set for the major languages of Western Europe."
+specifies the character set for the major languages of Western Europe.
+
+If there is a prior value for `current-language-environment', this
+runs the hook `exit-language-environment-hook'.  After setting up
+the new language environment, it runs `set-language-environment-hook'."
   (interactive (list (read-language-name
                       nil
                       "Set language environment (default English): ")))
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 7bf15009687..1f88df52fd4 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -1754,8 +1754,9 @@ functions, so they won't be called at all."
   :type '(repeat function))
 
 (defvar set-auto-coding-for-load nil
-  "Non-nil means look for `load-coding' property instead of `coding'.
-This is used for loading and byte-compiling Emacs Lisp files.")
+  "Non-nil means respect a \"unibyte: t\" entry in file local variables.
+Emacs binds this variable to t when loading or byte-compiling Emacs Lisp
+files.")
 
 (defun auto-coding-alist-lookup (filename)
   "Return the coding system specified by `auto-coding-alist' for FILENAME."
diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index 70e6d4b69cb..4d69e2fdbcb 100644
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -486,19 +486,15 @@ non-Quail commands."
           (setq translation-keymap (copy-keymap
                                     (if simple quail-simple-translation-keymap
                                       quail-translation-keymap)))
-          (while translation-keys
-            (define-key translation-keymap
-              (car (car translation-keys)) (cdr (car translation-keys)))
-            (setq translation-keys (cdr translation-keys))))
+          (dolist (trans translation-keys)
+            (define-key translation-keymap (car trans) (cdr trans))))
       (setq translation-keymap
             (if simple quail-simple-translation-keymap
               quail-translation-keymap)))
     (when conversion-keys
       (setq conversion-keymap (copy-keymap quail-conversion-keymap))
-      (while conversion-keys
-        (define-key conversion-keymap
-          (car (car conversion-keys)) (cdr (car conversion-keys)))
-        (setq conversion-keys (cdr conversion-keys))))
+      (dolist (conv conversion-keys)
+        (define-key conversion-keymap (car conv) (cdr conv))))
     (quail-add-package
      (list name title (list nil) guidance (or docstring "")
            translation-keymap
@@ -720,12 +716,11 @@ The command `quail-set-keyboard-layout' usually sets this variable."
       (setq quail-keyboard-layout-substitution subst-list)
       ;; If there are additional key locations, map them to missing
       ;; key locations.
-      (while missing-list
+      (dolist (missing missing-list)
         (while (and subst-list (cdr (car subst-list)))
           (setq subst-list (cdr subst-list)))
         (if subst-list
-            (setcdr (car subst-list) (car missing-list)))
-        (setq missing-list (cdr missing-list))))))
+            (setcdr (car subst-list) missing))))))
 
 (defcustom quail-keyboard-layout-type "standard"
   "Type of keyboard layout used in Quail base input method.
@@ -806,9 +801,10 @@ The format of KBD-LAYOUT is the same as `quail-keyboard-layout'."
         (if translation
             (progn
               (if (consp translation)
-                  (if (> (length (cdr translation)) 0)
-                      (setq translation (aref (cdr translation) 0))
-                    (setq translation " ")))
+                  (setq translation
+                        (if (> (length (cdr translation)) 0)
+                            (aref (cdr translation) 0)
+                          " ")))
               (setq done-list (cons translation done-list)))
           (setq translation (aref kbd-layout i)))
         (aset layout i translation))
@@ -834,17 +830,19 @@ The format of KBD-LAYOUT is the same as `quail-keyboard-layout'."
         (if (< (if (stringp lower) (string-width lower) (char-width lower)) 2)
             (insert " "))
         (if (characterp lower)
-            (if (eq (get-char-code-property lower 'general-category) 'Mn)
-                ;; Pad the left and right of non-spacing characters.
-                (setq lower (compose-string (string lower) 0 1
-                                            (format "\t%c\t" lower)))
-              (setq lower (string lower))))
+            (setq lower
+                  (if (eq (get-char-code-property lower 'general-category) 'Mn)
+                      ;; Pad the left and right of non-spacing characters.
+                      (compose-string (string lower) 0 1
+                                      (format "\t%c\t" lower))
+                    (string lower))))
         (if (characterp upper)
-            (if (eq (get-char-code-property upper 'general-category) 'Mn)
-                ;; Pad the left and right of non-spacing characters.
-                (setq upper (compose-string (string upper) 0 1
-                                            (format "\t%c\t" upper)))
-              (setq upper (string upper))))
+            (setq upper
+                  (if (eq (get-char-code-property upper 'general-category) 'Mn)
+                      ;; Pad the left and right of non-spacing characters.
+                      (compose-string (string upper) 0 1
+                                      (format "\t%c\t" upper))
+                    (string upper))))
         (insert (bidi-string-mark-left-to-right lower)
                 (propertize " " 'invisible t)
                 (bidi-string-mark-left-to-right upper))
@@ -1032,8 +1030,8 @@ the following annotation types are supported.
       (let ((map (list nil))
             (decode-map (if (not no-decode-map) (list 'decode-map)))
             key trans)
-        (while l
-          (setq key (car (car l)) trans (car (cdr (car l))) l (cdr l))
+        (dolist (el l)
+          (setq key (car el) trans (car (cdr el)))
           (quail-defrule-internal key trans map t decode-map props))
         `(if (prog1 (quail-decode-map)
                (quail-install-map ',map))
@@ -1201,7 +1199,7 @@ function `quail-define-rules' for the detail."
                 (if (stringp trans)
                     (setq trans (string-to-vector trans))))
               (let ((new (quail-vunion prevchars trans)))
-              (setq trans
+                (setq trans
                       (if (equal new prevchars)
                           ;; Nothing to change, get back to orig value.
                           prev
@@ -1215,10 +1213,8 @@ where VECTOR is a vector of candidates (character or string) for
 the translation, and INDEX points into VECTOR to specify the currently
 selected translation."
   (if (and def (symbolp def))
-      (if (functionp def)
-          ;; DEF is a symbol of a function which returns valid translation.
-          (setq def (funcall def key len))
-        (setq def nil)))
+      ;; DEF is a symbol of a function which returns valid translation.
+      (setq def (if (functionp def) (funcall def key len))))
   (if (and (consp def) (not (vectorp (cdr def))))
       (setq def (car def)))
 
diff --git a/lisp/language/european.el b/lisp/language/european.el
index b658f93d90f..259c06755a0 100644
--- a/lisp/language/european.el
+++ b/lisp/language/european.el
@@ -324,6 +324,14 @@ Latin-9 is sometimes nicknamed `Latin-0'."))
   :mime-charset 'windows-1257)
 (define-coding-system-alias 'cp1257 'windows-1257)
 
+(define-coding-system 'cp775
+  "DOS codepage 775 (PC Baltic, MS-DOS Baltic Rim)"
+  :coding-type 'charset
+  :mnemonic ?D
+  :charset-list '(cp775)
+  :mime-charset 'cp775)
+(define-coding-system-alias 'ibm775 'cp775)
+
 (define-coding-system 'cp850
   "DOS codepage 850 (Western European)"
   :coding-type 'charset
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 2ba24c8fe37..f7ffa27a9ed 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -193,6 +193,8 @@
 (if (fboundp 'x-create-frame)
     (progn
       (load "fringe")
+      ;; Needed by `imagemagick-register-types'
+      (load "emacs-lisp/regexp-opt")
       (load "image")
       (load "international/fontset")
       (load "dnd")
diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el
index 4e76e5cdb64..f35560841e2 100644
--- a/lisp/mail/feedmail.el
+++ b/lisp/mail/feedmail.el
@@ -1586,7 +1586,7 @@ messages to make sure it works as expected."
 
 
 ;; feedmail-buffer-to-binmail, feedmail-buffer-to-sendmail, and
-;; feedmail-buffer-to-smptmail are the only things provided for values
+;; feedmail-buffer-to-smtpmail are the only things provided for values
 ;; for the variable feedmail-buffer-eating-function.  It's pretty easy
 ;; to write your own, though.
 (defun feedmail-buffer-to-binmail (prepped errors-to addr-listoid)
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 093050229c4..d2b9890805c 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -40,6 +40,9 @@
 (require 'mail-utils)
 (require 'rfc2047)
 
+(declare-function compilation--message->loc "compile" (cl-x) t)
+(declare-function epa--find-coding-system-for-mime-charset "epa" (mime-charset))
+
 (defconst rmail-attribute-header "X-RMAIL-ATTRIBUTES"
   "The header that stores the Rmail attribute data.")
 
@@ -3560,6 +3563,16 @@ does not pop any summary buffer."
 
 ;;;; *** Rmail Mailing Commands ***
 
+(defun rmail-yank-current-message (buffer)
+  "Yank into the current buffer the current message of Rmail buffer BUFFER.
+If BUFFER is swapped with its message viewer buffer, yank out of BUFFER.
+If BUFFER is not swapped, yank out of its message viewer buffer."
+  (with-current-buffer buffer
+    (unless (rmail-buffers-swapped-p)
+      (setq buffer rmail-view-buffer)))
+  (insert-buffer buffer))
+
+
 (defun rmail-start-mail (&optional noerase to subject in-reply-to cc
                                    replybuffer sendactions same-window
                                    other-headers)
@@ -3571,7 +3584,8 @@ does not pop any summary buffer."
     (if replybuffer
         ;; The function used here must behave like insert-buffer wrt
         ;; point and mark (see doc of sc-cite-original).
-        (setq yank-action (list 'insert-buffer replybuffer)))
+        (setq yank-action
+              `(rmail-yank-current-message ,replybuffer)))
     (push (cons "cc" cc) other-headers)
     (push (cons "in-reply-to" in-reply-to) other-headers)
     (setq other-headers
@@ -3587,7 +3601,7 @@ does not pop any summary buffer."
     (prog1
         (compose-mail to subject other-headers noerase
                       switch-function yank-action sendactions
-                      `(rmail-mail-return ,replybuffer))
+                      (if replybuffer `(rmail-mail-return ,replybuffer)))
       (if (eq switch-function 'switch-to-buffer-other-frame)
           ;; This is not a standard frame parameter; nothing except
           ;; sendmail.el looks at it.
@@ -3644,7 +3658,7 @@ to switch to."
 While composing the message, use \\[mail-yank-original] to yank the
 original message into it."
   (interactive)
-  (rmail-start-mail nil nil nil nil nil rmail-view-buffer))
+  (rmail-start-mail nil nil nil nil nil rmail-buffer))
 
 ;; FIXME should complain if there is nothing to continue.
 (defun rmail-continue ()
@@ -3731,9 +3745,7 @@ use \\[mail-yank-original] to yank the original message into it."
                         (mail-strip-quoted-names
                          (if (null cc) to (concat to ", " cc))))))
          (if (string= cc-list "") nil cc-list)))
-     (if (rmail-buffers-swapped-p)
-         rmail-buffer
-       rmail-view-buffer)
+     rmail-buffer
      (list (list 'rmail-mark-message
                  rmail-buffer
                  (with-current-buffer rmail-buffer
@@ -3835,7 +3847,7 @@ see the documentation of `rmail-resend'."
                            (or (mail-fetch-field "Subject") "")
                            "]")))
       (if (rmail-start-mail
-           nil nil subject nil nil nil
+           nil nil subject nil nil rmail-buffer
            (list (list 'rmail-mark-message
                        forward-buffer
                        (with-current-buffer rmail-buffer
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index f8958a691b2..cd3862985bd 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -856,15 +856,17 @@ Prefix arg means don't delete this window."
 (defun mail-bury (&optional arg)
   "Bury this mail buffer."
   (let ((newbuf (other-buffer (current-buffer)))
-        (return-action mail-return-action)
-        some-rmail)
+        (return-action mail-return-action))
     (bury-buffer (current-buffer))
     ;; If there is an Rmail buffer, return to it nicely
     ;; even if this message was not started by an Rmail command.
     (unless return-action
       (dolist (buffer (buffer-list))
-        (if (eq (buffer-local-value 'major-mode buffer) 'rmail-mode)
-            (setq return-action `(rmail-mail-return ,newbuf)))))
+        (if (and (eq (buffer-local-value 'major-mode buffer) 'rmail-mode)
+                 (null return-action)
+                 ;; Don't match message-viewer buffer.
+                 (not (string-match "\\` " (buffer-name buffer))))
+            (setq return-action `(rmail-mail-return ,buffer)))))
     (if (and (null arg) return-action)
         (apply (car return-action) (cdr return-action))
       (switch-to-buffer newbuf))))
diff --git a/lisp/mail/unrmail.el b/lisp/mail/unrmail.el
index af16bbf8c73..bf7b9abe2c1 100644
--- a/lisp/mail/unrmail.el
+++ b/lisp/mail/unrmail.el
@@ -61,8 +61,7 @@ For example, invoke `emacs -batch -f batch-unrmail RMAIL'."
         (error "This file is not in Babyl format"))
 
     ;; Decode the file contents just as Rmail did.
-    (let ((modifiedp (buffer-modified-p))
-          (coding-system rmail-file-coding-system)
+    (let ((coding-system rmail-file-coding-system)
           from to)
       (goto-char (point-min))
       (search-forward "\n\^_" nil t)    ; Skip BABYL header.
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 2c3d0dc3803..f98b4a7490e 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-21  Juanma Barranquero  <lekktu@gmail.com>
+
+        * mh-folder.el (top): Check whether which-func-modes is t before
+        adding mh-folder-mode.
+
 2011-11-20  Bill Wohler  <wohler@newt.com>
 
         * Release MH-E version 8.3.1.
diff --git a/lisp/mh-e/mh-folder.el b/lisp/mh-e/mh-folder.el
index 71ef87385ca..d9e6c74f3f3 100644
--- a/lisp/mh-e/mh-folder.el
+++ b/lisp/mh-e/mh-folder.el
@@ -520,7 +520,7 @@ font-lock is done highlighting.")
 
 ;; Register mh-folder-mode as supporting which-function-mode...
 (mh-require 'which-func nil t)
-(when (boundp 'which-func-modes)
+(when (and (boundp 'which-func-modes) (listp which-func-modes))
   (add-to-list 'which-func-modes 'mh-folder-mode))
 
 ;; Shush compiler.
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index bcc6a808d22..5a990f6ab35 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1506,7 +1506,7 @@ exit."
   (let ((map (make-sparse-keymap)))
     ;; FIXME: Only works if completion-in-region-mode was activated via
     ;; completion-at-point called directly.
-    (define-key map "?" 'completion-help-at-point)
+    (define-key map "\M-?" 'completion-help-at-point)
     (define-key map "\t" 'completion-at-point)
     map)
   "Keymap activated during `completion-in-region'.")
@@ -1817,6 +1817,12 @@ same as `substitute-in-file-name'."
   (condition-case nil
       (cond
        ((eq action 'metadata) '(metadata (category . file)))
+       ((string-match-p "\\`~[^/\\]*\\'" string)
+        (completion-table-with-context "~"
+                                       (mapcar (lambda (u) (concat u "/"))
+                                               (system-users))
+                                       (substring string 1)
+                                       pred action))
        ((eq (car-safe action) 'boundaries)
         (let ((start (length (file-name-directory string)))
               (end (string-match-p "/" (cdr action))))
@@ -2045,6 +2051,21 @@ and `read-file-name-function'."
   (funcall (or read-file-name-function #'read-file-name-default)
            prompt dir default-filename mustmatch initial predicate))
 
+(defvar minibuffer-local-filename-syntax
+  (let ((table (make-syntax-table))
+        (punctuation (car (string-to-syntax "."))))
+    ;; Convert all punctuation entries to symbol.
+    (map-char-table (lambda (c syntax)
+                      (when (eq (car syntax) punctuation)
+                        (modify-syntax-entry c "_" table)))
+                    table)
+    (mapc
+     (lambda (c)
+       (modify-syntax-entry c "." table))
+     '(?/ ?: ?\\))
+    table)
+  "Syntax table to be used in minibuffer for reading file name.")
+
 ;; minibuffer-completing-file-name is a variable used internally in minibuf.c
 ;; to determine whether to use minibuffer-local-filename-completion-map or
 ;; minibuffer-local-completion-map.  It shouldn't be exported to Elisp.
@@ -2113,7 +2134,8 @@ See `read-file-name' for the meaning of the arguments."
                                (lambda ()
                                  (with-current-buffer
                                      (window-buffer (minibuffer-selected-window))
-                                   (read-file-name--defaults dir initial)))))
+                                   (read-file-name--defaults dir initial))))
+                          (set-syntax-table minibuffer-local-filename-syntax))
                       (completing-read prompt 'read-file-name-internal
                                        pred mustmatch insdef
                                        'file-name-history default-filename)))
diff --git a/lisp/misc.el b/lisp/misc.el
index 4706c918db3..cb52ecbd36e 100644
--- a/lisp/misc.el
+++ b/lisp/misc.el
@@ -138,6 +138,19 @@ variation of `C-x M-c M-butterfly' from url `http://xkcd.com/378/'."
 (defvar list-dynamic-libraries--loaded-only-p)
 (make-variable-buffer-local 'list-dynamic-libraries--loaded-only-p)
 
+(defun list-dynamic-libraries--loaded (from)
+  "Compute the \"Loaded from\" column.
+Internal use only."
+  (if from
+      (let ((name (car from))
+            (path (or (cdr from) "<unknown>")))
+        ;; This is a roundabout way to change the tooltip without
+        ;; having to replace the default printer function
+        (propertize name
+                    'display (propertize name
+                                         'help-echo (concat "Loaded from: " path))))
+    ""))
+
 (defun list-dynamic-libraries--refresh ()
   "Recompute the list of dynamic libraries.
 Internal use only."
@@ -159,7 +172,7 @@ Internal use only."
       (when (or from
                 (not list-dynamic-libraries--loaded-only-p))
         (push (list id (vector (symbol-name id)
-                               (or from "")
+                               (list-dynamic-libraries--loaded from)
                                (mapconcat 'identity (cdr lib) ", ")))
               tabulated-list-entries)))))
 
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 2e119483797..8e08f89f22c 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -1,6 +1,6 @@
 ;;; mouse.el --- window system-independent mouse support
 
-;; Copyright (C) 1993-1995, 1999-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1993-1995, 1999-2012 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: hardware, mouse
@@ -194,8 +194,7 @@ items `Turn Off' and `Help'."
          (newmap (if ancestor
                      (make-sparse-keymap (concat (format-mode-line mode-name)
                                                  " Mode"))
-                   menu-bar-edit-menu))
-         uniq)
+                   menu-bar-edit-menu)))
     (if ancestor
         (set-keymap-parent newmap ancestor))
     newmap))
@@ -805,8 +804,8 @@ DO-MOUSE-DRAG-REGION-POST-PROCESS should only be used by
                                   (= click-count 1)))
          ;; Suppress automatic hscrolling, because that is a nuisance
          ;; when setting point near the right fringe (but see below).
-         (automatic-hscrolling-saved automatic-hscrolling)
-         (automatic-hscrolling nil)
+         (auto-hscroll-mode-saved auto-hscroll-mode)
+         (auto-hscroll-mode nil)
          event end end-point)
 
     (setq mouse-selection-click-count click-count)
@@ -838,7 +837,7 @@ DO-MOUSE-DRAG-REGION-POST-PROCESS should only be used by
           ;; Automatic hscrolling did not occur during the call to
           ;; `read-event'; but if the user subsequently drags the
           ;; mouse, go ahead and hscroll.
-          (let ((automatic-hscrolling automatic-hscrolling-saved))
+          (let ((auto-hscroll-mode auto-hscroll-mode-saved))
             (redisplay))
           (setq end (event-end event)
                 end-point (posn-point end))
diff --git a/lisp/mpc.el b/lisp/mpc.el
index 614f2bd6806..d2203a4deab 100644
--- a/lisp/mpc.el
+++ b/lisp/mpc.el
@@ -1,6 +1,6 @@
 ;;; mpc.el --- A client for the Music Player Daemon   -*- coding: utf-8; lexical-binding: t -*-
 
-;; Copyright (C) 2006-2012  Free Software Foundation, Inc.
+;; Copyright (C) 2006-2012 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: multimedia
@@ -184,10 +184,7 @@ numerically rather than lexicographically."
                     (abs res))
                 res))))))))
 
-(defun mpc-string-prefix-p (str1 str2)
-  ;; FIXME: copied from pcvs-util.el.
-  "Tell whether STR1 is a prefix of STR2."
-  (eq t (compare-strings str2 nil (length str1) str1 nil nil)))
+(define-obsolete-function-alias 'mpc-string-prefix-p 'string-prefix-p "24.2")
 
 ;; This can speed up mpc--song-search significantly.  The table may grow
 ;; very large, tho.  It's only bounded by the fact that it gets flushed
@@ -1690,7 +1687,7 @@ Return non-nil if a selection was deactivated."
         (process-put (mpc-proc) prop
                      (delq nil
                            (mapcar (lambda (x)
-                                     (if (mpc-string-prefix-p name x)
+                                     (if (string-prefix-p name x)
                                          nil x))
                                    new)))))
     (mpc-tagbrowser-refresh)))
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 0bfc8eda3b1..62c0e317a81 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -467,7 +467,7 @@ commands reverses the effect of this variable.  Requires Netscape version
     ;; it in anonymous cases.  If it's not anonymous the next regexp
     ;; applies.
     ("^/\\([^:@]+@\\)?\\([^:]+\\):/*" . "ftp://\\1\\2/")
-    ,@(if (memq system-type '(windows-nt ms-dos cygwin))
+    ,@(if (memq system-type '(windows-nt ms-dos))
           '(("^\\([a-zA-Z]:\\)[\\/]" . "file:///\\1/")
             ("^[\\/][\\/]+" . "file://")))
     ("^/+" . "file:///"))
@@ -724,12 +724,6 @@ interactively.  Turn the filename into a URL with function
 (defun browse-url-file-url (file)
   "Return the URL corresponding to FILE.
 Use variable `browse-url-filename-alist' to map filenames to URLs."
-  ;; De-munge Cygwin filenames before passing them to Windows browser.
-  (if (eq system-type 'cygwin)
-      (let ((winfile (with-output-to-string
-                       (call-process "cygpath" nil standard-output
-                                     nil "-m" file))))
-        (setq file (substring winfile 0 -1))))
   (let ((coding (and (default-value 'enable-multibyte-characters)
                      (or file-name-coding-system
                          default-file-name-coding-system))))
diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index feef78a305f..e3144a53fab 100644
--- a/lisp/net/dbus.el
+++ b/lisp/net/dbus.el
@@ -37,6 +37,7 @@
 (declare-function dbus-init-bus "dbusbind.c")
 (declare-function dbus-method-return-internal "dbusbind.c")
 (declare-function dbus-method-error-internal "dbusbind.c")
+(declare-function dbus-register-service "dbusbind.c")
 (declare-function dbus-register-signal "dbusbind.c")
 (declare-function dbus-register-method "dbusbind.c")
 (declare-function dbus-send-signal "dbusbind.c")
@@ -275,8 +276,7 @@ usage: (dbus-name-owner-changed-handler service old-owner new-owner)"
              (stringp (cadr args))
              (stringp (caddr args)))
         (let ((service (car args))
-              (old-owner (cadr args))
-              (new-owner (caddr args)))
+              (old-owner (cadr args)))
           ;; Check whether SERVICE is a known name.
           (when (not (string-match "^:" service))
             (maphash
diff --git a/lisp/net/network-stream.el b/lisp/net/network-stream.el
index 7a3d47ef1d1..81d05eabc5a 100644
--- a/lisp/net/network-stream.el
+++ b/lisp/net/network-stream.el
@@ -125,9 +125,8 @@ values:
   certificate.  This parameter will only be used when doing TLS
   or STARTTLS connections.
 
-If :use-starttls-if-possible is non-nil, do opportunistic
-STARTTLS upgrades even if Emacs doesn't have built-in TLS
-functionality.
+:use-starttls-if-possible is a boolean that says to do opportunistic
+STARTTLS upgrades even if Emacs doesn't have built-in TLS functionality.
 
 :nowait is a boolean that says the connection should be made
   asynchronously, if possible."
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 9d7e8664542..1898b3d074f 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -361,6 +361,14 @@ of a line.  The string is passed as the first argument to
   :type 'string
   :group 'rcirc)
 
+(defcustom rcirc-kill-channel-buffers nil
+  "When non-nil, kill channel buffers when the server buffer is killed.
+Only the channel buffers associated with the server in question
+will be killed."
+  :version "24.2"
+  :type 'boolean
+  :group 'rcirc)
+
 (defvar rcirc-nick nil)
 
 (defvar rcirc-prompt-start-marker nil)
@@ -471,7 +479,8 @@ If ARG is non-nil, instead prompt for connection parameters."
                              rcirc-default-full-name))
               (channels (plist-get (cdr c) :channels))
               (password (plist-get (cdr c) :password))
-              (encryption (plist-get (cdr c) :encryption)))
+              (encryption (plist-get (cdr c) :encryption))
+              contact)
           (when server
             (let (connected)
               (dolist (p (rcirc-process-list))
@@ -483,10 +492,11 @@ If ARG is non-nil, instead prompt for connection parameters."
                                      full-name channels password encryption)
                     (quit (message "Quit connecting to %s" server)))
                 (with-current-buffer (process-buffer connected)
-                  (setq connected-servers
-                        (cons (process-contact (get-buffer-process
-                                                (current-buffer)) :host)
-                              connected-servers))))))))
+                  (setq contact (process-contact
+                                 (get-buffer-process (current-buffer)) :host))
+                  (setq connected-servers
+                        (cons (if (stringp contact) contact server)
+                              connected-servers))))))))
       (when connected-servers
         (message "Already connected to %s"
                  (if (cdr connected-servers)
@@ -1088,12 +1098,20 @@ Logfiles are kept in `rcirc-log-directory'."
   :group 'rcirc)
 
 (defun rcirc-kill-buffer-hook ()
-  "Part the channel when killing an rcirc buffer."
+  "Part the channel when killing an rcirc buffer.
+
+If `rcirc-kill-channel-buffers' is non-nil and the killed buffer
+is a server buffer, kills all of the channel buffers associated
+with it."
   (when (eq major-mode 'rcirc-mode)
     (when (and rcirc-log-flag
                rcirc-log-directory)
       (rcirc-log-write))
-    (rcirc-clean-up-buffer "Killed buffer")))
+    (rcirc-clean-up-buffer "Killed buffer")
+    (when (and rcirc-buffer-alist ;; it's a server buffer
+               rcirc-kill-channel-buffers)
+      (dolist (channel rcirc-buffer-alist)
+        (kill-buffer (cdr channel))))))
 
 (defun rcirc-change-major-mode-hook ()
   "Part the channel when changing the major-mode."
@@ -2165,17 +2183,13 @@ CHANNELS is a comma- or space-separated string of channel names."
   (let ((channel (if (> (length channel) 0) channel target)))
     (rcirc-send-string process (concat "PART " channel " :" rcirc-id-string))))
 
-(defun-rcirc-command quit (reason all)
-  "Send a quit message to server with REASON.
-When called with prefix, quit all servers."
-  (interactive "sQuit reason: \nP")
-  (dolist (p (if all
-                 (rcirc-process-list)
-               (list process)))
-    (rcirc-send-string p (concat "QUIT :"
-                                 (if (not (zerop (length reason)))
-                                     reason
-                                   rcirc-id-string)))))
+(defun-rcirc-command quit (reason)
+  "Send a quit message to server with REASON."
+  (interactive "sQuit reason: ")
+  (rcirc-send-string process (concat "QUIT :"
+                                     (if (not (zerop (length reason)))
+                                         reason
+                                       rcirc-id-string))))
 
 (defun-rcirc-command nick (nick)
   "Change nick to NICK."
diff --git a/lisp/net/tls.el b/lisp/net/tls.el
index d232095444b..75d178e3225 100644
--- a/lisp/net/tls.el
+++ b/lisp/net/tls.el
@@ -231,8 +231,7 @@ Fourth arg PORT is an integer specifying a port to connect to."
                  ?h host
                  ?p (if (integerp port)
                         (int-to-string port)
-                      port))))
-              response)
+                      port)))))
           (message "Opening TLS connection with `%s'..." formatted-cmd)
           (setq process (start-process
                          name buffer shell-file-name shell-command-switch
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 5b4ea1e6f17..95848ac34ea 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -3133,11 +3133,12 @@ beginning of local filename are not substituted."
 (defun tramp-action-password (proc vec)
   "Query the user for a password."
   (with-current-buffer (process-buffer proc)
-    (tramp-check-for-regexp proc tramp-password-prompt-regexp)
-    (tramp-message vec 3 "Sending %s" (match-string 1))
-    (tramp-enter-password proc)
-    ;; Hide password prompt.
-    (narrow-to-region (point-max) (point-max))))
+    (let ((enable-recursive-minibuffers t))
+      (tramp-check-for-regexp proc tramp-password-prompt-regexp)
+      (tramp-message vec 3 "Sending %s" (match-string 1))
+      (tramp-enter-password proc)
+      ;; Hide password prompt.
+      (narrow-to-region (point-max) (point-max)))))
 
 (defun tramp-action-succeed (proc vec)
   "Signal success in finding shell prompt."
diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index 37a76e0309c..0862427c3ba 100644
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -269,6 +269,19 @@ makes the comment easier to read.  Default is 1.  nil means 0."
   :type '(choice string integer (const nil))
   :group 'comment)
 
+(defcustom comment-inline-offset 1
+  "Inline comments have to be preceded by at least this many spaces.
+This is useful when style-conventions require a certain minimal offset.
+Python's PEP8 for example recommends two spaces, so you could do:
+
+\(add-hook 'python-mode-hook
+   (lambda () (set (make-local-variable 'comment-inline-offset) 2)))
+
+See `comment-padding' for whole-line comments."
+  :version "24.2"
+  :type 'integer
+  :group 'comment)
+
 ;;;###autoload
 (defcustom comment-multi-line nil
   "Non-nil means `comment-indent-new-line' continues comments.
@@ -587,7 +600,7 @@ Point is expected to be at the start of the comment."
                    (save-excursion (end-of-line) (current-column)))))
         (other nil)
         (min (save-excursion (skip-chars-backward " \t")
-                             (if (bolp) 0 (1+ (current-column))))))
+                             (if (bolp) 0 (+ comment-inline-offset (current-column))))))
     ;; Fix up the range.
     (if (< max min) (setq max min))
     ;; Don't move past the fill column.
@@ -687,7 +700,8 @@ If CONTINUE is non-nil, use the `comment-continue' markers if any."
           (save-excursion
             (skip-chars-backward " \t")
             (unless (bolp)
-              (setq indent (max indent (1+ (current-column))))))
+              (setq indent (max indent
+                                (+ (current-column) comment-inline-offset)))))
           ;; If that's different from comment's current position, change it.
           (unless (= (current-column) indent)
             (delete-region (point) (progn (skip-chars-backward " \t") (point)))
diff --git a/lisp/nxml/nxml-mode.el b/lisp/nxml/nxml-mode.el
index f9122e7245e..5adafc3845c 100644
--- a/lisp/nxml/nxml-mode.el
+++ b/lisp/nxml/nxml-mode.el
@@ -1236,7 +1236,7 @@ on the line, reindent the line."
     (unless arg
       (if nxml-slash-auto-complete-flag
           (if end-tag-p
-              (condition-case err
+              (condition-case nil
                   (let ((start-tag-end
                          (nxml-scan-element-backward (1- slash-pos) t)))
                     (when start-tag-end
@@ -1434,7 +1434,7 @@ its line.  Otherwise return nil."
                  (nxml-token-after)
                  (= xmltok-start bol))
                (eq xmltok-type 'data))
-           (condition-case err
+           (condition-case nil
                (nxml-scan-element-backward
                 (point)
                 nil
@@ -1559,8 +1559,7 @@ This expects the xmltok-* variables to be set up as by `xmltok-forward'."
         (off 0))
     (if value-boundary
         ;; inside an attribute value
-        (let ((value-start (car value-boundary))
-              (value-end (cdr value-boundary)))
+        (let ((value-start (car value-boundary)))
           (goto-char pos)
           (forward-line -1)
           (if (< (point) value-start)
@@ -1753,7 +1752,7 @@ single name.  A character reference contains a character number."
          xmltok-name-end)
         (t end)))
 
-(defun nxml-scan-backward-within (end)
+(defun nxml-scan-backward-within (_end)
   (setq xmltok-start
         (+ xmltok-start
            (nxml-start-delimiter-length xmltok-type)))
@@ -2263,7 +2262,7 @@ ENDP is t in the former case, nil in the latter."
                  'nxml-in-mixed-content-hook))
            nil)
           ;; See if the matching tag does not start or end a line.
-          ((condition-case err
+          ((condition-case nil
                (progn
                  (setq matching-tag-pos
                        (xmltok-save
@@ -2401,7 +2400,7 @@ Repeating \\[nxml-dynamic-markup-word] immediately after successful
 \\[nxml-dynamic-markup-word] removes the previously inserted markup
 and attempts to find another possible way to do the markup."
   (interactive "*")
-  (let (search-start-pos done)
+  (let (search-start-pos)
     (if (and (integerp nxml-dynamic-markup-prev-pos)
              (= nxml-dynamic-markup-prev-pos (point))
              (eq last-command this-command)
diff --git a/lisp/mail/mailpost.el b/lisp/obsolete/mailpost.el
index 7c4bea830d8..158523e8ef2 100644
--- a/lisp/mail/mailpost.el
+++ b/lisp/obsolete/mailpost.el
@@ -9,6 +9,7 @@
 ;; Maintainer: FSF
 ;; Created: 13 Jan 1986
 ;; Keywords: mail
+;; Obsolete-since: 24.2
 
 ;;; Commentary:
 
diff --git a/lisp/mouse-sel.el b/lisp/obsolete/mouse-sel.el
index 6323ef03696..45396d30ea5 100644
--- a/lisp/mouse-sel.el
+++ b/lisp/obsolete/mouse-sel.el
@@ -4,6 +4,7 @@
 
 ;; Author: Mike Williams <mdub@bigfoot.com>
 ;; Keywords: mouse
+;; Obsolete-since: 24.2
 
 ;; This file is part of GNU Emacs.
 
@@ -262,6 +263,8 @@ kill ring; mouse-1 or mouse-3 kills it."
               interprogram-paste-function
               mouse-sel-original-interprogram-paste-function))))
 
+(make-obsolete 'mouse-sel-mode "use the normal mouse modes" "24.2")
+
 ;;=== Internal Variables/Constants ========================================
 
 (defvar mouse-sel-primary-thing nil
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 618d5753a46..86f493a0a5b 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,49 @@
+2012-04-14  Bastien Guerry  <bzg@gnu.org>
+
+        * org.el (org-point-at-end-of-empty-headline): Only try to match
+        `org-todo-line-regexp' when the value is non-nil, e.g. in non-org
+        modes.
+        (org-fontify-meta-lines-and-blocks-1): Prevent errors when trying
+        to fontify beyond (point-max).
+
+        * org-clock.el (org-clock-task-overrun-text)
+        (org-task-overrun, org-clock-get-clock-string)
+        (org-clock-update-mode-line)
+        (org-clock-notify-once-if-expired): Rename `org-task-overrun'
+        and `org-task-overrun-text' to `org-clock-task-overrun' and
+        `org-clock-task-overrun-text' respectively.
+        (org-task-overrun-text): New alias.
+
+        * org-table.el (org-table-eval-formula): Fix bug about handling
+        remote references as durations.
+        (org-table-get-range): Fix bug: make sure references to $0 are
+        correctly handled.
+
+        * org-pcomplete.el (pcomplete/org-mode/file-option):
+        Fix bug in `pcomplete/org-mode/file-option'.
+        (org-thing-at-point): Also match line options like LATEX_CLASS
+        when pcompleting from LATEX_.
+
+        * org-agenda.el (org-agenda-filter-make-matcher)
+        (org-agenda-filter-apply): Allow filtering entries out by
+        category.  Using `C-u <' from the agenda view will redisplay
+        the agenda without entries from categories of the current line.
+
+2012-04-14  Eric Schulte  <eric.schulte@gmx.com>
+
+        * ob-C.el (org-babel-C-ensure-main-wrap):
+        Add an explicit return to automatically generated main methods.
+
+2012-04-14  Matt Lundin  <mdl@imapmail.org>
+
+        * org.el (org-after-todo-state-change-hook):
+        Fix docstring to reflect name change of state to `org-state'.
+
+2012-04-14  Mike Sperber  <sperber@deinprogramm.de>  (tiny change)
+
+        * org-footnote.el (org-footnote-normalize):
+        Correctly pass keyword arguments to `org-export-preprocess-string'.
+
 2012-04-03  Bastien Guerry  <bzg@gnu.org>
 
         * org.el (org-todo): Fix regression: rename `state' to
diff --git a/lisp/org/ob-C.el b/lisp/org/ob-C.el
index 5f6c1cb1dd1..583510ac618 100644
--- a/lisp/org/ob-C.el
+++ b/lisp/org/ob-C.el
@@ -152,7 +152,7 @@ it's header arguments."
   "Wrap body in a \"main\" function call if none exists."
   (if (string-match "^[ \t]*[intvod]+[ \t\n\r]*main[ \t]*(.*)" body)
       body
-    (format "int main() {\n%s\n}\n" body)))
+    (format "int main() {\n%s\nreturn(0);\n}\n" body)))
 
 (defun org-babel-prep-session:C (session params)
   "This function does nothing as C is a compiled language with no
diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index 324ddd27f9a..3bb0fc84897 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -6365,7 +6365,9 @@ to switch to narrowing."
     (dolist (x (delete-dups
                 (append (get 'org-agenda-category-filter
                              :preset-filter) org-agenda-category-filter)))
-      (setq f1 (list 'equal (substring x 1) 'cat))
+      (if (equal "-" (substring x 0 1))
+          (setq f1 (list 'not (list 'equal (substring x 1) 'cat)))
+        (setq f1 (list 'equal (substring x 1) 'cat)))
       (push f1 f))
     (cons 'and (nreverse f))))
 
@@ -6396,9 +6398,13 @@ If the line does not have an effort defined, return nil."
   (let (tags cat)
     (if (eq type 'tag)
         (setq org-agenda-tag-filter filter)
-      (setq org-agenda-category-filter filter
-            org-agenda-filtered-by-category t))
+      (setq org-agenda-category-filter filter))
     (setq org-agenda-filter-form (org-agenda-filter-make-matcher))
+    (if (and (eq type 'category)
+             (not (equal (substring (car filter) 0 1) "-")))
+        ;; Only set `org-agenda-filtered-by-category' to t
+        ;; when a unique category is used as the filter
+        (setq org-agenda-filtered-by-category t))
     (org-agenda-set-mode-name)
     (save-excursion
       (goto-char (point-min))
@@ -6412,7 +6418,7 @@ If the line does not have an effort defined, return nil."
               (beginning-of-line 2))
           (beginning-of-line 2))))
     (if (get-char-property (point) 'invisible)
-        (org-agenda-previous-line))))
+        (ignore-errors (org-agenda-previous-line)))))
 
 (defun org-agenda-filter-hide-line (type)
   (let (ov)
diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el
index 7105bfe13dc..434f6a1d5f6 100644
--- a/lisp/org/org-clock.el
+++ b/lisp/org/org-clock.el
@@ -219,7 +219,8 @@ auto     Automatically, either `all', or `repeat' for repeating tasks"
           (const :tag "All task time" all)
           (const :tag "Automatically, `all' or since `repeat'" auto)))
 
-(defcustom org-task-overrun-text nil
+(defvaralias 'org-task-overrun-text 'org-clock-task-overrun-text)
+(defcustom org-clock-task-overrun-text nil
   "The extra modeline text that should indicate that the clock is overrun.
 The can be nil to indicate that instead of adding text, the clock time
 should get a different face (`org-mode-line-clock-overrun').
@@ -495,7 +496,7 @@ pointing to it."
         (insert (format "[%c] %-15s %s\n" i cat task))
         (cons i marker)))))
 
-(defvar org-task-overrun nil
+(defvar org-clock-task-overrun nil
   "Internal flag indicating if the clock has overrun the planned time.")
 (defvar org-clock-update-period 60
   "Number of seconds between mode line clock string updates.")
@@ -516,7 +517,7 @@ If not, show simply the clocked time like 01:50."
                (work-done-str
                 (org-propertize
                  (format org-time-clocksum-format h m)
-                 'face (if (and org-task-overrun (not org-task-overrun-text))
+                 'face (if (and org-clock-task-overrun (not org-clock-task-overrun-text))
                            'org-mode-line-clock-overrun 'org-mode-line-clock)))
                (effort-str (format org-time-clocksum-format effort-h effort-m))
                (clockstr (org-propertize
@@ -532,7 +533,7 @@ If not, show simply the clocked time like 01:50."
 (defun org-clock-update-mode-line ()
   (if org-clock-effort
       (org-clock-notify-once-if-expired)
-    (setq org-task-overrun nil))
+    (setq org-clock-task-overrun nil))
   (setq org-mode-line-string
         (org-propertize
          (let ((clock-string (org-clock-get-clock-string))
@@ -546,10 +547,10 @@ If not, show simply the clocked time like 01:50."
          'local-map org-clock-mode-line-map
          'mouse-face (if (featurep 'xemacs) 'highlight 'mode-line-highlight)
          ))
-  (if (and org-task-overrun org-task-overrun-text)
+  (if (and org-clock-task-overrun org-clock-task-overrun-text)
       (setq org-mode-line-string
             (concat (org-propertize
-                     org-task-overrun-text
+                     org-clock-task-overrun-text
                      'face 'org-mode-line-clock-overrun) org-mode-line-string)))
   (force-mode-line-update))
 
@@ -606,7 +607,7 @@ Notification is shown only once."
   (when (org-clocking-p)
     (let ((effort-in-minutes (org-duration-string-to-minutes org-clock-effort))
           (clocked-time (org-clock-get-clocked-time)))
-      (if (setq org-task-overrun
+      (if (setq org-clock-task-overrun
                 (if (or (null effort-in-minutes) (zerop effort-in-minutes))
                     nil
                   (>= clocked-time effort-in-minutes)))
diff --git a/lisp/org/org-footnote.el b/lisp/org/org-footnote.el
index 34fc31f39d6..9319e0813c0 100644
--- a/lisp/org/org-footnote.el
+++ b/lisp/org/org-footnote.el
@@ -704,7 +704,7 @@ Additional note on `org-footnote-insert-pos-for-preprocessor':
                                      (org-combine-plists
                                       export-props
                                       '(:todo-keywords t :tags t :priority t))))
-                                (org-export-preprocess-string def parameters))
+                                (apply #'org-export-preprocess-string def parameters))
                             def)
                           ;; Reference beginning position is a marker
                           ;; to preserve it during further buffer
diff --git a/lisp/org/org-pcomplete.el b/lisp/org/org-pcomplete.el
index 0ca8777878c..5950d8e26da 100644
--- a/lisp/org/org-pcomplete.el
+++ b/lisp/org/org-pcomplete.el
@@ -69,7 +69,7 @@ The return value is a string naming the thing at point."
         (re-search-backward "^[ \t]*#\\+\\([A-Z_]+\\):.*"
                             (line-beginning-position) t))
       (cons "file-option" (match-string-no-properties 1)))
-     ((string-match "\\`[ \t]*#\\+[a-zA-Z]*\\'" line-to-here)
+     ((string-match "\\`[ \t]*#\\+[a-zA-Z_]*\\'" line-to-here)
       (cons "file-option" nil))
      ((equal (char-before beg) ?\[)
       (cons "link" nil))
@@ -144,7 +144,7 @@ When completing for #+STARTUP, for example, this function returns
                               (if (string-match "^#\\+\\([A-Z_]+:?\\)" x)
                                   (match-string 1 x)))
                             (org-split-string (org-get-current-options) "\n"))
-                    org-additional-option-like-keywords)))))
+                    (copy-sequence org-additional-option-like-keywords))))))
    (substring pcomplete-stub 2)))
 
 (defvar org-startup-options)
diff --git a/lisp/org/org-special-blocks.el b/lisp/org/org-special-blocks.el
index 5bf8362357f..43b37c64016 100644
--- a/lisp/org/org-special-blocks.el
+++ b/lisp/org/org-special-blocks.el
@@ -80,17 +80,17 @@ seen.  This is run after a few special cases are taken care of."
 (add-hook 'org-export-latex-after-blockquotes-hook
           'org-special-blocks-convert-latex-special-cookies)
 
-(defvar org-special-blocks-line)
+(defvar line)
 (defun org-special-blocks-convert-html-special-cookies ()
   "Converts the special cookies into div blocks."
-  ;; Uses the dynamically-bound variable `org-special-blocks-line'.
-  (when (string-match "^ORG-\\(.*\\)-\\(START\\|END\\)$" org-special-blocks-line)
+  ;; Uses the dynamically-bound variable `line'.
+  (when (string-match "^ORG-\\(.*\\)-\\(START\\|END\\)$" line)
     (message "%s" (match-string 1))
-    (when (equal (match-string 2 org-special-blocks-line) "START")
+    (when (equal (match-string 2 line) "START")
       (org-close-par-maybe)
-      (insert "\n<div class=\"" (match-string 1 org-special-blocks-line) "\">")
+      (insert "\n<div class=\"" (match-string 1 line) "\">")
       (org-open-par))
-    (when (equal (match-string 2 org-special-blocks-line) "END")
+    (when (equal (match-string 2 line) "END")
       (org-close-par-maybe)
       (insert "\n</div>")
       (org-open-par))
diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el
index ae12cee2abe..08981b57e49 100644
--- a/lisp/org/org-table.el
+++ b/lisp/org/org-table.el
@@ -2526,8 +2526,13 @@ not overwrite the stored one."
                 (replace-match
                  (save-match-data
                    (org-table-make-reference
-                    (org-table-get-remote-range
-                     (match-string 1 form) (match-string 2 form))
+                    (let ((rmtrng (org-table-get-remote-range
+                                   (match-string 1 form) (match-string 2 form))))
+                      (if duration
+                          (if (listp rmtrng)
+                              (mapcar (lambda(x) (org-table-time-string-to-seconds x)) rmtrng)
+                            (org-table-time-string-to-seconds rmtrng))
+                        rmtrng))
                     keep-empty numbers lispp))
                  t t form)))
         ;; Insert complex ranges
@@ -2663,8 +2668,8 @@ in the buffer and column1 and column2 are table column numbers."
 ;      (setq r2 (or r2 r1) c2 (or c2 c1))
       (if (not r1) (setq r1 thisline))
       (if (not r2) (setq r2 thisline))
-      (if (not c1) (setq c1 col))
-      (if (not c2) (setq c2 col))
+      (if (or (not c1) (= 0 c1)) (setq c1 col))
+      (if (or (not c2) (= 0 c2)) (setq c2 col))
       (if (and (not corners-only)
                (or (not rangep) (and (= r1 r2) (= c1 c2))))
           ;; just one field
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 0f13223d0c1..c2cc2354439 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Bastien Guerry <bzg at gnu dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 7.8.08
+;; Version: 7.8.09
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -206,7 +206,7 @@ identifier."
 
 ;;; Version
 
-(defconst org-version "7.8.08"
+(defconst org-version "7.8.09"
   "The version number of the file org.el.")
 
 ;;;###autoload
@@ -2225,7 +2225,7 @@ property and include the word \"recursive\" into the value."
 (defcustom org-after-todo-state-change-hook nil
   "Hook which is run after the state of a TODO item was changed.
 The new state (a string with a TODO keyword, or nil) is available in the
-Lisp variable `state'."
+Lisp variable `org-state'."
   :group 'org-todo
   :type 'hook)
 
@@ -5427,7 +5427,8 @@ will be prompted for."
             (when (re-search-forward
                    (concat "^[ \t]*#\\+end" (match-string 4) "\\>.*")
                    nil t)  ;; on purpose, we look further than LIMIT
-              (setq end (match-end 0) end1 (1- (match-beginning 0)))
+              (setq end (min (point-max) (match-end 0))
+                    end1 (min (point-max) (1- (match-beginning 0))))
               (setq block-end (match-beginning 0))
               (when quoting
                 (remove-text-properties beg end
@@ -5455,11 +5456,12 @@ will be prompted for."
                                      '(face org-block))) ; end of source block
                ((not org-fontify-quote-and-verse-blocks))
                ((string= block-type "quote")
-                (add-text-properties beg1 (1+ end1) '(face org-quote)))
+                (add-text-properties beg1 (min (point-max) (1+ end1)) '(face org-quote)))
                ((string= block-type "verse")
-                (add-text-properties beg1 (1+ end1) '(face org-verse))))
+                (add-text-properties beg1 (min (point-max) (1+ end1)) '(face org-verse))))
               (add-text-properties beg beg1 '(face org-block-begin-line))
-              (add-text-properties (1+ end) (1+ end1) '(face org-block-end-line))
+              (add-text-properties (min (point-max) (1+ end)) (min (point-max) (1+ end1))
+                                   '(face org-block-end-line))
               t))
            ((member dc1 '("title:" "author:" "email:" "date:"))
             (add-text-properties
@@ -5475,7 +5477,7 @@ will be prompted for."
            ((not (member (char-after beg) '(?\  ?\t)))
             ;; just any other in-buffer setting, but not indented
             (add-text-properties
-             beg (1+ (match-end 0))
+             beg (match-end 0)
              '(font-lock-fontified t face org-meta-line))
             t)
            ((or (member dc1 '("begin:" "end:" "caption:" "label:"
@@ -13422,8 +13424,7 @@ With prefix ARG, realign all tags in headings in the current buffer."
         ;; Get a new set of tags from the user
         (save-excursion
           (setq table (append org-tag-persistent-alist
-                              org-tag-alist
-                              (org-get-buffer-tags)
+                              (or org-tag-alist (org-get-buffer-tags))
                               (and
                                org-complete-tags-always-offer-all-agenda-tags
                                (org-global-tags-completion-table
@@ -13725,11 +13726,9 @@ Returns the new tags string, or nil to not change the current settings."
                   (condition-case nil
                       (setq tg (org-icompleting-read
                                 "Tag: "
-                                (delete-dups
-                                 (append (or buffer-tags
-                                             (with-current-buffer buf
-                                               (mapcar 'car (org-get-buffer-tags))))
-                                         (mapcar 'car table)))))
+                                (or buffer-tags
+                                    (with-current-buffer buf
+                                      (org-get-buffer-tags)))))
                     (quit (setq tg "")))
                   (when (string-match "\\S-" tg)
                     (add-to-list 'buffer-tags (list tg))
@@ -20775,11 +20774,12 @@ This version does not only check the character property, but also
 If the heading only contains a TODO keyword, it is still still considered
 empty."
   (and (looking-at "[ \t]*$")
-       (save-excursion
-         (beginning-of-line 1)
-         (let ((case-fold-search nil))
-           (looking-at org-todo-line-regexp)))
-       (string= (match-string 3) "")))
+       (when org-todo-line-regexp
+         (save-excursion
+           (beginning-of-line 1)
+           (let ((case-fold-search nil))
+             (looking-at org-todo-line-regexp)
+             (string= (match-string 3) ""))))))
 
 (defun org-at-heading-or-item-p ()
   (or (org-at-heading-p) (org-at-item-p)))
diff --git a/lisp/pcmpl-rpm.el b/lisp/pcmpl-rpm.el
index 8019b876562..f28469d791b 100644
--- a/lisp/pcmpl-rpm.el
+++ b/lisp/pcmpl-rpm.el
@@ -1,6 +1,6 @@
 ;;; pcmpl-rpm.el --- functions for dealing with rpm completions
 
-;; Copyright (C) 1999-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012 Free Software Foundation, Inc.
 
 ;; Package: pcomplete
 
@@ -29,6 +29,13 @@
 
 ;; Functions:
 
+;; FIXME rpm -qa can be slow, so:
+;; Adding --nodigest --nosignature is MUCH faster.
+;; (Probably need to test --help for those options though.)
+;; Consider caching the result (cf woman).
+;; Consider printing an explanatory message before running -qa.
+;;
+;; Seems pointless for this to be a defsubst.
 (defsubst pcmpl-rpm-packages ()
   (split-string (pcomplete-process-result "rpm" "-q" "-a")))
 
@@ -92,6 +99,7 @@
                '("--changelog"
                  "--dbpath"
                  "--dump"
+                 "--file"
                  "--ftpport"            ;nyi for the next four
                  "--ftpproxy"
                  "--httpport"
@@ -112,6 +120,8 @@
                 (pcomplete-here*))
                ((pcomplete-test "--rcfile")
                 (pcomplete-here* (pcomplete-entries)))
+               ((pcomplete-test "--file")
+                (pcomplete-here* (pcomplete-entries)))
                ((pcomplete-test "--root")
                 (pcomplete-here* (pcomplete-dirs)))
                ((pcomplete-test "--scripts")
@@ -129,7 +139,9 @@
               (pcomplete-opt "af.p(pcmpl-rpm-files)ilsdcvR")
             (if (pcomplete-test "-[^-]*p" 'first 1)
                 (pcomplete-here (pcmpl-rpm-files))
-              (pcomplete-here (pcmpl-rpm-packages))))))
+              (if (pcomplete-test "-[^-]*f" 'first 1)
+                  (pcomplete-here* (pcomplete-entries))
+                (pcomplete-here (pcmpl-rpm-packages)))))))
        ((pcomplete-test "--pipe")
         (pcomplete-here* (funcall pcomplete-command-completion-function)))
        ((pcomplete-test "--rmsource")
diff --git a/lisp/play/cookie1.el b/lisp/play/cookie1.el
index 06bd962d925..cbf29a26a71 100644
--- a/lisp/play/cookie1.el
+++ b/lisp/play/cookie1.el
@@ -96,6 +96,8 @@ of load, ENDMSG at the end."
   "Reads in the PHRASE-FILE, returns it as a vector of strings.
 Emit STARTMSG and ENDMSG before and after.  Caches the result; second
 and subsequent calls on the same file won't go to disk."
+  (or (file-readable-p phrase-file)
+      (error "Cannot read file `%s'" phrase-file))
   (let ((sym (intern-soft phrase-file cookie-cache)))
     (and sym (not (equal (symbol-function sym)
                          (nth 5 (file-attributes phrase-file))))
diff --git a/lisp/play/yow.el b/lisp/play/yow.el
index fa32fdf8272..cb02a839cde 100644
--- a/lisp/play/yow.el
+++ b/lisp/play/yow.el
@@ -1,6 +1,6 @@
 ;;; yow.el --- quote random zippyisms
 
-;; Copyright (C) 1993-1995, 2000-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1993-1995, 2000-2012 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Author: Richard Mlynarik
@@ -24,10 +24,6 @@
 ;;; Commentary:
 
 ;; Important pinheadery for GNU Emacs.
-;;
-;; See cookie1.el for implementation.  Note --- the `n' argument of yow
-;; from the 18.xx implementation is no longer; we only support *random*
-;; random access now.
 
 ;;; Code:
 
@@ -38,7 +34,7 @@
   :prefix "yow-"
   :group 'games)
 
-(defcustom yow-file (concat data-directory "yow.lines")
+(defcustom yow-file (expand-file-name "yow.lines" data-directory)
    "File containing pertinent pinhead phrases."
   :type 'file
   :group 'yow)
diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el
index 55ab6c9981c..9cf20ccb516 100644
--- a/lisp/progmodes/cc-cmds.el
+++ b/lisp/progmodes/cc-cmds.el
@@ -679,7 +679,7 @@ settings of `c-cleanup-list' are done."
         ;; We want to inhibit blinking the paren since this would be
         ;; most disruptive.  We'll blink it ourselves later on.
         (old-blink-paren blink-paren-function)
-        blink-paren-function)
+        blink-paren-function case-fold-search)
 
     (c-save-buffer-state ()
       (setq safepos (c-safe-position (point) (c-parse-state))
@@ -1086,7 +1086,7 @@ numeric argument is supplied, or the point is inside a literal."
 
   (interactive "*P")
   (let ((c-echo-syntactic-information-p nil)
-        final-pos close-paren-inserted found-delim)
+        final-pos close-paren-inserted found-delim case-fold-search)
 
     (self-insert-command (prefix-numeric-value arg))
     (setq final-pos (point))
@@ -1172,7 +1172,8 @@ newline cleanups are done if appropriate; see the variable `c-cleanup-list'."
   (interactive "*P")
   (let ((literal (c-save-buffer-state () (c-in-literal)))
         ;; shut this up
-        (c-echo-syntactic-information-p nil))
+        (c-echo-syntactic-information-p nil)
+        case-fold-search)
     (self-insert-command (prefix-numeric-value arg))
 
     (if (and (not arg) (not literal))
@@ -1585,7 +1586,7 @@ defun."
                                         ; structure with other users of c-state-cache.
        (orig-point-min (point-min)) (orig-point-max (point-max))
        lim                          ; Position of { which has been widened to.
-       where pos)
+       where pos case-fold-search)
 
     (save-restriction
       (if (eq c-defun-tactic 'go-outward)
@@ -1709,7 +1710,8 @@ the open-parenthesis that starts a defun; see `beginning-of-defun'."
                                   ; structure with other users of c-state-cache.
        (orig-point-min (point-min)) (orig-point-max (point-max))
        lim
-       where pos)
+       where pos case-fold-search)
+
     (save-restriction
       (if (eq c-defun-tactic 'go-outward)
           (setq lim (c-widen-to-enclosing-decl-scope ; e.g. class, namespace
@@ -1769,8 +1771,8 @@ with a brace block."
   (interactive)
   (c-save-buffer-state
       (beginning-of-defun-function end-of-defun-function
-       where pos name-end)
-
+       where pos name-end case-fold-search)
+ 
     (save-restriction
       (widen)
       (save-excursion
@@ -1969,7 +1971,7 @@ As opposed to \\[c-beginning-of-defun] and \\[c-end-of-defun], this
 function does not require the declaration to contain a brace block."
   (interactive)
 
-  (let (decl-limits)
+  (let (decl-limits case-fold-search)
     (c-save-buffer-state nil
       ;; We try to be line oriented, unless there are several
       ;; declarations on the same line.
@@ -2001,11 +2003,12 @@ function does not require the declaration to contain a brace block."
 (defun c-cpp-define-name ()
   "Return the name of the current CPP macro, or NIL if we're not in one."
   (interactive)
-  (save-excursion
-    (and c-opt-cpp-macro-define-start
-         (c-beginning-of-macro)
-         (looking-at c-opt-cpp-macro-define-start)
-         (match-string-no-properties 1))))
+  (let (case-fold-search)
+    (save-excursion
+      (and c-opt-cpp-macro-define-start
+           (c-beginning-of-macro)
+           (looking-at c-opt-cpp-macro-define-start)
+           (match-string-no-properties 1)))))
 
 
 ;; Movement by statements.
@@ -2888,7 +2891,8 @@ See `c-indent-comment-alist' for a description."
                         (eq (match-end 0) eot))
                    'cpp-end-block)
                   (t
-                   'other))))
+                   'other)))
+           case-fold-search)
       (if (and (memq line-type '(anchored-comment empty-line))
                c-indent-comments-syntactically-p)
           (let ((c-syntactic-context (c-guess-basic-syntax)))
@@ -3024,7 +3028,7 @@ are treated as conditional clause limits.  Normally they are ignored."
   (let* ((forward (> count 0))
          (increment (if forward -1 1))
          (search-function (if forward 're-search-forward 're-search-backward))
-         new)
+         new case-fold-search)
     (unless (integerp target-depth)
       (setq target-depth (if target-depth -1 0)))
     (save-excursion
@@ -3226,7 +3230,7 @@ balanced expression is found."
 In the macro case this also has the effect of realigning any line
 continuation backslashes, unless `c-auto-align-backslashes' is nil."
   (interactive "*")
-  (let ((here (point-marker)) decl-limits)
+  (let ((here (point-marker)) decl-limits case-fold-search)
     (unwind-protect
         (progn
           (c-save-buffer-state nil
@@ -4638,7 +4642,8 @@ inside a preprocessor directive."
 
   (interactive "*")
   (let* (c-lit-limits c-lit-type
-         (c-macro-start c-macro-start))
+         (c-macro-start c-macro-start)
+         case-fold-search)
 
     (c-save-buffer-state ()
       (setq c-lit-limits (c-literal-limits nil nil t)
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index cf38001c123..65e28c11e21 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -5382,7 +5382,7 @@ comment at the start of cc-engine.el for more info."
           new-beg new-end need-new-beg need-new-end)
       ;; Locate the barrier before the changed region
       (goto-char  (if beg-lit-limits (car beg-lit-limits) beg))
-      (c-syntactic-skip-backward "^;{}" (max (- beg 2048) (point-min)))
+      (c-syntactic-skip-backward "^;{}" (c-determine-limit 512))
       (setq new-beg (point))
 
       ;; Remove the syntax-table properties from each pertinent <...> pair.
@@ -5393,8 +5393,7 @@ comment at the start of cc-engine.el for more info."
 
       ;; Locate the barrier after END.
       (goto-char (if end-lit-limits (cdr end-lit-limits) end))
-      (c-syntactic-re-search-forward "[;{}]"
-                                     (min (+ end 2048) (point-max)) 'end)
+      (c-syntactic-re-search-forward "[;{}]" (c-determine-+ve-limit 512) 'end)
       (setq new-end (point))
 
       ;; Remove syntax-table properties from the remaining pertinent <...>
diff --git a/lisp/progmodes/cc-menus.el b/lisp/progmodes/cc-menus.el
index f57fcbff5ca..a53d65f6307 100644
--- a/lisp/progmodes/cc-menus.el
+++ b/lisp/progmodes/cc-menus.el
@@ -63,6 +63,20 @@ For example:
 
 A sample value might look like: `\\(_P\\|_PROTO\\)'.")
 
+;;                        *Warning for cc-mode developers*
+;;
+;; `cc-imenu-objc-generic-expression' elements depend on
+;; `cc-imenu-c++-generic-expression'. So if you change this
+;; expression, you need to change following variables,
+;; `cc-imenu-objc-generic-expression-*-index',
+;; too. `cc-imenu-objc-function' uses these *-index variables, in
+;; order to know where the each regexp *group \\(foobar\\)* elements
+;; are started.
+;;
+;; *-index variables are initialized during `cc-imenu-objc-generic-expression'
+;; being initialized.
+;;
+
 (defvar cc-imenu-c++-generic-expression
   `(
     ;; Try to match ::operator definitions first. Otherwise `X::operator new ()'
@@ -187,23 +201,8 @@ A sample value might look like: `\\(_P\\|_PROTO\\)'.")
                ")"
                "[.," c-alnum " \t\n\r]*"
                "{"
-               )) 1))
-  "Imenu generic expression for Java mode.  See
-`imenu-generic-expression'.")
-
-;;                        *Warning for cc-mode developers*
-;;
-;; `cc-imenu-objc-generic-expression' elements depend on
-;; `cc-imenu-c++-generic-expression'. So if you change this
-;; expression, you need to change following variables,
-;; `cc-imenu-objc-generic-expression-*-index',
-;; too. `cc-imenu-objc-function' uses these *-index variables, in
-;; order to know where the each regexp *group \\(foobar\\)* elements
-;; are started.
-;;
-;; *-index variables are initialized during `cc-imenu-objc-generic-expression'
-;; being initialized.
-;;
+               )) 1))
+  "Imenu generic expression for Java mode.  See `imenu-generic-expression'.")
 
 ;; Internal variables
 (defvar cc-imenu-objc-generic-expression-noreturn-index nil)
@@ -224,7 +223,7 @@ A sample value might look like: `\\(_P\\|_PROTO\\)'.")
    "\\|"
    ;; > General function name regexp
    ;; Pick a token by  (match-string 3)
-   (car (cdr (nth 2 cc-imenu-c++-generic-expression))) ; -> index += 5
+   (car (cdr (nth 2 cc-imenu-c++-generic-expression))) ; -> index += 6
    (prog2 (setq cc-imenu-objc-generic-expression-general-func-index 3) "")
    ;; > Special case for definitions using phony prototype macros like:
    ;; > `int main _PROTO( (int argc,char *argv[]) )'.
@@ -233,11 +232,11 @@ A sample value might look like: `\\(_P\\|_PROTO\\)'.")
        (concat
         "\\|"
         (car (cdr (nth 3 cc-imenu-c++-generic-expression))) ; -> index += 1
-        (prog2 (setq cc-imenu-objc-generic-expression-objc-base-index 9) "")
+        (prog2 (setq cc-imenu-objc-generic-expression-objc-base-index 10) "")
         )
-     (prog2 (setq cc-imenu-objc-generic-expression-objc-base-index 8) "")
+     (prog2 (setq cc-imenu-objc-generic-expression-objc-base-index 9) "")
      "")                                ; -> index += 0
-   (prog2 (setq cc-imenu-objc-generic-expression-proto-index 8) "")
+   (prog2 (setq cc-imenu-objc-generic-expression-proto-index 9) "")
    ;;
    ;; For Objective-C
    ;; Pick a token by (match-string 8 or 9)
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index 7c018feefbb..ff18f56bbe8 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -1170,10 +1170,10 @@ Note that the style variables are always made local to the buffer."
   ;;
   ;;
   ;;     void myfunc(T* p) {}
-  ;;
+  ;; 
   ;; Type a space in the first blank line, and the fontification of the next
   ;; line was fouled up by context fontification.
-  (let ((new-beg beg) (new-end end) new-region)
+  (let ((new-beg beg) (new-end end) new-region case-fold-search)
     (if c-in-after-change-fontification
         (setq c-in-after-change-fontification nil)
       (save-restriction
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 07393c6954d..ed8eb81932e 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -1356,8 +1356,12 @@ if ARG is omitted or nil."
       (setq flymake-timer
             (run-at-time nil 1 'flymake-on-timer-event (current-buffer)))
 
-      (when flymake-start-syntax-check-on-find-file
-        (flymake-start-syntax-check)))))
+      (when (and flymake-start-syntax-check-on-find-file
+                 ;; Since we write temp files in current dir, there's no point
+                 ;; trying if the directory is read-only (bug#8954).
+                 (file-writable-p (file-name-directory buffer-file-name)))
+        (with-demoted-errors
+          (flymake-start-syntax-check))))))
 
    ;; Turning the mode OFF.
    (t
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index 89450cd2276..1be74ff544b 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -375,9 +375,8 @@ Emacs always switches to the thread which caused the stop."
   :version "23.2"
   :link '(info-link "(gdb)GDB/MI Async Records"))
 
-(defcustom gdb-stopped-hooks nil
-  "This variable holds a list of functions to be called whenever
-GDB stops.
+(defcustom gdb-stopped-functions nil
+  "List of functions called whenever GDB stops.
 
 Each function takes one argument, a parsed MI response, which
 contains fields of corresponding MI *stopped async record:
@@ -818,6 +817,8 @@ detailed description of this mode.
             nil 'local)
   (local-set-key "\C-i" 'completion-at-point)
 
+  (local-set-key [remap comint-delchar-or-maybe-eof] 'gdb-delchar-or-quit)
+
   (setq gdb-first-prompt t)
   (setq gud-running nil)
 
@@ -859,15 +860,8 @@ detailed description of this mode.
 
   (gdb-get-buffer-create 'gdb-inferior-io)
   (gdb-clear-inferior-io)
-  (set-process-filter (get-process "gdb-inferior") 'gdb-inferior-filter)
-  (gdb-input
-   ;; Needs GDB 6.4 onwards
-   (concat "-inferior-tty-set "
-           (or
-            ;; The process can run on a remote host.
-            (process-get (get-process "gdb-inferior") 'remote-tty)
-            (process-tty-name (get-process "gdb-inferior"))))
-   'ignore)
+  (gdb-inferior-io--init-proc (get-process "gdb-inferior"))
+
   (if (eq window-system 'w32)
       (gdb-input "-gdb-set new-console off" 'ignore))
   (gdb-input "-gdb-set height 0" 'ignore)
@@ -905,6 +899,25 @@ detailed description of this mode.
     (setq gdb-non-stop nil)
     (gdb-input "-gdb-set non-stop 0" 'ignore)))
 
+(defun gdb-delchar-or-quit (arg)
+  "Delete ARG characters or send a quit command to GDB.
+Send a quit only if point is at the end of the buffer, there is
+no input, and GDB is waiting for input."
+  (interactive "p")
+  (unless (and (eq (current-buffer) gud-comint-buffer)
+               (eq gud-minor-mode 'gdbmi))
+    (error "Not in a GDB-MI buffer"))
+  (let ((proc (get-buffer-process gud-comint-buffer)))
+    (if (and (eobp) proc (process-live-p proc)
+             (not gud-running)
+             (= (point) (marker-position (process-mark proc))))
+        ;; Sending an EOF does not work with GDB-MI; submit an
+        ;; explicit quit command.
+        (progn
+          (insert "quit")
+          (comint-send-input t t))
+      (delete-char arg))))
+
 (defvar gdb-define-alist nil "Alist of #define directives for GUD tooltips.")
 
 (defun gdb-create-define-alist ()
@@ -929,7 +942,6 @@ detailed description of this mode.
       (push (cons name define) gdb-define-alist))))
 
 (declare-function tooltip-show "tooltip" (text &optional use-echo-area))
-(defvar tooltip-use-echo-area)
 
 (defun gdb-tooltip-print (expr)
   (with-current-buffer (gdb-get-buffer 'gdb-partial-output-buffer)
@@ -937,7 +949,7 @@ detailed description of this mode.
     (if (re-search-forward ".*value=\\(\".*\"\\)" nil t)
         (tooltip-show
          (concat expr " = " (read (match-string 1)))
-         (or gud-tooltip-echo-area tooltip-use-echo-area
+         (or gud-tooltip-echo-area
              (not (display-graphic-p)))))))
 
 ;; If expr is a macro for a function don't print because of possible dangerous
@@ -1056,7 +1068,7 @@ positive, otherwise don't automatically raise it."
                    (if gdb-speedbar-auto-raise "en" "dis"))))
 
 (define-key gud-minor-mode-map "\C-c\C-w" 'gud-watch)
-(define-key global-map (concat gud-key-prefix "\C-w") 'gud-watch)
+(define-key global-map (vconcat gud-key-prefix "\C-w") 'gud-watch)
 
 (declare-function tooltip-identifier-from-point "tooltip" (point))
 
@@ -1510,6 +1522,31 @@ DOC is an optional documentation string."
   (gdb-display-buffer
    (gdb-get-buffer-create 'gdb-inferior-io) t))
 
+(defun gdb-inferior-io--init-proc (proc)
+  ;; Set up inferior I/O.  Needs GDB 6.4 onwards.
+  (set-process-filter proc 'gdb-inferior-filter)
+  (set-process-sentinel proc 'gdb-inferior-io-sentinel)
+  (gdb-input
+   (concat "-inferior-tty-set "
+           ;; The process can run on a remote host.
+           (or (process-get proc 'remote-tty)
+               (process-tty-name proc)))
+   'ignore))
+
+(defun gdb-inferior-io-sentinel (proc str)
+  (when (eq (process-status proc) 'failed)
+    ;; When the debugged process exits, Emacs gets an EIO error on
+    ;; read from the pty, and stops listening to it.  If the gdb
+    ;; process is still running, remove the pty, make a new one, and
+    ;; pass it to gdb.
+    (let ((gdb-proc (get-buffer-process gud-comint-buffer))
+          (io-buffer (process-buffer proc)))
+      (when (and gdb-proc (process-live-p gdb-proc)
+                 (buffer-live-p io-buffer))
+        ;; `comint-exec' deletes the original process as a side effect.
+        (comint-exec io-buffer "gdb-inferior" nil nil nil)
+        (gdb-inferior-io--init-proc (get-buffer-process io-buffer))))))
+
 (defconst gdb-frame-parameters
   '((height . 14) (width . 80)
     (unsplittable . t)
@@ -1746,24 +1783,27 @@ If `gdb-thread-number' is nil, just wrap NAME in asterisks."
   (setq gdb-output-sink 'user)
   (setq gdb-pending-triggers nil))
 
-(defun gdb-update ()
-  "Update buffers showing status of debug session."
+(defun gdb-update (&optional no-proc)
+  "Update buffers showing status of debug session.
+If NO-PROC is non-nil, do not try to contact the GDB process."
   (when gdb-first-prompt
     (gdb-force-mode-line-update
      (propertize "initializing..." 'face font-lock-variable-name-face))
     (gdb-init-1)
     (setq gdb-first-prompt nil))
 
-  (gdb-get-main-selected-frame)
+  (unless no-proc
+    (gdb-get-main-selected-frame))
+
   ;; We may need to update gdb-threads-list so we can use
   (gdb-get-buffer-create 'gdb-threads-buffer)
   ;; gdb-break-list is maintained in breakpoints handler
   (gdb-get-buffer-create 'gdb-breakpoints-buffer)
 
-  (gdb-emit-signal gdb-buf-publisher 'update)
+  (unless no-proc
+    (gdb-emit-signal gdb-buf-publisher 'update))
 
   (gdb-get-changed-registers)
-
   (when (and (boundp 'speedbar-frame) (frame-live-p speedbar-frame))
     (dolist (var gdb-var-list)
       (setcar (nthcdr 5 var) nil))
@@ -2045,7 +2085,7 @@ current thread and update GDB buffers."
       ;; In all-stop this updates gud-running properly as well.
       (gdb-update)
       (setq gdb-first-done-or-error nil))
-    (run-hook-with-args 'gdb-stopped-hooks result)))
+    (run-hook-with-args 'gdb-stopped-functions result)))
 
 ;; Remove the trimmings from log stream containing debugging messages
 ;; being produced by GDB's internals, use warning face and send to GUD
@@ -2085,23 +2125,28 @@ current thread and update GDB buffers."
     (setq gdb-output-sink 'emacs))
 
   (gdb-clear-partial-output)
-  (when gdb-first-done-or-error
-    (unless (or token-number gud-running)
-      (setq gdb-filter-output (concat gdb-filter-output gdb-prompt-name)))
-    (gdb-update)
-    (setq gdb-first-done-or-error nil))
 
-  (setq gdb-filter-output
-        (gdb-concat-output gdb-filter-output output-field))
+  ;; The process may already be dead (e.g. C-d at the gdb prompt).
+  (let* ((proc (get-buffer-process gud-comint-buffer))
+         (no-proc (or (null proc)
+                      (memq (process-status proc) '(exit signal)))))
 
-  (if token-number
-      (progn
-        (with-current-buffer
-            (gdb-get-buffer-create 'gdb-partial-output-buffer)
-          (funcall
-           (cdr (assoc (string-to-number token-number) gdb-handler-alist))))
-        (setq gdb-handler-alist
-              (assq-delete-all token-number gdb-handler-alist)))))
+    (when gdb-first-done-or-error
+      (unless (or token-number gud-running no-proc)
+        (setq gdb-filter-output (concat gdb-filter-output gdb-prompt-name)))
+      (gdb-update no-proc)
+      (setq gdb-first-done-or-error nil))
+
+    (setq gdb-filter-output
+          (gdb-concat-output gdb-filter-output output-field))
+
+    (when token-number
+      (with-current-buffer
+          (gdb-get-buffer-create 'gdb-partial-output-buffer)
+        (funcall
+         (cdr (assoc (string-to-number token-number) gdb-handler-alist))))
+      (setq gdb-handler-alist
+            (assq-delete-all token-number gdb-handler-alist)))))
 
 (defun gdb-concat-output (so-far new)
   (cond
@@ -4105,9 +4150,15 @@ This arrangement depends on the value of `gdb-many-windows'."
            (gud-find-file gdb-main-file)))
         (setq gdb-source-window win)))))
 
+;; Called from `gud-sentinel' in gud.el:
 (defun gdb-reset ()
   "Exit a debugging session cleanly.
 Kills the gdb buffers, and resets variables and the source buffers."
+  ;; The gdb-inferior buffer has a pty hooked up to the main gdb
+  ;; process.  This pty must be deleted explicitly.
+  (let ((pty (get-process "gdb-inferior")))
+    (if pty (delete-process pty)))
+  ;; Find gdb-mi buffers and kill them.
   (dolist (buffer (buffer-list))
     (unless (eq buffer gud-comint-buffer)
       (with-current-buffer buffer
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index d41364547f2..a6ae42f86b1 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -728,9 +728,9 @@ This function is called from `compilation-filter-hook'."
 (defun grep (command-args)
   "Run grep, with user-specified args, and collect output in a buffer.
 While grep runs asynchronously, you can use \\[next-error] (M-x next-error),
-or \\<grep-mode-map>\\[compile-goto-error] in the grep \
-output buffer, to go to the lines where grep
-found matches.
+or \\<grep-mode-map>\\[compile-goto-error] in the *grep* \
+buffer, to go to the lines where grep found
+matches.  To kill the grep job before it finishes, type \\[kill-compilation].
 
 For doing a recursive `grep', see the `rgrep' command.  For running
 `grep' in a specific directory, see `lgrep'.
@@ -957,10 +957,11 @@ With \\[universal-argument] prefix, you can edit the constructed shell command l
 before it is executed.
 With two \\[universal-argument] prefixes, directly edit and run `grep-find-command'.
 
-Collect output in a buffer.  While find runs asynchronously, you
-can use \\[next-error] (M-x next-error), or \\<grep-mode-map>\\[compile-goto-error] \
+Collect output in a buffer.  While the recursive grep is running,
+you can use \\[next-error] (M-x next-error), or \\<grep-mode-map>\\[compile-goto-error] \
 in the grep output buffer,
-to go to the lines where grep found matches.
+to visit the lines where matches were found.  To kill the job
+before it finishes, type \\[kill-compilation].
 
 This command shares argument histories with \\[lgrep] and \\[grep-find].
 
@@ -1024,7 +1025,8 @@ to specify a command to run."
                                     (shell-quote-argument ")")
                                     " -prune -o "))
                        (and grep-find-ignored-files
-                            (concat (shell-quote-argument "(")
+                            (concat (shell-quote-argument "!") " -type d "
+                                    (shell-quote-argument "(")
                                     ;; we should use shell-quote-argument here
                                     " -name "
                                     (mapconcat
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 6b1f891b230..1f60c351252 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -66,10 +66,10 @@ Supported debuggers include gdb, sdb, dbx, xdb, perldb, pdb (Python) and jdb."
 
 (defcustom gud-key-prefix "\C-x\C-a"
   "Prefix of all GUD commands valid in C buffers."
-  :type 'string
+  :type 'key-sequence
   :group 'gud)
 
-(global-set-key (concat gud-key-prefix "\C-l") 'gud-refresh)
+(global-set-key (vconcat gud-key-prefix "\C-l") 'gud-refresh)
 (define-key ctl-x-map " " 'gud-break)   ;; backward compatibility hack
 
 (defvar gud-marker-filter nil)
diff --git a/lisp/progmodes/hideshow.el b/lisp/progmodes/hideshow.el
index e2016e206a8..b6d2b5e319c 100644
--- a/lisp/progmodes/hideshow.el
+++ b/lisp/progmodes/hideshow.el
@@ -802,12 +802,15 @@ If `hs-hide-comments-when-hiding-all' is non-nil, also hide the comments."
                   (forward-comment (point-max)))
                 (re-search-forward re (point-max) t))
          (if (match-beginning 1)
-             ;; we have found a block beginning
+             ;; We have found a block beginning.
              (progn
                (goto-char (match-beginning 1))
-               (if hs-hide-all-non-comment-function
-                   (funcall hs-hide-all-non-comment-function)
-                 (hs-hide-block-at-point t)))
+               (unless (if hs-hide-all-non-comment-function
+                           (funcall hs-hide-all-non-comment-function)
+                         (hs-hide-block-at-point t))
+                 ;; Go to end of matched data to prevent from getting stuck
+                 ;; with an endless loop.
+                 (goto-char (match-end 0))))
            ;; found a comment, probably
            (let ((c-reg (hs-inside-comment-p)))
              (when (and c-reg (car c-reg))
diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el
index aab5f8f65a4..9df9943cc00 100644
--- a/lisp/progmodes/perl-mode.el
+++ b/lisp/progmodes/perl-mode.el
@@ -1,6 +1,6 @@
 ;;; perl-mode.el --- Perl code editing commands for GNU Emacs
 
-;; Copyright (C) 1990, 1994, 2001-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1994, 2001-2012 Free Software Foundation, Inc.
 
 ;; Author: William F. Mann
 ;; Maintainer: FSF
@@ -133,11 +133,6 @@
     map)
   "Keymap used in Perl mode.")
 
-(autoload 'c-macro-expand "cmacexp"
-  "Display the result of expanding all C macros occurring in the region.
-The expansion is entirely correct because it uses the C preprocessor."
-  t)
-
 (defvar perl-mode-syntax-table
   (let ((st (make-syntax-table (standard-syntax-table))))
     (modify-syntax-entry ?\n ">" st)
@@ -511,6 +506,14 @@ If nil, continued arguments are aligned with the first argument."
   :type '(choice integer (const nil))
   :group 'perl)
 
+(defcustom perl-indent-parens-as-block nil
+  "Non-nil means that non-block ()-, {}- and []-groups are indented as blocks.
+The closing bracket is aligned with the line of the opening bracket,
+not the contents of the brackets."
+  :version "24.2"
+  :type 'boolean
+  :group 'perl)
+
 (defcustom perl-tab-always-indent tab-always-indent
   "Non-nil means TAB in Perl mode always indents the current line.
 Otherwise it inserts a tab character if you type it past the first
@@ -853,7 +856,8 @@ Optional argument PARSE-START should be the position of `beginning-of-defun'."
       (cond ((nth 3 state) 'noindent)   ; In a quoted string?
             ((null containing-sexp)     ; Line is at top level.
              (skip-chars-forward " \t\f")
-             (if (= (following-char) ?{)
+             (if (memq (following-char)
+                       (if perl-indent-parens-as-block '(?\{ ?\( ?\[) '(?\{)))
                  0  ; move to beginning of line if it starts a function body
                ;; indent a little if this is a continuation line
                (perl-backward-to-noncomment)
@@ -897,7 +901,9 @@ Optional argument PARSE-START should be the position of `beginning-of-defun'."
                           0 perl-continued-statement-offset)
                       (current-column)
                       (if (save-excursion (goto-char indent-point)
-                                          (looking-at "[ \t]*{"))
+                                          (looking-at
+                                           (if perl-indent-parens-as-block
+                                               "[ \t]*[{(\[]" "[ \t]*{")))
                           perl-continued-brace-offset 0)))
                ;; This line starts a new statement.
                ;; Position at last unclosed open.
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index f7566c31b41..2922330e6f9 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -69,11 +69,7 @@
 (require 'comint)
 (require 'ansi-color)
 
-(eval-when-compile
-  (require 'compile)
-  (require 'hippie-exp))
-
-(autoload 'comint-mode "comint")
+(eval-when-compile (require 'compile))
 
 (defgroup python nil
   "Silly walks in the Python language."
@@ -1488,8 +1484,6 @@ Don't save anything for STR matching `inferior-python-filter-regexp'."
            res)
           (t (concat res s)))))
 
-(autoload 'comint-check-proc "comint")
-
 (defvar python-version-checked nil)
 (defun python-check-version (cmd)
   "Check that CMD runs a suitable version of Python."
@@ -1684,8 +1678,6 @@ value to determine defaults."
   "Caches (directory . file) pair used in the last `python-load-file' command.
 Used for determining the default in the next one.")
 
-(autoload 'comint-get-source "comint")
-
 (defun python-load-file (file-name)
   "Load a Python file FILE-NAME into the inferior Python process.
 If the file has extension `.py' import or reload it as a module.
@@ -1776,7 +1768,7 @@ will."
   ;; allow C-c C-f in help buffer.
   (let ((temp-buffer-show-hook          ; avoid xref stuff
          (lambda ()
-           (toggle-read-only 1)
+           (setq buffer-read-only t)
            (setq view-return-to-alist
                  (list (cons (selected-window) help-return-method))))))
     (with-output-to-temp-buffer (help-buffer)
@@ -1959,7 +1951,7 @@ the string's indentation."
                 ;; paragraph in a multi-line string properly, so narrow
                 ;; to the string and then fill around (the end of) the
                 ;; current line.
-                ((eq t (nth 3 syntax))  ; in fenced string
+                ((nth 3 syntax) ; in fenced string
                  (goto-char (nth 8 syntax)) ; string start
                  (setq start (line-beginning-position))
                  (setq end (condition-case () ; for unbalanced quotes
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el
index c8ef8f0324c..0139795dd38 100644
--- a/lisp/progmodes/verilog-mode.el
+++ b/lisp/progmodes/verilog-mode.el
@@ -3592,7 +3592,7 @@ Key bindings specific to `verilog-mode-map' are:
   (set (make-local-variable 'imenu-generic-expression)
        verilog-imenu-generic-expression)
   ;; Tell which-func-modes that imenu knows about verilog
-  (when (boundp 'which-func-modes)
+  (when (and (boundp 'which-func-modes) (listp which-func-modes))
     (add-to-list 'which-func-modes 'verilog-mode))
   ;; hideshow support
   (when (boundp 'hs-special-modes-alist)
diff --git a/lisp/progmodes/which-func.el b/lisp/progmodes/which-func.el
index 721c610517a..c8435c14ea2 100644
--- a/lisp/progmodes/which-func.el
+++ b/lisp/progmodes/which-func.el
@@ -1,6 +1,6 @@
 ;;; which-func.el --- print current function in mode line
 
-;; Copyright (C) 1994, 1997-1998, 2001-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1997-1998, 2001-2012 Free Software Foundation, Inc.
 
 ;; Author:   Alex Rezinsky <alexr@msil.sps.mot.com>
 ;;           (doesn't seem to be responsive any more)
@@ -72,14 +72,15 @@
   :group 'tools
   :version "20.3")
 
-(defcustom which-func-modes
-  '(emacs-lisp-mode c-mode c++-mode perl-mode cperl-mode python-mode
-                    makefile-mode sh-mode fortran-mode f90-mode ada-mode
-                    diff-mode)
+(defcustom which-func-modes t
+  ;; '(emacs-lisp-mode c-mode c++-mode objc-mode perl-mode cperl-mode python-mode
+  ;;                makefile-mode sh-mode fortran-mode f90-mode ada-mode
+  ;;                diff-mode)
   "List of major modes for which Which Function mode should be used.
 For other modes it is disabled.  If this is equal to t,
 then Which Function mode is enabled in any major mode that supports it."
   :group 'which-func
+  :version "24.2"                       ; explicit list -> t
   :type '(choice (const :tag "All modes" t)
                  (repeat (symbol :tag "Major mode"))))
 
diff --git a/lisp/recentf.el b/lisp/recentf.el
index 8b0b36cdddc..636110f41de 100644
--- a/lisp/recentf.el
+++ b/lisp/recentf.el
@@ -1061,6 +1061,8 @@ Go to the beginning of buffer if not found."
   (let ((km (copy-keymap recentf--shortcuts-keymap)))
     (set-keymap-parent km widget-keymap)
     (define-key km "q" 'recentf-cancel-dialog)
+    (define-key km "n" 'next-line)
+    (define-key km "p" 'previous-line)
     (define-key km [follow-link] "\C-m")
     km)
   "Keymap used in recentf dialogs.")
diff --git a/lisp/scroll-all.el b/lisp/scroll-all.el
index 9ff0a61db2f..fed886c2b55 100644
--- a/lisp/scroll-all.el
+++ b/lisp/scroll-all.el
@@ -111,7 +111,6 @@ one window apply to all visible windows in the same frame."
   nil " *SL*" nil
   :global t
   :group 'windows
-  :group 'scrolling
   (if scroll-all-mode
       (add-hook 'post-command-hook 'scroll-all-check-to-scroll)
     (remove-hook 'post-command-hook 'scroll-all-check-to-scroll)))
diff --git a/lisp/server.el b/lisp/server.el
index 404bebc4747..1e2f458ac9c 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -139,6 +139,32 @@ directory residing in a NTFS partition instead."
 ;;;###autoload
 (put 'server-auth-dir 'risky-local-variable t)
 
+(defcustom server-auth-key nil
+  "Server authentication key.
+
+Normally, the authentication key is randomly generated when the
+server starts, which guarantees some level of security.  It is
+recommended to leave it that way.  Using a long-lived shared key
+will decrease security (especially since the key is transmitted as
+plain text).
+
+In some situations however, it can be difficult to share randomly
+generated passwords with remote hosts (eg. no shared directory),
+so you can set the key with this variable and then copy the
+server file to the remote host (with possible changes to IP
+address and/or port if that applies).
+
+The key must consist of 64 ASCII printable characters except for
+space (this means characters from ! to ~; or from code 33 to 126).
+
+You can use \\[server-generate-key] to get a random authentication
+key."
+  :group 'server
+  :type '(choice
+          (const :tag "Random" nil)
+          (string :tag "Password"))
+  :version "24.2")
+
 (defcustom server-raise-frame t
   "If non-nil, raise frame when switching to a buffer."
   :group 'server
@@ -494,41 +520,62 @@ Creates the directory if necessary and makes sure:
     ;; Check that it's safe for use.
     (let* ((uid (nth 2 attrs))
            (w32 (eq system-type 'windows-nt))
-           (safe (catch :safe
-                   (unless (eq t (car attrs))   ; is a dir?
-                     (throw :safe nil))
-                   (when (and w32 (zerop uid))  ; on FAT32?
-                     (display-warning
-                      'server
-                      (format "Using `%s' to store Emacs-server authentication files.
+           (safe (cond
+                  ((not (eq t (car attrs))) nil)  ; is a dir?
+                  ((and w32 (zerop uid))          ; on FAT32?
+                   (display-warning
+                    'server
+                    (format "Using `%s' to store Emacs-server authentication files.
 Directories on FAT32 filesystems are NOT secure against tampering.
 See variable `server-auth-dir' for details."
-                              (file-name-as-directory dir))
-                      :warning)
-                     (throw :safe t))
-                   (unless (or (= uid (user-uid)) ; is the dir ours?
-                               (and w32
-                                    ;; Files created on Windows by
-                                    ;; Administrator (RID=500) have
-                                    ;; the Administrators (RID=544)
-                                    ;; group recorded as the owner.
-                                    (= uid 544) (= (user-uid) 500)))
-                     (throw :safe nil))
-                   (when w32                    ; on NTFS?
-                     (throw :safe t))
-                   (unless (zerop (logand ?\077 (file-modes dir)))
-                     (throw :safe nil))
-                   t)))
+                            (file-name-as-directory dir))
+                    :warning)
+                   t)
+                  ((and (/= uid (user-uid))       ; is the dir ours?
+                        (or (not w32)
+                            ;; Files created on Windows by Administrator
+                            ;; (RID=500) have the Administrators (RID=544)
+                            ;; group recorded as the owner.
+                            (/= uid 544) (/= (user-uid) 500)))
+                   nil)
+                  (w32 t)                         ; on NTFS?
+                  (t                              ; else, check permissions
+                   (zerop (logand ?\077 (file-modes dir)))))))
       (unless safe
         (error "The directory `%s' is unsafe" dir)))))
 
+(defun server-generate-key ()
+  "Generate and return a random authentication key.
+The key is a 64-byte string of random chars in the range `!'..`~'.
+If called interactively, also inserts it into current buffer."
+  (interactive)
+  (let ((auth-key
+         (loop repeat 64
+               collect (+ 33 (random 94)) into auth
+               finally return (concat auth))))
+    (if (called-interactively-p 'interactive)
+        (insert auth-key))
+    auth-key))
+
+(defun server-get-auth-key ()
+  "Return server's authentication key.
+
+If `server-auth-key' is nil, just call `server-generate-key'.
+Otherwise, if `server-auth-key' is a valid key, return it.
+If the key is not valid, signal an error."
+  (if server-auth-key
+    (if (string-match-p "^[!-~]\\{64\\}$" server-auth-key)
+        server-auth-key
+      (error "The key '%s' is invalid" server-auth-key))
+    (server-generate-key)))
+
 ;;;###autoload
 (defun server-start (&optional leave-dead inhibit-prompt)
   "Allow this Emacs process to be a server for client processes.
-This starts a server communications subprocess through which
-client \"editors\" can send your editing commands to this Emacs
-job.  To use the server, set up the program `emacsclient' in the
-Emacs distribution as your standard \"editor\".
+This starts a server communications subprocess through which client
+\"editors\" can send your editing commands to this Emacs job.
+To use the server, set up the program `emacsclient' in the Emacs
+distribution as your standard \"editor\".
 
 Optional argument LEAVE-DEAD (interactively, a prefix arg) means just
 kill any existing server communications subprocess.
@@ -615,13 +662,7 @@ server or call `M-x server-force-delete' to forcibly disconnect it.")
           (unless server-process (error "Could not start server process"))
           (process-put server-process :server-file server-file)
           (when server-use-tcp
-            (let ((auth-key
-                   (loop
-                    ;; The auth key is a 64-byte string of random chars in the
-                    ;; range `!'..`~'.
-                    repeat 64
-                    collect (+ 33 (random 94)) into auth
-                    finally return (concat auth))))
+            (let ((auth-key (server-get-auth-key)))
               (process-put server-process :auth-key auth-key)
               (with-temp-file server-file
                 (set-buffer-multibyte nil)
@@ -780,10 +821,6 @@ This handles splitting the command if it would be bigger than
     (select-frame frame)
     (process-put proc 'frame frame)
     (process-put proc 'terminal (frame-terminal frame))
-
-    ;; Display *scratch* by default.
-    (switch-to-buffer (get-buffer-create "*scratch*") 'norecord)
-
     frame))
 
 (defun server-create-window-system-frame (display nowait proc parent-id
@@ -816,9 +853,6 @@ This handles splitting the command if it would be bigger than
       (select-frame frame)
       (process-put proc 'frame frame)
       (process-put proc 'terminal (frame-terminal frame))
-
-      ;; Display *scratch* by default.
-      (switch-to-buffer (get-buffer-create "*scratch*") 'norecord)
       frame)))
 
 (defun server-goto-toplevel (proc)
@@ -1042,8 +1076,9 @@ The following commands are accepted by the client:
 
                 ;; -window-system:  Open a new X frame.
                 (`"-window-system"
-                 (setq dontkill t)
-                 (setq tty-name 'window-system))
+                 (if (fboundp 'x-create-frame)
+                     (setq dontkill t
+                           tty-name 'window-system)))
 
                 ;; -resume:  Resume a suspended tty frame.
                 (`"-resume"
@@ -1071,7 +1106,8 @@ The following commands are accepted by the client:
                  (setq dontkill t)
                  (pop args-left))
 
-                ;; -tty DEVICE-NAME TYPE:  Open a new tty frame at the client.
+                ;; -tty DEVICE-NAME TYPE:  Open a new tty frame.
+                ;; (But if we see -window-system later, use that.)
                 (`"-tty"
                  (setq tty-name (pop args-left)
                        tty-type (pop args-left)
@@ -1133,6 +1169,13 @@ The following commands are accepted by the client:
                 ;; Unknown command.
                 (arg (error "Unknown command: %s" arg))))
 
+            ;; If both -no-wait and -tty are given with file or sexp
+            ;; arguments, use an existing frame.
+            (and nowait
+                 (not (eq tty-name 'window-system))
+                 (or files commands)
+                 (setq use-current-frame t))
+
             (setq frame
                   (cond
                    ((and use-current-frame
@@ -1182,12 +1225,17 @@ The following commands are accepted by the client:
   ;; including code that needs to wait.
   (with-local-quit
     (condition-case err
-        (let* ((buffers
-                (when files
-                  (server-visit-files files proc nowait))))
-
+        (let ((buffers (server-visit-files files proc nowait)))
           (mapc 'funcall (nreverse commands))
 
+          ;; If we were told only to open a new client, obey
+          ;; `initial-buffer-choice' if it specifies a file.
+          (unless (or files commands)
+            (if (stringp initial-buffer-choice)
+                (find-file initial-buffer-choice)
+              (switch-to-buffer (get-buffer-create "*scratch*")
+                                'norecord)))
+
           ;; Delete the client if necessary.
           (cond
            (nowait
diff --git a/lisp/ses.el b/lisp/ses.el
index 0638fc344c7..da18046c953 100644
--- a/lisp/ses.el
+++ b/lisp/ses.el
@@ -282,6 +282,9 @@ default printer and then modify its output.")
       ses--numcols ses--numrows ses--symbolic-formulas
       ses--data-marker ses--params-marker (ses--Dijkstra-attempt-nb . 0)
       ses--Dijkstra-weight-bound
+      ;; This list is useful to speed-up clean-up of symbols when
+      ;; an area containing renamed cell is deleted.
+      ses--renamed-cell-symb-list
       ;; Global variables that we override
       mode-line-process next-line-add-newlines transient-mark-mode)
     "Buffer-local variables used by SES.")
@@ -674,6 +677,17 @@ for this spreadsheet."
         (put sym 'ses-cell (cons xrow xcol))
         (make-local-variable sym)))))
 
+(defun ses-create-cell-variable (sym row col)
+  "Create a buffer-local variable `SYM' for cell at position (ROW, COL).
+
+SYM is the symbol for that variable, ROW and COL are integers for
+row and column of the cell, with numbering starting from 0.
+
+Return nil in case of failure."
+  (unless (local-variable-p sym)
+    (make-local-variable  sym)
+    (put sym 'ses-cell (cons row col))))
+
 ;; We do not delete the ses-cell properties for the cell-variables, in
 ;; case a formula that refers to this cell is in the kill-ring and is
 ;; later pasted back in.
@@ -682,7 +696,10 @@ for this spreadsheet."
   (let (sym)
     (dotimes (row (1+ (- maxrow minrow)))
       (dotimes (col (1+ (- maxcol mincol)))
-        (setq sym (ses-create-cell-symbol (+ row minrow) (+ col mincol)))
+        (let ((xrow  (+ row minrow)) (xcol (+ col mincol)))
+          (setq sym (if (and (< xrow ses--numrows) (< xcol ses--numcols))
+                        (ses-cell-symbol xrow xcol)
+                        (ses-create-cell-symbol xrow xcol))))
         (if (boundp sym)
             (push `(apply ses-set-with-undo ,sym ,(symbol-value sym))
                   buffer-undo-list))
@@ -1400,7 +1417,8 @@ removed.  Example:
 Sets `ses-relocate-return' to 'delete if cell-references were removed."
   (let (rowcol result)
     (if (or (atom formula) (eq (car formula) 'quote))
-        (if (setq rowcol (ses-sym-rowcol formula))
+        (if (and (setq rowcol (ses-sym-rowcol formula))
+                 (string-match "\\`[A-Z]+[0-9]+\\'" (symbol-name formula)))
             (ses-relocate-symbol formula rowcol
                                  startrow startcol rowincr colincr)
           formula) ; Pass through as-is.
@@ -1508,14 +1526,15 @@ if the range was altered."
 the rectangle (MINROW,MINCOL)..(NUMROWS,NUMCOLS) by adding ROWINCR and COLINCR
 to each symbol."
   (let (reform)
-    (let (mycell newval)
+    (let (mycell newval xrow)
       (dotimes-with-progress-reporter
           (row ses--numrows) "Relocating formulas..."
         (dotimes (col ses--numcols)
           (setq ses-relocate-return nil
                 mycell (ses-get-cell row col)
                 newval (ses-relocate-formula (ses-cell-formula mycell)
-                                             minrow mincol rowincr colincr))
+                                             minrow mincol rowincr colincr)
+                xrow  (- row rowincr))
           (ses-set-cell row col 'formula newval)
           (if (eq ses-relocate-return 'range)
               ;; This cell contains a (ses-range X Y) where a cell has been
@@ -1531,8 +1550,22 @@ to each symbol."
                                              minrow mincol rowincr colincr))
           (ses-set-cell row col 'references newval)
           (and (>= row minrow) (>= col mincol)
-               (ses-set-cell row col 'symbol
-                             (ses-create-cell-symbol row col))))))
+               (let ((sym (ses-cell-symbol row col))
+                     (xcol (- col colincr)))
+                 (if (and
+                      sym
+                      (>= xrow 0)
+                      (>= xcol 0)
+                      (null (eq sym
+                                (ses-create-cell-symbol xrow xcol))))
+                     ;; This is a renamed cell, do not update the cell
+                     ;; name, but just update the coordinate property.
+                     (put sym 'ses-cell (cons row col))
+                   (ses-set-cell row col 'symbol
+                                 (setq sym (ses-create-cell-symbol row col)))
+                   (unless (and (boundp sym) (local-variable-p sym))
+                     (set (make-local-variable sym) nil)
+                     (put sym 'ses-cell (cons row col)))))) )))
     ;; Relocate the cell values.
     (let (oldval myrow mycol xrow xcol)
       (cond
@@ -1545,11 +1578,17 @@ to each symbol."
             (setq mycol  (+ col mincol)
                   xrow   (- myrow rowincr)
                   xcol   (- mycol colincr))
-            (if (and (< xrow ses--numrows) (< xcol ses--numcols))
-                (setq oldval (ses-cell-value xrow xcol))
-              ;; Cell is off the end of the array.
-              (setq oldval (symbol-value (ses-create-cell-symbol xrow xcol))))
-            (ses-set-cell myrow mycol 'value oldval))))
+            (let ((sym (ses-cell-symbol myrow mycol))
+                  (xsym (ses-create-cell-symbol xrow xcol)))
+              ;; Make the value relocation only when if the cell is not
+              ;; a renamed cell.  Otherwise this is not needed.
+              (and (eq sym xsym)
+                  (ses-set-cell myrow mycol 'value
+                    (if (and (< xrow ses--numrows) (< xcol ses--numcols))
+                        (ses-cell-value xrow xcol)
+                      ;;Cell is off the end of the array
+                      (symbol-value xsym))))))))
+
        ((and (wholenump rowincr) (wholenump colincr))
         ;; Insertion of rows and/or columns.  Run the loop backwards.
         (let ((disty (1- ses--numrows))
@@ -1659,7 +1698,6 @@ Does not execute cell formulas or print functions."
         (message "Upgrading from SES-1 file format")))
     (or (= ses--file-format 2)
         (error "This file needs a newer version of the SES library code"))
-    (ses-create-cell-variable-range 0 (1- ses--numrows) 0 (1- ses--numcols))
     ;; Initialize cell array.
     (setq ses--cells (make-vector ses--numrows nil))
     (dotimes (row ses--numrows)
@@ -1679,11 +1717,10 @@ Does not execute cell formulas or print functions."
   (dotimes (row ses--numrows)
     (dotimes (col ses--numcols)
       (let* ((x      (read (current-buffer)))
-             (rowcol (ses-sym-rowcol (car-safe (cdr-safe x)))))
+             (sym  (car-safe (cdr-safe x))))
         (or (and (looking-at "\n")
                  (eq (car-safe x) 'ses-cell)
-                 (eq row (car rowcol))
-                 (eq col (cdr rowcol)))
+                 (ses-create-cell-variable sym row col))
             (error "Cell-def error"))
         (eval x)))
     (or (looking-at "\n\n")
@@ -3140,6 +3177,63 @@ highlighted range in the spreadsheet."
   (mouse-set-point event)
   (ses-insert-ses-range))
 
+(defun ses-replace-name-in-formula (formula old-name new-name)
+  (let ((new-formula formula))
+    (unless (and (consp formula)
+                 (eq (car-safe formula) 'quote))
+      (while formula
+        (let ((elt (car-safe formula)))
+          (cond
+           ((consp elt)
+            (setcar formula (ses-replace-name-in-formula elt old-name new-name)))
+           ((and (symbolp elt)
+                 (eq (car-safe formula) old-name))
+            (setcar formula new-name))))
+        (setq formula (cdr formula))))
+    new-formula))
+
+(defun ses-rename-cell (new-name)
+  "Rename current cell."
+  (interactive "*SEnter new name: ")
+  (ses-check-curcell)
+  (or
+   (and  (local-variable-p new-name)
+         (ses-sym-rowcol new-name)
+         ;; this test is needed because ses-cell property of deleted cells
+         ;; is not deleted in case of subsequent undo
+         (memq new-name ses--renamed-cell-symb-list)
+         (error "Already a cell name"))
+   (and (boundp new-name)
+        (null (yes-or-no-p (format "`%S' is already bound outside this buffer, continue? "
+                                   new-name)))
+        (error "Already a bound cell name")))
+  (let* ((rowcol (ses-sym-rowcol ses--curcell))
+         (cell (ses-get-cell (car rowcol) (cdr rowcol))))
+    (put new-name 'ses-cell rowcol)
+    (dolist (reference (ses-cell-references (car rowcol) (cdr rowcol)))
+      (let* ((rowcol (ses-sym-rowcol reference))
+             (cell  (ses-get-cell (car rowcol) (cdr rowcol))))
+        (ses-cell-set-formula (car rowcol)
+                              (cdr rowcol)
+                              (ses-replace-name-in-formula
+                               (ses-cell-formula cell)
+                               ses--curcell
+                               new-name))))
+    (push new-name ses--renamed-cell-symb-list)
+    (set new-name (symbol-value ses--curcell))
+    (aset cell 0 new-name)
+    (put ses--curcell 'ses-cell nil)
+    (makunbound ses--curcell)
+    (setq ses--curcell new-name)
+    (let* ((pos (point))
+           (inhibit-read-only t)
+           (col (current-column))
+           (end (save-excursion
+                  (move-to-column (1+ col))
+                  (if (eolp)
+                      (+ pos (ses-col-width col) 1)
+                    (point)))))
+      (put-text-property pos end 'intangible new-name))) )
 
 ;;----------------------------------------------------------------------------
 ;; Checking formulas for safety
diff --git a/lisp/simple.el b/lisp/simple.el
index 9fab1d6dd86..67f6e4eedf7 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1,6 +1,6 @@
 ;;; simple.el --- basic editing commands for Emacs
 
-;; Copyright (C) 1985-1987, 1993-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1985-1987, 1993-2012 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
@@ -2464,9 +2464,9 @@ COMMAND.
 To specify a coding system for converting non-ASCII characters
 in the input and output to the shell command, use \\[universal-coding-system-argument]
 before this command.  By default, the input (from the current buffer)
-is encoded in the same coding system that will be used to save the file,
-`buffer-file-coding-system'.  If the output is going to replace the region,
-then it is decoded from that same coding system.
+is encoded using coding-system specified by `process-coding-system-alist',
+falling back to `default-process-coding-system' if no match for COMMAND
+is found in `process-coding-system-alist'.
 
 The noninteractive arguments are START, END, COMMAND,
 OUTPUT-BUFFER, REPLACE, ERROR-BUFFER, and DISPLAY-ERROR-BUFFER.
@@ -2677,13 +2677,13 @@ value passed."
 (defvar process-file-side-effects t
   "Whether a call of `process-file' changes remote files.
 
-Per default, this variable is always set to `t', meaning that a
+By default, this variable is always set to `t', meaning that a
 call of `process-file' could potentially change any file on a
 remote host.  When set to `nil', a file handler could optimize
-its behavior with respect to remote file attributes caching.
+its behavior with respect to remote file attribute caching.
 
-This variable should never be changed by `setq'.  Instead of, it
-shall be set only by let-binding.")
+You should only ever change this variable with a let-binding;
+never with `setq'.")
 
 (defun start-file-process (name buffer program &rest program-args)
   "Start a program in a subprocess.  Return the process object for it.
@@ -3487,14 +3487,14 @@ and KILLP is t if a prefix arg was specified."
   "Kill up to and including ARGth occurrence of CHAR.
 Case is ignored if `case-fold-search' is non-nil in the current buffer.
 Goes backward if ARG is negative; error if CHAR not found."
-  (interactive "p\ncZap to char: ")
+  (interactive (list (prefix-numeric-value current-prefix-arg)
+                     (read-char "Zap to char: " t)))
   ;; Avoid "obsolete" warnings for translation-table-for-input.
   (with-no-warnings
     (if (char-table-p translation-table-for-input)
         (setq char (or (aref translation-table-for-input char) char))))
   (kill-region (point) (progn
                          (search-forward (char-to-string char) nil nil arg)
-;                        (goto-char (if (> arg 0) (1- (point)) (1+ (point))))
                          (point))))
 
 ;; kill-line and its subroutines.
@@ -4405,23 +4405,25 @@ lines."
 ;; a cleaner solution to the problem of making C-n do something
 ;; useful given a tall image.
 (defun line-move (arg &optional noerror to-end try-vscroll)
-  (unless (and auto-window-vscroll try-vscroll
-               ;; Only vscroll for single line moves
-               (= (abs arg) 1)
-               ;; But don't vscroll in a keyboard macro.
-               (not defining-kbd-macro)
-               (not executing-kbd-macro)
-               (line-move-partial arg noerror to-end))
-    (set-window-vscroll nil 0 t)
-    (if (and line-move-visual
-             ;; Display-based column are incompatible with goal-column.
-             (not goal-column)
-             ;; When the text in the window is scrolled to the left,
-             ;; display-based motion doesn't make sense (because each
-             ;; logical line occupies exactly one screen line).
-             (not (> (window-hscroll) 0)))
-        (line-move-visual arg noerror)
-      (line-move-1 arg noerror to-end))))
+  (if noninteractive
+      (forward-line arg)
+    (unless (and auto-window-vscroll try-vscroll
+                 ;; Only vscroll for single line moves
+                 (= (abs arg) 1)
+                 ;; But don't vscroll in a keyboard macro.
+                 (not defining-kbd-macro)
+                 (not executing-kbd-macro)
+                 (line-move-partial arg noerror to-end))
+      (set-window-vscroll nil 0 t)
+      (if (and line-move-visual
+               ;; Display-based column are incompatible with goal-column.
+               (not goal-column)
+               ;; When the text in the window is scrolled to the left,
+               ;; display-based motion doesn't make sense (because each
+               ;; logical line occupies exactly one screen line).
+               (not (> (window-hscroll) 0)))
+          (line-move-visual arg noerror)
+        (line-move-1 arg noerror to-end)))))
 
 ;; Display-based alternative to line-move-1.
 ;; Arg says how many lines to move.  The value is t if we can move the
diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index bb1debb4552..9065d9ed131 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -1,6 +1,6 @@
 ;;; speedbar --- quick access to files and tags in a frame
 
-;; Copyright (C) 1996-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1996-2012 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: file, tags, tools
@@ -1022,7 +1022,7 @@ supported at a time.
   (set (make-local-variable 'dframe-delete-frame-function)
        'speedbar-handle-delete-frame)
   ;; hscroll
-  (set (make-local-variable 'automatic-hscrolling) nil) ; Emacs 21
+  (set (make-local-variable 'auto-hscroll-mode) nil)
   ;; reset the selection variable
   (setq speedbar-last-selected-file nil))
 
diff --git a/lisp/startup.el b/lisp/startup.el
index 518b53ccdf1..4a8af55af2f 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1169,38 +1169,6 @@ the `--debug-init' option to view a complete error backtrace."
                                             (or mail-host-address
                                                 (system-name))))))
 
-    ;; Originally face attributes were specified via
-    ;; `font-lock-face-attributes'.  Users then changed the default
-    ;; face attributes by setting that variable.  However, we try and
-    ;; be back-compatible and respect its value if set except for
-    ;; faces where M-x customize has been used to save changes for the
-    ;; face.
-    (when (boundp 'font-lock-face-attributes)
-      (let ((face-attributes font-lock-face-attributes))
-        (while face-attributes
-          (let* ((face-attribute (pop face-attributes))
-                 (face (car face-attribute)))
-            ;; Rustle up a `defface' SPEC from a
-            ;; `font-lock-face-attributes' entry.
-            (unless (get face 'saved-face)
-              (let ((foreground (nth 1 face-attribute))
-                    (background (nth 2 face-attribute))
-                    (bold-p (nth 3 face-attribute))
-                    (italic-p (nth 4 face-attribute))
-                    (underline-p (nth 5 face-attribute))
-                    face-spec)
-                (when foreground
-                  (setq face-spec (cons ':foreground (cons foreground face-spec))))
-                (when background
-                  (setq face-spec (cons ':background (cons background face-spec))))
-                (when bold-p
-                  (setq face-spec (append '(:weight bold) face-spec)))
-                (when italic-p
-                  (setq face-spec (append '(:slant italic) face-spec)))
-                (when underline-p
-                  (setq face-spec (append '(:underline t) face-spec)))
-                (face-spec-set face (list (list t face-spec)) nil)))))))
-
     ;; If parameter have been changed in the init file which influence
     ;; face realization, clear the face cache so that new faces will
     ;; be realized.
@@ -2348,6 +2316,7 @@ A fancy display is used on graphic displays, normal otherwise."
     (if (or inhibit-startup-screen
             initial-buffer-choice
             noninteractive
+            (daemonp)
             inhibit-x-resources)
 
         ;; Not displaying a startup screen.  If 3 or more files
@@ -2390,9 +2359,7 @@ A fancy display is used on graphic displays, normal otherwise."
       ;; (with-no-warnings
       ;;        (setq menubar-bindings-done t))
 
-      (if (> file-count 0)
-          (display-startup-screen t)
-        (display-startup-screen nil)))))
+      (display-startup-screen (> file-count 0)))))
 
 (defun command-line-normalize-file-name (file)
   "Collapse multiple slashes to one, to handle non-Emacs file names."
diff --git a/lisp/subr.el b/lisp/subr.el
index a6ad67283be..8e296aa7422 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -678,7 +678,6 @@ Subkeymaps may be modified but are not canonicalized."
     ;; Process the bindings starting from the end.
     (dolist (binding (prog1 bindings (setq bindings ())))
       (let* ((key (car binding))
-             (item (cdr binding))
              (oldbind (assq key bindings)))
         (push (if (not oldbind)
                   ;; The normal case: no duplicate bindings.
@@ -871,6 +870,7 @@ The normal global definition of the character C-x indirects to this keymap.")
 (defsubst eventp (obj)
   "True if the argument is an event object."
   (or (and (integerp obj)
+           ;; FIXME: Why bother?
            ;; Filter out integers too large to be events.
            ;; M is the biggest modifier.
            (zerop (logand obj (lognot (1- (lsh ?\M-\^@ 1)))))
@@ -1888,8 +1888,7 @@ Used from `delayed-warnings-hook' (which see)."
         (push warning collapsed)))
     (setq delayed-warnings-list (nreverse collapsed))))
 
-;; At present this is only really useful for Emacs internals.
-;; Document in the lispref if it becomes generally useful.
+;; At present this is only used for Emacs internals.
 ;; Ref http://lists.gnu.org/archive/html/emacs-devel/2012-02/msg00085.html
 (defvar delayed-warnings-hook '(collapse-delayed-warnings
                                 display-delayed-warnings)
@@ -1989,6 +1988,10 @@ obey the input decoding and translations usually done by `read-key-sequence'.
 So escape sequences and keyboard encoding are taken into account.
 When there's an ambiguity because the key looks like the prefix of
 some sort of escape sequence, the ambiguity is resolved via `read-key-delay'."
+  ;; This overriding-terminal-local-map binding also happens to
+  ;; disable quail's input methods, so although read-key-sequence
+  ;; always inherits the input method, in practice read-key does not
+  ;; inherit the input method (at least not if it's based on quail).
   (let ((overriding-terminal-local-map read-key-empty-map)
         (overriding-local-map nil)
         (echo-keystrokes 0)
@@ -2093,77 +2096,45 @@ Optional DEFAULT is a default password to use instead of empty input.
 
 This function echoes `.' for each character that the user types.
 
-The user ends with RET, LFD, or ESC.  DEL or C-h rubs out.
-C-y yanks the current kill.  C-u kills line.
-C-g quits; if `inhibit-quit' was non-nil around this function,
-then it returns nil if the user types C-g, but `quit-flag' remains set.
-
 Once the caller uses the password, it can erase the password
 by doing (clear-string STRING)."
-  (with-local-quit
-    (if confirm
-        (let (success)
-          (while (not success)
-            (let ((first (read-passwd prompt nil default))
-                  (second (read-passwd "Confirm password: " nil default)))
-              (if (equal first second)
-                  (progn
-                    (and (arrayp second) (clear-string second))
-                    (setq success first))
-                (and (arrayp first) (clear-string first))
-                (and (arrayp second) (clear-string second))
-                (message "Password not repeated accurately; please start over")
-                (sit-for 1))))
-          success)
-      (let ((pass nil)
-            ;; Copy it so that add-text-properties won't modify
-            ;; the object that was passed in by the caller.
-            (prompt (copy-sequence prompt))
-            (c 0)
-            (echo-keystrokes 0)
-            (cursor-in-echo-area t)
-            (message-log-max nil)
-            (stop-keys (list 'return ?\r ?\n ?\e))
-            (rubout-keys (list 'backspace ?\b ?\177)))
-        (add-text-properties 0 (length prompt)
-                             minibuffer-prompt-properties prompt)
-        (while (progn (message "%s%s"
-                               prompt
-                               (make-string (length pass) ?.))
-                      (setq c (read-key))
-                      (not (memq c stop-keys)))
-          (clear-this-command-keys)
-          (cond ((memq c rubout-keys) ; rubout
-                 (when (> (length pass) 0)
-                   (let ((new-pass (substring pass 0 -1)))
-                     (and (arrayp pass) (clear-string pass))
-                     (setq pass new-pass))))
-                ((eq c ?\C-g) (keyboard-quit))
-                ((not (numberp c)))
-                ((= c ?\C-u) ; kill line
-                 (and (arrayp pass) (clear-string pass))
-                 (setq pass ""))
-                ((= c ?\C-y) ; yank
-                 (let* ((str (condition-case nil
-                                 (current-kill 0)
-                               (error nil)))
-                        new-pass)
-                   (when str
-                     (setq new-pass
-                           (concat pass
-                                   (substring-no-properties str)))
-                     (and (arrayp pass) (clear-string pass))
-                     (setq c ?\0)
-                     (setq pass new-pass))))
-                ((characterp c) ; insert char
-                 (let* ((new-char (char-to-string c))
-                        (new-pass (concat pass new-char)))
-                   (and (arrayp pass) (clear-string pass))
-                   (clear-string new-char)
-                   (setq c ?\0)
-                   (setq pass new-pass)))))
-        (message nil)
-        (or pass default "")))))
+  (if confirm
+      (let (success)
+        (while (not success)
+          (let ((first (read-passwd prompt nil default))
+                (second (read-passwd "Confirm password: " nil default)))
+            (if (equal first second)
+                (progn
+                  (and (arrayp second) (clear-string second))
+                  (setq success first))
+              (and (arrayp first) (clear-string first))
+              (and (arrayp second) (clear-string second))
+              (message "Password not repeated accurately; please start over")
+              (sit-for 1))))
+        success)
+    (let (minibuf)
+      (minibuffer-with-setup-hook
+          (lambda ()
+            (setq minibuf (current-buffer))
+            ;; Turn off electricity.
+            (set (make-local-variable 'post-self-insert-hook) nil)
+            (add-hook 'after-change-functions
+                      (lambda (beg end _len)
+                        (clear-this-command-keys)
+                        (setq beg (min end (max (minibuffer-prompt-end)
+                                                beg)))
+                        (dotimes (i (- end beg))
+                          (put-text-property (+ i beg) (+ 1 i beg)
+                                             'display (string ?.))))
+                      nil t))
+        (unwind-protect
+            (read-string prompt nil
+                         (let ((sym (make-symbol "forget-history")))
+                           (set sym nil)
+                           sym)
+                         default)
+          (when (buffer-live-p minibuf)
+            (with-current-buffer minibuf (erase-buffer))))))))
 
 ;; This should be used by `call-interactively' for `n' specs.
 (defun read-number (prompt &optional default)
@@ -2336,6 +2307,8 @@ is nil and `use-dialog-box' is non-nil."
         (discard-input))))
     (let ((ret (eq answer 'act)))
       (unless noninteractive
+        ;; FIXME this prints one too many spaces, since prompt
+        ;; already ends in a space.  Eg "... (y or n)  y".
         (message "%s %s" prompt (if ret "y" "n")))
       ret)))
 
@@ -3557,8 +3530,7 @@ of STRING.
 To replace only the first match (if any), make REGEXP match up to \\'
 and replace a sub-expression, e.g.
   (replace-regexp-in-string \"\\\\(foo\\\\).*\\\\'\" \"bar\" \" foo foo\" nil nil 1)
-    => \" bar foo\"
-"
+    => \" bar foo\""
 
   ;; To avoid excessive consing from multiple matches in long strings,
   ;; don't just call `replace-match' continually.  Walk down the
diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el
index 3eb2be15698..7c95f47e0fb 100644
--- a/lisp/tar-mode.el
+++ b/lisp/tar-mode.el
@@ -549,6 +549,7 @@ MODE should be an integer which is a file mode value."
     (define-key map "R" 'tar-rename-entry)
     (define-key map "u" 'tar-unflag)
     (define-key map "v" 'tar-view)
+    (define-key map "w" 'woman-tar-extract-file)
     (define-key map "x" 'tar-expunge)
     (define-key map "\177" 'tar-unflag-backwards)
     (define-key map "E" 'tar-extract-other-window)
@@ -566,6 +567,8 @@ MODE should be an integer which is a file mode value."
     (define-key map [menu-bar immediate]
       (cons "Immediate" (make-sparse-keymap "Immediate")))
 
+    (define-key map [menu-bar immediate woman]
+      '("Read Man Page (WoMan)" . woman-tar-extract-file))
     (define-key map [menu-bar immediate view]
       '("View This File" . tar-view))
     (define-key map [menu-bar immediate display]
@@ -677,6 +680,8 @@ See also: variables `tar-update-datestamp' and `tar-anal-blocksize'.
      (fundamental-mode)
      (signal (car err) (cdr err)))))
 
+(autoload 'woman-tar-extract-file "woman"
+  "In tar mode, run the WoMan man-page browser on this file." t)
 
 (define-minor-mode tar-subfile-mode
   "Minor mode for editing an element of a tar-file.
diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el
index dedbfcbf338..76d03dd164f 100644
--- a/lisp/textmodes/artist.el
+++ b/lisp/textmodes/artist.el
@@ -1197,9 +1197,9 @@ PREV-OP-ARG are used when invoked recursively during the build-up."
 ;;; ---------------------------------
 
 ;;;###autoload
-(defun artist-mode (&optional state)
+(define-minor-mode artist-mode
   "Toggle Artist mode.
-With argument STATE, turn Artist mode on if STATE is positive.
+With argument ARG, turn Artist mode on if ARG is positive.
 Artist lets you draw lines, squares, rectangles and poly-lines,
 ellipses and circles with your mouse and/or keyboard.
 
@@ -1388,36 +1388,24 @@ Variables
 
 Hooks
 
- When entering artist-mode, the hook `artist-mode-init-hook' is called.
- When quitting artist-mode, the hook `artist-mode-exit-hook' is called.
+ Turning the mode on or off runs `artist-mode-hook'.
 
 
 Keymap summary
 
 \\{artist-mode-map}"
-  (interactive)
-  (if (setq artist-mode
-            (if (null state) (not artist-mode)
-              (> (prefix-numeric-value state) 0)))
-      (artist-mode-init)
-    (artist-mode-exit)))
-
-;; insert our minor mode string
-(or (assq 'artist-mode minor-mode-alist)
-    (setq minor-mode-alist
-          (cons '(artist-mode artist-mode-name)
-                minor-mode-alist)))
-
-;; insert our minor mode keymap
-(or (assq 'artist-mode minor-mode-map-alist)
-    (setq minor-mode-map-alist
-          (cons (cons 'artist-mode artist-mode-map)
-                minor-mode-map-alist)))
-
+  :init-value nil :group 'artist :lighter artist-mode-name
+  :keymap artist-mode-map
+  (cond ((null artist-mode)
+         ;; Turn mode off
+         (artist-mode-exit))
+        (t
+         ;; Turn mode on
+         (artist-mode-init))))
 
 ;; Init and exit
 (defun artist-mode-init ()
-  "Init Artist mode.  This will call the hook `artist-mode-init-hook'."
+  "Init Artist mode.  This will call the hook `artist-mode-hook'."
   ;; Set up a conversion table for mapping tabs and new-lines to spaces.
   ;; the last case, 0, is for the last position in buffer/region, where
   ;; the `following-char' function returns 0.
@@ -1459,15 +1447,13 @@ Keymap summary
       (progn
         (picture-mode)
         (message "")))
-  (run-hooks 'artist-mode-init-hook)
   (artist-mode-line-show-curr-operation artist-key-is-drawing))
 
 (defun artist-mode-exit ()
-  "Exit Artist mode.  This will call the hook `artist-mode-exit-hook'."
+  "Exit Artist mode.  This will call the hook `artist-mode-hook'."
   (if (and artist-picture-compatibility (eq major-mode 'picture-mode))
       (picture-mode-exit))
-  (kill-local-variable 'next-line-add-newlines)
-  (run-hooks 'artist-mode-exit-hook))
+  (kill-local-variable 'next-line-add-newlines))
 
 (defun artist-mode-off ()
   "Turn Artist mode off."
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index 08254c6f5f7..d0e90c99516 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -1011,7 +1011,8 @@ space does not end a sentence, so don't break a line there."
                        (if current-prefix-arg 'full))))
   (unless (memq justify '(t nil none full center left right))
     (setq justify 'full))
-  (let (max beg fill-pfx)
+  (let ((start-point (point-marker))
+        max beg fill-pfx)
     (goto-char (max from to))
     (when to-eop
       (skip-chars-backward "\n")
@@ -1042,6 +1043,8 @@ space does not end a sentence, so don't break a line there."
             (setq fill-pfx
                   (fill-region-as-paragraph (point) end justify nosqueeze))
           (goto-char end))))
+    (goto-char start-point)
+    (set-marker start-point nil)
     fill-pfx))
 
 
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index 24967ded154..72a3eb474f8 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -1576,10 +1576,11 @@ The buffer to mark them in is `flyspell-large-region-buffer'."
       (if ispell-encoding8-command
           (setq args
                 (append args
-                        (list
-                         (concat ispell-encoding8-command
-                                 (symbol-name
-                                  encoding))))))
+                        (if ispell-really-hunspell
+                            (list ispell-encoding8-command
+                                  (upcase (symbol-name encoding)))
+                          (list (concat ispell-encoding8-command
+                                        (symbol-name encoding)))))))
 
       (let ((process-coding-system-alist (list (cons "\\.*" encoding))))
         (setq c (apply 'ispell-call-process-region beg
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 74c32817734..53822694698 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -574,12 +574,12 @@ re-start Emacs."
 
 
 (defvar ispell-dictionary-base-alist
-  '((nil
+  '((nil                                ; default
      ;; The default dictionary.  It may be English.aff, or any other
      ;; dictionary depending on locale and such things.  We should probably
      ;; ask ispell what dictionary it's using, but until we do that, let's
-     ;; just use an approximate regexp.
-     "[[:alpha:]]" "[^[:alpha:]]" "[']" nil ("-B") nil iso-8859-1)
+     ;; just use a minimal regexp. [:alpha:] will later be set if possible.
+     "[A-Za-z]" "[^A-Za-z]" "[']" nil ("-B") nil iso-8859-1)
     ("american"                         ; Yankee English
      "[A-Za-z]" "[^A-Za-z]" "[']" nil ("-B") nil iso-8859-1)
     ("brasileiro"                       ; Brazilian mode
@@ -684,7 +684,8 @@ re-start Emacs."
     ("svenska"                          ; Swedish mode
      "[A-Za-z\345\344\366\351\340\374\350\346\370\347\305\304\326\311\300\334\310\306\330\307]"
      "[^A-Za-z\345\344\366\351\340\374\350\346\370\347\305\304\326\311\300\334\310\306\330\307]"
-     "[']" nil ("-C") "~list" iso-8859-1))
+     "[']" nil ("-C") "~list" iso-8859-1)
+    ("hebrew" "[\340\341\342\343\344\345\346\347\350\351\353\352\354\356\355\360\357\361\362\364\363\367\366\365\370\371\372]" "[^\340\341\342\343\344\345\346\347\350\351\353\352\354\356\355\360\357\361\362\364\363\367\366\365\370\371\372]" "" nil ("-B") nil cp1255))
   "Base value for `ispell-dictionary-alist'.")
 
 (defvar ispell-dictionary-alist nil
@@ -766,6 +767,12 @@ here just for backwards compatibility.")
 (make-obsolete-variable 'ispell-aspell-supports-utf8
                         'ispell-encoding8-command "23.1")
 
+(defvar ispell-emacs-alpha-regexp
+  (if (string-match "^[[:alpha:]]+$" "abcde")
+      "[[:alpha:]]"
+    nil)
+  "[[:alpha:]] if Emacs supports [:alpha:] regexp, nil
+otherwise (current XEmacs does not support it).")
 
 ;;; **********************************************************************
 ;;; The following are used by ispell, and should not be changed.
@@ -1091,8 +1098,7 @@ aspell is used along with Emacs).")
                (error nil))
              ispell-really-aspell
              ispell-encoding8-command
-             ;; XEmacs does not like [:alpha:] regexps.
-             (string-match "^[[:alpha:]]+$" "abcde"))
+             ispell-emacs-alpha-regexp)
         (unless ispell-aspell-dictionary-alist
           (ispell-find-aspell-dictionaries)))
 
@@ -1116,8 +1122,27 @@ aspell is used along with Emacs).")
                             ispell-dictionary-base-alist))
         (unless (assoc (car dict) all-dicts-alist)
           (add-to-list 'all-dicts-alist dict)))
-      (setq ispell-dictionary-alist all-dicts-alist))))
-
+      (setq ispell-dictionary-alist all-dicts-alist))
+
+    ;; If Emacs flavor supports [:alpha:] use it for global dicts.  If
+    ;; spellchecker also supports UTF-8 via command-line option use it
+    ;; in communication.  This does not affect definitions in ~/.emacs.
+    (if ispell-emacs-alpha-regexp
+        (let (tmp-dicts-alist)
+          (dolist (adict ispell-dictionary-alist)
+            (add-to-list 'tmp-dicts-alist
+                         (list
+                          (nth 0 adict)  ; dict name
+                          "[[:alpha:]]"  ; casechars
+                          "[^[:alpha:]]" ; not-casechars
+                          (nth 3 adict)  ; otherchars
+                          (nth 4 adict)  ; many-otherchars-p
+                          (nth 5 adict)  ; ispell-args
+                          (nth 6 adict)  ; extended-character-mode
+                          (if ispell-encoding8-command
+                              'utf-8
+                            (nth 7 adict)))))
+          (setq ispell-dictionary-alist tmp-dicts-alist)))))
 
 (defun ispell-valid-dictionary-list ()
   "Return a list of valid dictionaries.
diff --git a/lisp/textmodes/picture.el b/lisp/textmodes/picture.el
index 9e8cbb216d1..191e9f3672b 100644
--- a/lisp/textmodes/picture.el
+++ b/lisp/textmodes/picture.el
@@ -63,15 +63,17 @@
 
 ;; Picture Movement Commands
 
-;; When a cursor is on a wide-column character (e.g. Chinese,
-;; Japanese, Korean), this variable tells the desired current column
-;; which may be different from (current-column).
-(defvar picture-desired-column 0)
-
-;; If the value of picture-desired-column is far from the current
-;; column, or if the arg ADJUST-TO-CURRENT is non-nil, set it to the
-;; current column.   Return the current column.
+(defvar picture-desired-column 0
+  "Desired current column for Picture mode.
+When a cursor is on a wide-column character (e.g. Chinese,
+Japanese, Korean), this may may be different from `current-column'.")
+
+
 (defun picture-update-desired-column (adjust-to-current)
+  "Maybe update `picture-desired-column'.
+If the value of `picture-desired-column' is more than one column
+from `current-column', or if the argument ADJUST-TO-CURRENT is
+non-nil, set it to the current column.  Return `current-column'."
   (let ((current-column (current-column)))
     (if (or adjust-to-current
             (< picture-desired-column (1- current-column))
@@ -240,8 +242,7 @@ Use \"\\[command-apropos] picture-movement\" to see commands which control motio
              (spacing (when (display-graphic-p frame)
                         (or (with-current-buffer (window-buffer window)
                               line-spacing)
-                            (frame-parameter frame 'line-spacing))))
-             rows cols)
+                            (frame-parameter frame 'line-spacing)))))
         (cond ((floatp spacing)
                (setq spacing (truncate (* spacing char-ht))))
               ((null spacing)
@@ -606,64 +607,61 @@ Leaves the region surrounding the rectangle."
 
 (defalias 'picture-delete-char 'delete-char)
 
-(defvar picture-mode-map nil)
-
-(defun picture-substitute (oldfun newfun)
-  (define-key picture-mode-map (vector 'remap oldfun) newfun))
-
-(if (not picture-mode-map)
-    (progn
-      (setq picture-mode-map (make-keymap))
-      (picture-substitute 'self-insert-command 'picture-self-insert)
-      (picture-substitute 'completion-separator-self-insert-command
-                          'picture-self-insert)
-      (picture-substitute 'completion-separator-self-insert-autofilling
-                          'picture-self-insert)
-      (picture-substitute 'forward-char 'picture-forward-column)
-      (picture-substitute 'backward-char 'picture-backward-column)
-      (picture-substitute 'delete-char 'picture-clear-column)
-      ;; There are two possibilities for what is normally on DEL.
-      (picture-substitute 'backward-delete-char-untabify 'picture-backward-clear-column)
-      (picture-substitute 'delete-backward-char 'picture-backward-clear-column)
-      (picture-substitute 'kill-line 'picture-clear-line)
-      (picture-substitute 'open-line 'picture-open-line)
-      (picture-substitute 'newline 'picture-newline)
-      (picture-substitute 'newline-and-indent 'picture-duplicate-line)
-      (picture-substitute 'next-line 'picture-move-down)
-      (picture-substitute 'previous-line 'picture-move-up)
-      (picture-substitute 'move-beginning-of-line 'picture-beginning-of-line)
-      (picture-substitute 'move-end-of-line 'picture-end-of-line)
-      (picture-substitute 'mouse-set-point 'picture-mouse-set-point)
-
-      (define-key picture-mode-map "\C-c\C-d" 'picture-delete-char)
-      (define-key picture-mode-map "\e\t" 'picture-toggle-tab-state)
-      (define-key picture-mode-map "\t" 'picture-tab)
-      (define-key picture-mode-map "\e\t" 'picture-tab-search)
-      (define-key picture-mode-map "\C-c\t" 'picture-set-tab-stops)
-      (define-key picture-mode-map "\C-c\C-k" 'picture-clear-rectangle)
-      (define-key picture-mode-map "\C-c\C-w" 'picture-clear-rectangle-to-register)
-      (define-key picture-mode-map "\C-c\C-y" 'picture-yank-rectangle)
-      (define-key picture-mode-map "\C-c\C-x" 'picture-yank-rectangle-from-register)
-      (define-key picture-mode-map "\C-c\C-r" 'picture-draw-rectangle)
-      (define-key picture-mode-map "\C-c\C-c" 'picture-mode-exit)
-      (define-key picture-mode-map "\C-c\C-f" 'picture-motion)
-      (define-key picture-mode-map "\C-c\C-b" 'picture-motion-reverse)
-      (define-key picture-mode-map "\C-c<" 'picture-movement-left)
-      (define-key picture-mode-map "\C-c>" 'picture-movement-right)
-      (define-key picture-mode-map "\C-c^" 'picture-movement-up)
-      (define-key picture-mode-map "\C-c." 'picture-movement-down)
-      (define-key picture-mode-map "\C-c`" 'picture-movement-nw)
-      (define-key picture-mode-map "\C-c'" 'picture-movement-ne)
-      (define-key picture-mode-map "\C-c/" 'picture-movement-sw)
-      (define-key picture-mode-map "\C-c\\" 'picture-movement-se)
-      (define-key picture-mode-map [(control ?c) left]  'picture-movement-left)
-      (define-key picture-mode-map [(control ?c) right] 'picture-movement-right)
-      (define-key picture-mode-map [(control ?c) up]    'picture-movement-up)
-      (define-key picture-mode-map [(control ?c) down]  'picture-movement-down)
-      (define-key picture-mode-map [(control ?c) home]  'picture-movement-nw)
-      (define-key picture-mode-map [(control ?c) prior] 'picture-movement-ne)
-      (define-key picture-mode-map [(control ?c) end]   'picture-movement-sw)
-      (define-key picture-mode-map [(control ?c) next]  'picture-movement-se)))
+(defvar picture-mode-map
+  (let ((map (make-keymap)))
+    (define-key map [remap self-insert-command] 'picture-self-insert)
+    (define-key map [remap self-insert-command] 'picture-self-insert)
+    (define-key map [remap completion-separator-self-insert-command]
+      'picture-self-insert)
+    (define-key map [remap completion-separator-self-insert-autofilling]
+      'picture-self-insert)
+    (define-key map [remap forward-char] 'picture-forward-column)
+    (define-key map [remap backward-char] 'picture-backward-column)
+    (define-key map [remap delete-char] 'picture-clear-column)
+    ;; There are two possibilities for what is normally on DEL.
+    (define-key map [remap backward-delete-char-untabify]
+      'picture-backward-clear-column)
+    (define-key map [remap delete-backward-char] 'picture-backward-clear-column)
+    (define-key map [remap kill-line] 'picture-clear-line)
+    (define-key map [remap open-line] 'picture-open-line)
+    (define-key map [remap newline] 'picture-newline)
+    (define-key map [remap newline-and-indent] 'picture-duplicate-line)
+    (define-key map [remap next-line] 'picture-move-down)
+    (define-key map [remap previous-line] 'picture-move-up)
+    (define-key map [remap move-beginning-of-line] 'picture-beginning-of-line)
+    (define-key map [remap move-end-of-line] 'picture-end-of-line)
+    (define-key map [remap mouse-set-point] 'picture-mouse-set-point)
+    (define-key map "\C-c\C-d" 'picture-delete-char)
+    (define-key map "\e\t" 'picture-toggle-tab-state)
+    (define-key map "\t" 'picture-tab)
+    (define-key map "\e\t" 'picture-tab-search)
+    (define-key map "\C-c\t" 'picture-set-tab-stops)
+    (define-key map "\C-c\C-k" 'picture-clear-rectangle)
+    (define-key map "\C-c\C-w" 'picture-clear-rectangle-to-register)
+    (define-key map "\C-c\C-y" 'picture-yank-rectangle)
+    (define-key map "\C-c\C-x" 'picture-yank-rectangle-from-register)
+    (define-key map "\C-c\C-r" 'picture-draw-rectangle)
+    (define-key map "\C-c\C-c" 'picture-mode-exit)
+    (define-key map "\C-c\C-f" 'picture-motion)
+    (define-key map "\C-c\C-b" 'picture-motion-reverse)
+    (define-key map "\C-c<" 'picture-movement-left)
+    (define-key map "\C-c>" 'picture-movement-right)
+    (define-key map "\C-c^" 'picture-movement-up)
+    (define-key map "\C-c." 'picture-movement-down)
+    (define-key map "\C-c`" 'picture-movement-nw)
+    (define-key map "\C-c'" 'picture-movement-ne)
+    (define-key map "\C-c/" 'picture-movement-sw)
+    (define-key map "\C-c\\" 'picture-movement-se)
+    (define-key map [(control ?c) left]  'picture-movement-left)
+    (define-key map [(control ?c) right] 'picture-movement-right)
+    (define-key map [(control ?c) up]    'picture-movement-up)
+    (define-key map [(control ?c) down]  'picture-movement-down)
+    (define-key map [(control ?c) home]  'picture-movement-nw)
+    (define-key map [(control ?c) prior] 'picture-movement-ne)
+    (define-key map [(control ?c) end]   'picture-movement-sw)
+    (define-key map [(control ?c) next]  'picture-movement-se)
+    map)
+  "Keymap used in `picture-mode'.")
 
 (defcustom picture-mode-hook nil
   "If non-nil, its value is called on entry to Picture mode.
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index 9472d7df879..af00531137a 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -1492,8 +1492,8 @@ Puts point on a blank line between them."
 
 (defvar latex-complete-bibtex-cache nil)
 
-(defun latex-string-prefix-p (str1 str2)
-  (eq t (compare-strings str1 nil nil str2 0 (length str1))))
+(define-obsolete-function-alias 'latex-string-prefix-p
+  'string-prefix-p "24.2")
 
 (defvar bibtex-reference-key)
 (declare-function reftex-get-bibfile-list "reftex-cite.el" ())
@@ -1507,7 +1507,7 @@ Puts point on a blank line between them."
             keys)
         (if (and (eq (car latex-complete-bibtex-cache)
                      (reftex-get-bibfile-list))
-                 (latex-string-prefix-p (nth 1 latex-complete-bibtex-cache)
+                 (string-prefix-p (nth 1 latex-complete-bibtex-cache)
                                         key))
             ;; Use the cache.
             (setq keys (nth 2 latex-complete-bibtex-cache))
@@ -2051,10 +2051,7 @@ IN can be either a string (with the same % escapes in it) indicating
 OUT describes the output file and is either a %-escaped string
   or nil to indicate that there is no output file.")
 
-;; defsubst* gives better byte-code than defsubst.
-(defsubst* tex-string-prefix-p (str1 str2)
-  "Return non-nil if STR1 is a prefix of STR2"
-  (eq t (compare-strings str2 nil (length str1) str1 nil nil)))
+(define-obsolete-function-alias 'tex-string-prefix-p 'string-prefix-p "24.2")
 
 (defun tex-guess-main-file (&optional all)
   "Find a likely `tex-main-file'.
@@ -2069,7 +2066,7 @@ of the current buffer."
         (with-current-buffer buf
           (when (and (cond
                       ((null all) (equal dir default-directory))
-                      ((eq all 'sub) (tex-string-prefix-p default-directory dir))
+                      ((eq all 'sub) (string-prefix-p default-directory dir))
                       (t))
                      (stringp tex-main-file))
             (throw 'found (expand-file-name tex-main-file)))))
@@ -2078,7 +2075,7 @@ of the current buffer."
         (with-current-buffer buf
           (when (and (cond
                       ((null all) (equal dir default-directory))
-                      ((eq all 'sub) (tex-string-prefix-p default-directory dir))
+                      ((eq all 'sub) (string-prefix-p default-directory dir))
                       (t))
                      buffer-file-name
                      ;; (or (easy-mmode-derived-mode-p 'latex-mode)
diff --git a/lisp/textmodes/two-column.el b/lisp/textmodes/two-column.el
index 40cbbc59292..8a4fe4f87fd 100644
--- a/lisp/textmodes/two-column.el
+++ b/lisp/textmodes/two-column.el
@@ -124,15 +124,51 @@
 
 
 ;;; Code:
-
+(defgroup two-column nil
+  "Minor mode for editing of two-column text."
+  :prefix "2C-"
+  :group 'frames)
+
+(defcustom 2C-mode-line-format
+        '("-%*- %15b --"  (-3 . "%p")  "--%[("  mode-name
+          minor-mode-alist  "%n"  mode-line-process  ")%]%-")
+  "Value of `mode-line-format' for a buffer in two-column minor mode."
+  :type 'sexp
+  :group 'two-column)
+
+(defcustom 2C-other-buffer-hook 'text-mode
+  "Hook run in new buffer when it is associated with current one."
+  :type 'function
+  :group 'two-column)
 
-;; Lucid patch
-(or (fboundp 'frame-width)
-    (fset 'frame-width 'screen-width))
+(defcustom 2C-separator ""
+  "A string inserted between the two columns when merging.
+This gets set locally by \\[2C-split]."
+  :type 'string
+  :group 'two-column)
+(put '2C-separator 'permanent-local t)
+
+(defcustom 2C-window-width 40
+  "The width of the first column.  (Must be at least `window-min-width'.)
+This value is local for every buffer that sets it."
+  :type 'integer
+  :group 'two-column)
+(make-variable-buffer-local '2C-window-width)
+(put '2C-window-width 'permanent-local t)
 
+(defcustom 2C-beyond-fill-column 4
+  "Base for calculating `fill-column' for a buffer in two-column minor mode.
+The value of `fill-column' becomes `2C-window-width' for this buffer
+minus this value."
+  :type 'integer
+  :group 'two-column)
 
-;;;;; Set up keymap ;;;;;
+(defcustom 2C-autoscroll t
+  "If non-nil, Emacs attempts to keep the two column's buffers aligned."
+  :type 'boolean
+  :group 'two-column)
 
+
 (defvar 2C-mode-map
   (let ((map (make-sparse-keymap)))
     (define-key map "2" '2C-two-columns)
@@ -142,8 +178,6 @@
     map)
   "Keymap for commands for setting up two-column mode.")
 
-
-
 ;;;###autoload (autoload '2C-command "two-column" () t 'keymap)
 (fset '2C-command 2C-mode-map)
 
@@ -154,7 +188,6 @@
 
 ;;;###autoload (global-set-key [f2] '2C-command)
 
-
 (defvar 2C-minor-mode-map
   (let ((map (make-sparse-keymap)))
     (define-key map "1" '2C-merge)
@@ -167,7 +200,6 @@
     map)
   "Keymap for commands for use in two-column mode.")
 
-
 (setq minor-mode-map-alist
       (cons (cons '2C-mode
                   (let ((map (make-sparse-keymap)))
@@ -181,15 +213,8 @@
                                                map (current-global-map))
                     map))
             minor-mode-map-alist))
-
-;;;;; variable declarations ;;;;;
-
-(defgroup two-column nil
-  "Minor mode for editing of two-column text."
-  :prefix "2C-"
-  :group 'frames)
-
 
+
 ;; Markers seem to be the only buffer-id not affected by renaming a buffer.
 ;; This nevertheless loses when a buffer is killed.  The variable-name is
 ;; required by `describe-mode'.
@@ -198,62 +223,8 @@
 (make-variable-buffer-local '2C-mode)
 (put '2C-mode 'permanent-local t)
 
-
-
 (setq minor-mode-alist (cons '(2C-mode " 2C") minor-mode-alist))
 
-
-
-;; rearranged, so that the pertinent info will show in 40 columns
-(defcustom 2C-mode-line-format
-        '("-%*- %15b --"  (-3 . "%p")  "--%[("  mode-name
-          minor-mode-alist  "%n"  mode-line-process  ")%]%-")
-  "Value of `mode-line-format' for a buffer in two-column minor mode."
-  :type 'sexp
-  :group 'two-column)
-
-
-(defcustom 2C-other-buffer-hook 'text-mode
-  "Hook run in new buffer when it is associated with current one."
-  :type 'function
-  :group 'two-column)
-
-
-(defcustom 2C-separator ""
-  "A string inserted between the two columns when merging.
-This gets set locally by \\[2C-split]."
-  :type 'string
-  :group 'two-column)
-(put '2C-separator 'permanent-local t)
-
-
-
-(defcustom 2C-window-width 40
-  "The width of the first column.  (Must be at least `window-min-width')
-This value is local for every buffer that sets it."
-  :type 'integer
-  :group 'two-column)
-(make-variable-buffer-local '2C-window-width)
-(put '2C-window-width 'permanent-local t)
-
-
-
-(defcustom 2C-beyond-fill-column 4
-  "Base for calculating `fill-column' for a buffer in two-column minor mode.
-The value of `fill-column' becomes `2C-window-width' for this buffer
-minus this value."
-  :type 'integer
-  :group 'two-column)
-
-
-
-(defcustom 2C-autoscroll t
-  "If non-nil, Emacs attempts to keep the two column's buffers aligned."
-  :type 'boolean
-  :group 'two-column)
-
-
-
 (defvar 2C-autoscroll-start nil)
 (make-variable-buffer-local '2C-autoscroll-start)
 
@@ -276,7 +247,6 @@ minus this value."
       (if req (error "You must first set two-column minor mode"))))
 
 
-
 ;; function for setting up two-column minor mode in a buffer associated
 ;; with the buffer pointed to by the marker other.
 (defun 2C-mode (other)
@@ -320,7 +290,6 @@ The appearance of the screen can be customized by the variables
   (run-hooks '2C-mode-hook))
 
 
-
 ;;;###autoload
 (defun 2C-two-columns (&optional buffer)
   "Split current window vertically for two-column editing.
@@ -356,7 +325,6 @@ first and the associated buffer to its right."
                (other-window -1)))))
 
 
-
 ;;;###autoload
 (defun 2C-associate-buffer ()
   "Associate another buffer with this one in two-column minor mode.
@@ -368,9 +336,8 @@ accepting the proposed default buffer.
   (let ((b1 (current-buffer))
         (b2 (or (2C-other)
                 (read-buffer "Associate buffer: " (other-buffer)))))
-    (save-excursion
-      (setq 2C-mode nil)
-      (set-buffer b2)
+    (setq 2C-mode nil)
+    (with-current-buffer b2
       (and (2C-other)
            (not (eq b1 (2C-other)))
            (error "Buffer already associated with buffer `%s'"
@@ -382,7 +349,6 @@ accepting the proposed default buffer.
     (2C-two-columns b2)))
 
 
-
 ;;;###autoload
 (defun 2C-split (arg)
   "Split a two-column text at point, into two buffers in two-column minor mode.
@@ -454,32 +420,28 @@ First column's text    sSs  Second column's text
         (move-to-column column)))))
 
 
-
-
 (defun 2C-dissociate ()
   "Turn off two-column minor mode in current and associated buffer.
 If the associated buffer is unmodified and empty, it is killed."
   (interactive)
-  (let ((buffer (current-buffer)))
-    (save-excursion
-      (and (2C-other)
-           (set-buffer (2C-other))
-           (or (not (2C-other))
-               (eq buffer (2C-other)))
-           (if (and (not (buffer-modified-p))
-                    (eobp) (bobp))
-               (kill-buffer nil)
-             (kill-local-variable '2C-mode)
-             (kill-local-variable '2C-window-width)
-             (kill-local-variable '2C-separator)
-             (kill-local-variable 'mode-line-format)
-             (kill-local-variable 'fill-column))))
-    (kill-local-variable '2C-mode)
-    (kill-local-variable '2C-window-width)
-    (kill-local-variable '2C-separator)
-    (kill-local-variable 'mode-line-format)
-    (kill-local-variable 'fill-column)))
-
+  (let ((buffer (current-buffer))
+        (other (2C-other)))
+    (if other
+        (with-current-buffer other
+          (when (or (not (2C-other)) (eq buffer (2C-other)))
+            (if (and (not (buffer-modified-p)) (zerop (buffer-size)))
+                (kill-buffer)
+              (kill-local-variable '2C-mode)
+              (kill-local-variable '2C-window-width)
+              (kill-local-variable '2C-separator)
+              (kill-local-variable 'mode-line-format)
+              (kill-local-variable 'fill-column))))))
+  (kill-local-variable '2C-mode)
+  (kill-local-variable '2C-window-width)
+  (kill-local-variable '2C-separator)
+  (kill-local-variable 'mode-line-format)
+  (kill-local-variable 'fill-column)
+  (force-mode-line-update))
 
 
 ;; this doesn't use yank-rectangle, so that the first column can
@@ -578,7 +540,6 @@ on, this also realigns the two buffers."
     (message "Autoscrolling is off.")))
 
 
-
 (defun 2C-autoscroll ()
   (if 2C-autoscroll
       ;; catch a mouse scroll on non-selected scrollbar
@@ -590,27 +551,25 @@ on, this also realigns the two buffers."
               (select-window (car (car (cdr last-command-event)))))
          ;; In some cases scrolling causes an error, but post-command-hook
          ;; shouldn't, and should always stay in the original window
-         (condition-case ()
-             (and (or 2C-autoscroll-start (2C-toggle-autoscroll t) nil)
-                  (/= (window-start) 2C-autoscroll-start)
-                  (2C-other)
-                  (get-buffer-window (2C-other))
-                  (let ((lines (count-lines (window-start)
-                                            2C-autoscroll-start)))
-                    (if (< (window-start) 2C-autoscroll-start)
-                        (setq lines (- lines)))
-                    (setq 2C-autoscroll-start (window-start))
-                    (select-window (get-buffer-window (2C-other)))
-                    ;; make sure that other buffer has enough lines
-                    (save-excursion
-                      (insert-char
-                       ?\n (- lines (count-lines (window-start)
-                                                 (goto-char (point-max)))
-                              -1)))
-                    (scroll-up lines)
-                    (setq 2C-autoscroll-start (window-start))))
-           (error))))))
-
+         (ignore-errors
+           (and (or 2C-autoscroll-start (2C-toggle-autoscroll t) nil)
+                (/= (window-start) 2C-autoscroll-start)
+                (2C-other)
+                (get-buffer-window (2C-other))
+                (let ((lines (count-lines (window-start)
+                                          2C-autoscroll-start)))
+                  (if (< (window-start) 2C-autoscroll-start)
+                      (setq lines (- lines)))
+                  (setq 2C-autoscroll-start (window-start))
+                  (select-window (get-buffer-window (2C-other)))
+                  ;; make sure that other buffer has enough lines
+                  (save-excursion
+                    (insert-char
+                     ?\n (- lines (count-lines (window-start)
+                                               (goto-char (point-max)))
+                            -1)))
+                  (scroll-up lines)
+                  (setq 2C-autoscroll-start (window-start)))))))))
 
 
 (defun 2C-enlarge-window-horizontally (arg)
@@ -628,7 +587,6 @@ on, this also realigns the two buffers."
   (2C-enlarge-window-horizontally (- arg)))
 
 
-
 (provide 'two-column)
 
 ;;; two-column.el ends here
diff --git a/lisp/tmm.el b/lisp/tmm.el
index 2a0d1d3d7de..776e4335376 100644
--- a/lisp/tmm.el
+++ b/lisp/tmm.el
@@ -165,14 +165,13 @@ Its value should be an event that has a binding in MENU."
     ;; tmm-km-list is an alist of (STRING . MEANING).
     ;; It has no other elements.
     ;; The order of elements in tmm-km-list is the order of the menu bar.
-    (mapc (lambda (elt)
-            (cond
-             ((stringp elt) (setq gl-str elt))
-             ((listp elt) (tmm-get-keymap elt not-menu))
-             ((vectorp elt)
-              (dotimes (i (length elt))
-                (tmm-get-keymap (cons i (aref elt i)) not-menu)))))
-          menu)
+    (dolist (elt menu)
+      (cond
+       ((stringp elt) (setq gl-str elt))
+       ((listp elt) (tmm-get-keymap elt not-menu))
+       ((vectorp elt)
+        (dotimes (i (length elt))
+          (tmm-get-keymap (cons i (aref elt i)) not-menu)))))
     ;; Choose an element of tmm-km-list; put it in choice.
     (if (and not-menu (= 1 (length tmm-km-list)))
         ;; If this is the top-level of an x-popup-menu menu,
@@ -313,15 +312,13 @@ Stores a list of all the shortcuts in the free variable `tmm-short-cuts'."
 (defun tmm-define-keys (minibuffer)
   (let ((map (make-sparse-keymap)))
     (suppress-keymap map t)
-    (mapc
-     (lambda (c)
-       (if (listp tmm-shortcut-style)
-           (define-key map (char-to-string c) 'tmm-shortcut)
-         ;; only one kind of letters are shortcuts, so map both upcase and
-         ;; downcase input to the same
-         (define-key map (char-to-string (downcase c)) 'tmm-shortcut)
-         (define-key map (char-to-string (upcase c)) 'tmm-shortcut)))
-     tmm-short-cuts)
+    (dolist (c tmm-short-cuts)
+      (if (listp tmm-shortcut-style)
+          (define-key map (char-to-string c) 'tmm-shortcut)
+        ;; only one kind of letters are shortcuts, so map both upcase and
+        ;; downcase input to the same
+        (define-key map (char-to-string (downcase c)) 'tmm-shortcut)
+        (define-key map (char-to-string (upcase c)) 'tmm-shortcut)))
     (if minibuffer
         (progn
           (define-key map [pageup] 'tmm-goto-completions)
@@ -401,14 +398,13 @@ Stores a list of all the shortcuts in the free variable `tmm-short-cuts'."
               (choose-completion))
           ;; In minibuffer
           (delete-region (minibuffer-prompt-end) (point-max))
-          (mapc (lambda (elt)
-                  (if (string=
-                       (substring (car elt) 0
-                                  (min (1+ (length tmm-mid-prompt))
-                                       (length (car elt))))
-                       (concat (char-to-string c) tmm-mid-prompt))
-                      (setq s (car elt))))
-                  tmm-km-list)
+          (dolist (elt tmm-km-list)
+            (if (string=
+                 (substring (car elt) 0
+                            (min (1+ (length tmm-mid-prompt))
+                                 (length (car elt))))
+                 (concat (char-to-string c) tmm-mid-prompt))
+                (setq s (car elt))))
           (insert s)
           (exit-minibuffer)))))
 
@@ -540,20 +536,16 @@ of `menu-bar-final-items'."
           (setq allbind (cons globalbind (cons localbind minorbind)))
 
           ;; Merge all the elements of ALLBIND into one keymap.
-          (mapc (lambda (in)
-                  (if (and (symbolp in) (keymapp in))
-                      (setq in (symbol-function in)))
-                  (and in (keymapp in)
-                       (if (keymapp bind)
-                           (setq bind (nconc bind (copy-sequence (cdr in))))
-                         (setq bind (copy-sequence in)))))
-                  allbind)
+          (dolist (in allbind)
+            (if (and (symbolp in) (keymapp in))
+                (setq in (symbol-function in)))
+            (and in (keymapp in)
+                 (setq bind (if (keymapp bind)
+                                (nconc bind (copy-sequence (cdr in)))
+                              (copy-sequence in)))))
           ;; Return that keymap.
           bind))))
 
-;; Huh?  What's that about?  --Stef
-(add-hook 'calendar-load-hook (lambda () (require 'cal-menu)))
-
 (provide 'tmm)
 
 ;;; tmm.el ends here
diff --git a/lisp/tutorial.el b/lisp/tutorial.el
index b512700f5b9..e0e2a82fab9 100644
--- a/lisp/tutorial.el
+++ b/lisp/tutorial.el
@@ -585,7 +585,6 @@ with some explanatory links."
            (not (get-text-property (match-beginning 1) 'tutorial-remark))
            (let* ((desc    (car changed-key))
                   (ck      (cdr changed-key))
-                  (key     (nth 0 ck))
                   (def-fun (nth 1 ck))
                   (where   (nth 3 ck))
                   s1 s2 help-string)
@@ -724,7 +723,7 @@ See `tutorial--save-tutorial' for more information."
                            saved-file
                            (error-message-string err))))
             ;; An error is raised here?? Is this a bug?
-            (condition-case err
+            (condition-case nil
                 (undo-only)
               (error nil))
             ;; Restore point
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index d6e25188c69..3c9313e3e7d 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,21 @@
+2012-04-10  William Xu  <william.xwl@gmail.com>  (tiny change)
+
+        * url.el (url-retrieve-internal): Hexify multibye URL string first
+        when necessary (bug#7017).
+
+2012-04-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * url.el (url-retrieve-internal): Mention utf-8 encoding.
+        (url-retrieve): Ditto.
+
+2012-04-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * url-domsurf.el: New file (bug#1401).
+
+        * url-cookie.el (url-cookie-two-dot-domains): Remove.
+        (url-cookie-host-can-set-p): Use `url-domsuf-cookie-allowed-p'
+        instead of the variable above.
+
 2012-03-25  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * url-queue.el (url-queue-kill-job): Check whether the buffer has
diff --git a/lisp/url/url-cookie.el b/lisp/url/url-cookie.el
index e6ff9bf7dea..aefe8fffd0a 100644
--- a/lisp/url/url-cookie.el
+++ b/lisp/url/url-cookie.el
@@ -25,6 +25,7 @@
 
 (require 'url-util)
 (require 'url-parse)
+(require 'url-domsuf)
 
 (eval-when-compile (require 'cl))       ; defstruct
 
@@ -211,14 +212,6 @@ telling Microsoft that."
         (concat retval "\r\n")
       "")))
 
-(defvar url-cookie-two-dot-domains
-  (concat "\\.\\("
-   (mapconcat 'identity (list "com" "edu" "net" "org" "gov" "mil" "int")
-              "\\|")
-   "\\)$")
-  "A regexp of top level domains that only require two matching
-'.'s in the domain name in order to set a cookie.")
-
 (defcustom url-cookie-trusted-urls nil
   "A list of regular expressions matching URLs to always accept cookies from."
   :type '(repeat regexp)
@@ -230,30 +223,18 @@ telling Microsoft that."
   :group 'url-cookie)
 
 (defun url-cookie-host-can-set-p (host domain)
-  (let ((numdots 0)
-        (last nil)
-        (case-fold-search t)
-        (mindots 3))
-    (while (setq last (string-match "\\." domain last))
-      (setq numdots (1+ numdots)
-            last (1+ last)))
-    (if (string-match url-cookie-two-dot-domains domain)
-        (setq mindots 2))
-    (cond
-     ((string= host domain)             ; Apparently netscape lets you do this
-      t)
-     ((>= numdots mindots)              ; We have enough dots in domain name
-      ;; Need to check and make sure the host is actually _in_ the
-      ;; domain it wants to set a cookie for though.
-      (string-match (concat (regexp-quote
-                             ;; Remove the dot from wildcard domains
-                             ;; before matching.
-                             (if (eq ?. (aref domain 0))
-                                 (substring domain 1)
-                               domain))
-                            "$") host))
-     (t
-      nil))))
+  (let ((last nil)
+        (case-fold-search t))
+    (if (string= host domain)   ; Apparently netscape lets you do this
+        t
+      ;; Remove the dot from wildcard domains before matching.
+      (when (eq ?. (aref domain 0))
+        (setq domain (substring domain 1)))
+      (and (url-domsuf-cookie-allowed-p domain)
+           ;; Need to check and make sure the host is actually _in_ the
+           ;; domain it wants to set a cookie for though.
+           (string-match (concat (regexp-quote domain)
+                                 "$") host)))))
 
 (defun url-cookie-handle-set-cookie (str)
   (setq url-cookies-changed-since-last-save t)
diff --git a/lisp/url/url-domsuf.el b/lisp/url/url-domsuf.el
new file mode 100644
index 00000000000..29fc166e30b
--- /dev/null
+++ b/lisp/url/url-domsuf.el
@@ -0,0 +1,98 @@
+;;; url-domsuf.el --- Say what domain names can have cookies set.
+
+;; Copyright (C) 2012 Free Software Foundation, Inc.
+
+;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
+
+;; Keywords: comm, data, processes, hypermedia
+
+;; This file is part of GNU Emacs.
+;;
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; The rules for what domains can have cookies set is defined here:
+;; http://publicsuffix.org/list/
+
+;;; Code:
+
+(defvar url-domsuf-domains nil)
+
+(defun url-domsuf-parse-file ()
+  (with-temp-buffer
+    (insert-file-contents
+     (expand-file-name "publicsuffix.txt" data-directory))
+    (let ((domains nil)
+          domain exception)
+      (while (not (eobp))
+        (when (not (looking-at "[/\n\t ]"))
+          ;; !pref.aichi.jp means that it's allowed.
+          (if (not (eq (following-char) ?!))
+              (setq exception nil)
+            (setq exception t)
+            (forward-char 1))
+          (setq domain (buffer-substring (point) (line-end-position)))
+          (cond
+           ((string-match "\\`\\*\\." domain)
+            (setq domain (substring domain 2))
+            (push (cons domain (1+ (length (split-string domain "[.]"))))
+                  domains))
+           (exception
+            (push (cons domain t) domains))
+           (t
+            (push (cons domain nil) domains))))
+        (forward-line 1))
+      (setq url-domsuf-domains (nreverse domains)))))
+
+(defun url-domsuf-cookie-allowed-p (domain)
+  (unless url-domsuf-domains
+    (url-domsuf-parse-file))
+  (let* ((allowedp t)
+         (domain-bits (split-string domain "[.]"))
+         (length (length domain-bits))
+         (upper-domain (mapconcat 'identity (cdr domain-bits) "."))
+         entry modifier)
+    (dolist (elem url-domsuf-domains)
+      (setq entry (car elem)
+            modifier (cdr elem))
+      (cond
+       ;; "com"
+       ((and (null modifier)
+             (string= domain entry))
+        (setq allowedp nil))
+       ;; "!pref.hokkaido.jp"
+       ((and (eq modifier t)
+             (string= domain entry))
+        (setq allowedp t))
+       ;; "*.ar"
+       ((and (numberp modifier)
+             (= length modifier)
+             (string= entry upper-domain))
+        (setq allowedp nil))))
+    allowedp))
+
+;; Tests:
+
+;; (url-domsuf-cookie-allowed-p "com") => nil
+;; (url-domsuf-cookie-allowed-p "foo.bar.ar") => t
+;; (url-domsuf-cookie-allowed-p "bar.ar") => nil
+;; (url-domsuf-cookie-allowed-p "co.uk") => nil
+;; (url-domsuf-cookie-allowed-p "foo.bar.hokkaido.jo") => t
+;; (url-domsuf-cookie-allowed-p "bar.hokkaido.jp") => nil
+;; (url-domsuf-cookie-allowed-p "pref.hokkaido.jp") => t
+
+(provide 'url-domsuf)
+
+;;; url-domsuf.el ends here
diff --git a/lisp/url/url-util.el b/lisp/url/url-util.el
index 848eb66e54b..d12bd5447fa 100644
--- a/lisp/url/url-util.el
+++ b/lisp/url/url-util.el
@@ -330,8 +330,7 @@ forbidden in URL encoding."
                      " ")
                     (t (byte-to-string code))))
               str (substring str (match-end 0)))))
-    (setq tmp (concat tmp str))
-    tmp))
+    (concat tmp str)))
 
 (defconst url-unreserved-chars
   '(
diff --git a/lisp/url/url.el b/lisp/url/url.el
index 5ced789e4e4..f3ef553bbce 100644
--- a/lisp/url/url.el
+++ b/lisp/url/url.el
@@ -149,7 +149,9 @@ take effect.
 
 If SILENT, then don't message progress reports and the like.
 If INHIBIT-COOKIES, cookies will neither be stored nor sent to
-the server."
+the server.
+If URL is a multibyte string, it will be encoded as utf-8 and
+URL-encoded before it's used."
 ;;; XXX: There is code in Emacs that does dynamic binding
 ;;; of the following variables around url-retrieve:
 ;;; url-standalone-mode, url-gateway-unplugged, w3-honor-stylesheets,
@@ -171,11 +173,16 @@ the list of events, as described in the docstring of `url-retrieve'.
 
 If SILENT, don't message progress reports and the like.
 If INHIBIT-COOKIES, cookies will neither be stored nor sent to
-the server."
+the server.
+If URL is a multibyte string, it will be encoded as utf-8 and
+URL-encoded before it's used."
   (url-do-setup)
   (url-gc-dead-buffers)
   (if (stringp url)
        (set-text-properties 0 (length url) nil url))
+  (when (multibyte-string-p url)
+    (let ((url-unreserved-chars (append '(?: ?/) url-unreserved-chars)))
+      (setq url (url-hexify-string url))))
   (if (not (vectorp url))
       (setq url (url-generic-parse-url url)))
   (if (not (functionp callback))
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index 16e33889c31..8b6b85dd22e 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -545,7 +545,7 @@ but in the file header instead, in which case move forward to the first hunk."
      (condition-case-unless-debug nil (diff-refine-hunk) (error nil))))
 
 (easy-mmode-define-navigation
- diff-file diff-file-header-re "file" diff-end-of-hunk)
+ diff-file diff-file-header-re "file" diff-end-of-file)
 
 (defun diff-restrict-view (&optional arg)
   "Restrict the view to the current hunk.
diff --git a/lisp/vc/pcvs-util.el b/lisp/vc/pcvs-util.el
index b300247e552..a3c525cb896 100644
--- a/lisp/vc/pcvs-util.el
+++ b/lisp/vc/pcvs-util.el
@@ -182,9 +182,7 @@ arguments.  If ARGS is not a list, no argument will be passed."
                           (if oneline (line-end-position) (point-max))))
     (file-error nil)))
 
-(defun cvs-string-prefix-p (str1 str2)
-  "Tell whether STR1 is a prefix of STR2."
-  (eq t (compare-strings str2 nil (length str1) str1 nil nil)))
+(define-obsolete-function-alias 'cvs-string-prefix-p 'string-prefix-p "24.2")
 
 ;;;;
 ;;;; file names
diff --git a/lisp/vc/pcvs.el b/lisp/vc/pcvs.el
index 9ba65cda143..6aec24755b5 100644
--- a/lisp/vc/pcvs.el
+++ b/lisp/vc/pcvs.el
@@ -432,8 +432,8 @@ If non-nil, NEW means to create a new buffer no matter what."
                          (case cvs-reuse-cvs-buffer
                            (always t)
                            (subdir
-                            (or (cvs-string-prefix-p default-directory dir)
-                                (cvs-string-prefix-p dir default-directory)))
+                            (or (string-prefix-p default-directory dir)
+                                (string-prefix-p dir default-directory)))
                            (samedir (string= default-directory dir)))
                          (return buffer)))))
               ;; we really have to create a new buffer:
@@ -887,7 +887,7 @@ RM-MSGS if non-nil means remove messages."
                         (eq (cvs-fileinfo->type last-fi) 'DIRCHANGE)
                         (not (when first-dir (setq first-dir nil) t))
                         (or (eq rm-dirs 'all)
-                            (not (cvs-string-prefix-p
+                            (not (string-prefix-p
                                   (cvs-fileinfo->dir last-fi)
                                   (cvs-fileinfo->dir fi)))
                             (and (eq type 'DIRCHANGE) (eq rm-dirs 'empty))
@@ -1839,7 +1839,7 @@ Signal an error if there is no backup file."
     (setq buffer-file-name (expand-file-name buffer-file-name))
     (let (ret)
       (dolist (fi (or fis (list (cvs-create-fileinfo 'DIRCHANGE "" "." ""))))
-        (when (cvs-string-prefix-p
+        (when (string-prefix-p
                (expand-file-name (cvs-fileinfo->full-name fi) dir)
                buffer-file-name)
           (setq ret t)))
@@ -2261,7 +2261,7 @@ With prefix argument, prompt for cvs flags."
 (defun cvs-dir-member-p (fileinfo dir)
   "Return true if FILEINFO represents a file in directory DIR."
   (and (not (eq (cvs-fileinfo->type fileinfo) 'DIRCHANGE))
-       (cvs-string-prefix-p dir (cvs-fileinfo->dir fileinfo))))
+       (string-prefix-p dir (cvs-fileinfo->dir fileinfo))))
 
 (defun cvs-execute-single-file (fi extractor program constant-args)
   "Internal function for `cvs-execute-single-file-list'."
@@ -2392,7 +2392,7 @@ The exact behavior is determined also by `cvs-dired-use-hook'."
           (set-buffer cvs-buf)
           ;; look for a corresponding pcl-cvs buffer
           (when (and (eq major-mode 'cvs-mode)
-                     (cvs-string-prefix-p default-directory dir))
+                     (string-prefix-p default-directory dir))
             (let ((subdir (substring dir (length default-directory))))
               (set-buffer buffer)
               (set (make-local-variable 'cvs-buffer) cvs-buf)
@@ -2423,7 +2423,7 @@ The exact behavior is determined also by `cvs-dired-use-hook'."
           (set-buffer cvs-buf)
           ;; look for a corresponding pcl-cvs buffer
           (when (and (eq major-mode 'cvs-mode)
-                     (cvs-string-prefix-p default-directory file))
+                     (string-prefix-p default-directory file))
             (let* ((file (substring file (length default-directory)))
                    (fi (cvs-create-fileinfo
                         (if (string= "0" version)
diff --git a/lisp/vc/vc-annotate.el b/lisp/vc/vc-annotate.el
index a1dd807d828..f4964ef85cc 100644
--- a/lisp/vc/vc-annotate.el
+++ b/lisp/vc/vc-annotate.el
@@ -522,12 +522,12 @@ the file in question, search for the log entry required and move point."
              (car rev-at-line) t 1)))))))
 
 (defun vc-annotate-show-diff-revision-at-line-internal (filediff)
-  (if (not (equal major-mode 'vc-annotate-mode))
+  (if (not (derived-mode-p 'vc-annotate-mode))
       (message "Cannot be invoked outside of a vc annotate buffer")
     (let* ((rev-at-line (vc-annotate-extract-revision-at-line))
-          (prev-rev nil)
-          (rev (car rev-at-line))
-          (fname (cdr rev-at-line)))
+           (prev-rev nil)
+           (rev (car rev-at-line))
+           (fname (cdr rev-at-line)))
       (if (not rev-at-line)
           (message "Cannot extract revision number from the current line")
         (setq prev-rev
@@ -535,17 +535,15 @@ the file in question, search for the log entry required and move point."
                                (if filediff fname nil) rev))
         (if (not prev-rev)
             (message "Cannot diff from any revision prior to %s" rev)
-          (save-window-excursion
-            (vc-diff-internal
-             nil
-             ;; The value passed here should follow what
-             ;; `vc-deduce-fileset' returns.
-             (list vc-annotate-backend
-                   (if filediff
-                       (list fname)
-                     nil))
-             prev-rev rev))
-          (switch-to-buffer "*vc-diff*"))))))
+          (vc-diff-internal
+           t
+           ;; The value passed here should follow what
+           ;; `vc-deduce-fileset' returns.
+           (list vc-annotate-backend
+                 (if filediff
+                     (list fname)
+                   nil))
+           prev-rev rev))))))
 
 (defun vc-annotate-show-diff-revision-at-line ()
   "Visit the diff of the revision at line from its previous revision."
diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el
index 798131236d5..505e40f46ba 100644
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -37,7 +37,6 @@
 ;; are bzr-versioned, `vc-bzr` presently runs `bzr status` on the
 ;; symlink, thereby not detecting whether the actual contents
 ;; (that is, the target contents) are changed.
-;; See https://bugs.launchpad.net/vc-bzr/+bug/116607
 
 ;;; Properties of the backend
 
@@ -65,14 +64,6 @@
   :group 'vc-bzr
   :type 'string)
 
-(defcustom vc-bzr-sha1-program '("sha1sum")
-  "Name of program to compute SHA1.
-It must be a string \(program name\) or list of strings \(name and its args\)."
-  :type '(repeat string)
-  :group 'vc-bzr)
-
-(define-obsolete-variable-alias 'sha1-program 'vc-bzr-sha1-program "24.1")
-
 (defcustom vc-bzr-diff-switches nil
   "String or list of strings specifying switches for bzr diff under VC.
 If nil, use the value of `vc-diff-switches'.  If t, use no switches."
@@ -190,20 +181,15 @@ in the repository root directory of FILE."
 (defun vc-bzr-sha1 (file)
   (with-temp-buffer
     (set-buffer-multibyte nil)
-    (let ((prog vc-bzr-sha1-program)
-          (args nil)
-          process-file-side-effects)
-      (when (consp prog)
-        (setq args (cdr prog))
-        (setq prog (car prog)))
-      (apply 'process-file prog (file-relative-name file) t nil args)
-      (buffer-substring (point-min) (+ (point-min) 40)))))
+    (insert-file-contents-literally file)
+    (sha1 (current-buffer))))
 
 (defun vc-bzr-state-heuristic (file)
   "Like `vc-bzr-state' but hopefully without running Bzr."
-  ;; `bzr status' was excruciatingly slow with large histories and
-  ;; pending merges, so try to avoid using it until they fix their
-  ;; performance problems.
+  ;; `bzr status' could be slow with large histories and pending merges,
+  ;; so this tries to avoid calling it if possible.  bzr status is
+  ;; faster now, so this is not as important as it was.
+  ;;
   ;; This function tries first to parse Bzr internal file
   ;; `checkout/dirstate', but it may fail if Bzr internal file format
   ;; has changed.  As a safeguard, the `checkout/dirstate' file is
@@ -299,10 +285,7 @@ in the repository root directory of FILE."
                         'up-to-date)
                        (t 'edited))
                     'unregistered))))
-          ;; Either the dirstate file can't be read, or the sha1
-          ;; executable is missing, or ...
-          ;; In either case, recent versions of Bzr aren't that slow
-          ;; any more.
+          ;; The dirstate file can't be read, or some other problem.
           (error (vc-bzr-state file)))))))
 
 
@@ -417,49 +400,56 @@ string or nil, and STATUS is one of the symbols: `added',
 `ignored', `kindchanged', `modified', `removed', `renamed', `unknown',
 which directly correspond to `bzr status' output, or 'unchanged
 for files whose copy in the working tree is identical to the one
-in the branch repository, or nil for files that are not
-registered with Bzr.
-
-If any error occurred in running `bzr status', then return nil."
+in the branch repository (or whose status not be determined)."
+;; Doc used to also say the following, but AFAICS, it has never been true.
+;;
+;;   ", or nil for files that are not registered with Bzr.
+;;   If any error occurred in running `bzr status', then return nil."
+;;
+;; Rather than returning nil in case of an error, it returns
+;; (unchanged . WARNING).  FIXME unchanged is not the best status to
+;; return in case of error.
   (with-temp-buffer
-    (let ((ret (condition-case nil
-                   (vc-bzr-command "status" t 0 file)
-                 (file-error nil)))     ; vc-bzr-program not found.
-          (status 'unchanged))
-          ;; the only secure status indication in `bzr status' output
-          ;; is a couple of lines following the pattern::
-          ;;   | <status>:
-          ;;   |   <file name>
-          ;; if the file is up-to-date, we get no status report from `bzr',
-          ;; so if the regexp search for the above pattern fails, we consider
-          ;; the file to be up-to-date.
-          (goto-char (point-min))
-          (when (re-search-forward
-                 ;; bzr prints paths relative to the repository root.
-                 (concat "^\\(" vc-bzr-state-words "\\):[ \t\n]+"
-                         (regexp-quote (vc-bzr-file-name-relative file))
-                         ;; Bzr appends a '/' to directory names and
-                         ;; '*' to executable files
-                         (if (file-directory-p file) "/?" "\\*?")
-                         "[ \t\n]*$")
-                 nil t)
-            (lexical-let ((statusword (match-string 1)))
-              ;; Erase the status text that matched.
-              (delete-region (match-beginning 0) (match-end 0))
-              (setq status
-                    (intern (replace-regexp-in-string " " "" statusword)))))
-          (when status
-            (goto-char (point-min))
-            (skip-chars-forward " \n\t") ;Throw away spaces.
-            (cons status
-                  ;; "bzr" will output warnings and informational messages to
-                  ;; stderr; due to Emacs's `vc-do-command' (and, it seems,
-                  ;; `start-process' itself) limitations, we cannot catch stderr
-                  ;; and stdout into different buffers.  So, if there's anything
-                  ;; left in the buffer after removing the above status
-                  ;; keywords, let us just presume that any other message from
-                  ;; "bzr" is a user warning, and display it.
-                  (unless (eobp) (buffer-substring (point) (point-max))))))))
+    ;; This is with-demoted-errors without the condition-case-unless-debug
+    ;; annoyance, which makes it fail during ert testing.
+    (let (err)
+      (condition-case err (vc-bzr-command "status" t 0 file)
+        (error (message "Error: %S" err) nil)))
+    (let ((status 'unchanged))
+      ;; the only secure status indication in `bzr status' output
+      ;; is a couple of lines following the pattern::
+      ;;   | <status>:
+      ;;   |   <file name>
+      ;; if the file is up-to-date, we get no status report from `bzr',
+      ;; so if the regexp search for the above pattern fails, we consider
+      ;; the file to be up-to-date.
+      (goto-char (point-min))
+      (when (re-search-forward
+             ;; bzr prints paths relative to the repository root.
+             (concat "^\\(" vc-bzr-state-words "\\):[ \t\n]+"
+                     (regexp-quote (vc-bzr-file-name-relative file))
+                     ;; Bzr appends a '/' to directory names and
+                     ;; '*' to executable files
+                     (if (file-directory-p file) "/?" "\\*?")
+                     "[ \t\n]*$")
+             nil t)
+        (lexical-let ((statusword (match-string 1)))
+          ;; Erase the status text that matched.
+          (delete-region (match-beginning 0) (match-end 0))
+          (setq status
+                (intern (replace-regexp-in-string " " "" statusword)))))
+      (when status
+        (goto-char (point-min))
+        (skip-chars-forward " \n\t") ;Throw away spaces.
+        (cons status
+              ;; "bzr" will output warnings and informational messages to
+              ;; stderr; due to Emacs's `vc-do-command' (and, it seems,
+              ;; `start-process' itself) limitations, we cannot catch stderr
+              ;; and stdout into different buffers.  So, if there's anything
+              ;; left in the buffer after removing the above status
+              ;; keywords, let us just presume that any other message from
+              ;; "bzr" is a user warning, and display it.
+              (unless (eobp) (buffer-substring (point) (point-max))))))))
 
 (defun vc-bzr-state (file)
   (lexical-let ((result (vc-bzr-status file)))
diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el
index 33611b4eafd..4c32eea2f72 100644
--- a/lisp/vc/vc-dir.el
+++ b/lisp/vc/vc-dir.el
@@ -1,6 +1,6 @@
 ;;; vc-dir.el --- Directory status display under VC
 
-;; Copyright (C) 2007-2012  Free Software Foundation, Inc.
+;; Copyright (C) 2007-2012 Free Software Foundation, Inc.
 
 ;; Author:   Dan Nicolaescu <dann@ics.uci.edu>
 ;; Keywords: vc tools
@@ -556,7 +556,7 @@ If a prefix argument is given, move by that many lines."
       (let ((data (ewoc-data crt))
             (dir (vc-dir-node-directory crt)))
         (and (vc-dir-fileinfo->directory data)
-             (vc-string-prefix-p dir argdir)
+             (string-prefix-p dir argdir)
              (vc-dir-fileinfo->marked data)
              (setq found data))))
     found))
@@ -818,7 +818,7 @@ child files."
                        data)
                   (while
                       (and (setq crt (ewoc-next vc-ewoc crt))
-                           (vc-string-prefix-p dir
+                           (string-prefix-p dir
                                                (progn
                                                  (setq data (ewoc-data crt))
                                                  (vc-dir-node-directory crt))))
@@ -846,7 +846,7 @@ If it is a file, return the corresponding cons for the file itself."
                data)
           (while
               (and (setq crt (ewoc-next vc-ewoc crt))
-                   (vc-string-prefix-p dir (progn
+                   (string-prefix-p dir (progn
                                              (setq data (ewoc-data crt))
                                              (vc-dir-node-directory crt))))
             (unless (vc-dir-fileinfo->directory data)
@@ -878,10 +878,10 @@ If it is a file, return the corresponding cons for the file itself."
         children
         dname)
     ;; Find DIR
-    (while (and crt (not (vc-string-prefix-p
+    (while (and crt (not (string-prefix-p
                           dirname (vc-dir-node-directory crt))))
       (setq crt (ewoc-next vc-ewoc crt)))
-    (while (and crt (vc-string-prefix-p
+    (while (and crt (string-prefix-p
                      dirname
                      (setq dname (vc-dir-node-directory crt))))
       (let ((data (ewoc-data crt)))
@@ -915,7 +915,7 @@ If it is a file, return the corresponding cons for the file itself."
           (if (not (derived-mode-p 'vc-dir-mode))
               (push status-buf drop)
             (let ((ddir default-directory))
-              (when (vc-string-prefix-p ddir file)
+              (when (string-prefix-p ddir file)
                 (if (file-directory-p file)
                     (progn
                       (vc-dir-resync-directory-files file)
diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el
index ec1b127dd19..95c15030953 100644
--- a/lisp/vc/vc-dispatcher.el
+++ b/lisp/vc/vc-dispatcher.el
@@ -537,13 +537,12 @@ editing!"
          (kill-buffer (current-buffer)))))
 
 (declare-function vc-dir-resynch-file "vc-dir" (&optional fname))
-(declare-function vc-string-prefix-p "vc" (prefix string))
 
 (defun vc-resynch-buffers-in-directory (directory &optional keep noquery reset-vc-info)
   "Resync all buffers that visit files in DIRECTORY."
   (dolist (buffer (buffer-list))
     (let ((fname (buffer-file-name buffer)))
-      (when (and fname (vc-string-prefix-p directory fname))
+      (when (and fname (string-prefix-p directory fname))
         (with-current-buffer buffer
           (vc-resynch-buffer fname keep noquery reset-vc-info))))))
 
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index 52e8051342d..a2728268816 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2006-2012 Free Software Foundation, Inc.
 
 ;; Author: Ivan Kanis
+;; Maintainer: FSF
 ;; Keywords: vc tools
 ;; Package: vc
 
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 4cbbf47c2d6..ab7e587eb79 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -1,6 +1,6 @@
 ;;; vc.el --- drive a version-control system from within Emacs
 
-;; Copyright (C) 1992-1998, 2000-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1992-1998, 2000-2012 Free Software Foundation, Inc.
 
 ;; Author:     FSF (see below for full credits)
 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
@@ -847,7 +847,7 @@ been updated to their corresponding values."
        (if (file-directory-p file)
            (dolist (buffer (buffer-list))
              (let ((fname (buffer-file-name buffer)))
-               (when (and fname (vc-string-prefix-p file fname))
+               (when (and fname (string-prefix-p file fname))
                  (push fname flist))))
          (push file flist)))
      ,form
@@ -900,7 +900,7 @@ use."
                (lambda (arg)
                  (message "arg %s" arg)
                  (and (file-directory-p arg)
-                      (vc-string-prefix-p (expand-file-name arg) def-dir)))))))
+                      (string-prefix-p (expand-file-name arg) def-dir)))))))
            (let ((default-directory repo-dir))
         (vc-call-backend bk 'create-repo))
       (throw 'found bk))))
@@ -2809,11 +2809,7 @@ to provide the `find-revision' operation instead."
 
 
 ;; These things should probably be generally available
-
-(defun vc-string-prefix-p (prefix string)
-  (let ((lpref (length prefix)))
-    (and (>= (length string) lpref)
-         (eq t (compare-strings prefix nil nil string nil lpref)))))
+(define-obsolete-function-alias 'vc-string-prefix-p 'string-prefix-p "24.2")
 
 (defun vc-file-tree-walk (dirname func &rest args)
   "Walk recursively through DIRNAME.
diff --git a/lisp/vcursor.el b/lisp/vcursor.el
index 95928ebe87a..19cb7a9df8d 100644
--- a/lisp/vcursor.el
+++ b/lisp/vcursor.el
@@ -656,12 +656,13 @@ another window.  With LEAVE-W, use the current `vcursor-window'."
       (or window-system
           (display-color-p)
           (overlay-put vcursor-overlay 'before-string vcursor-string))
-      (overlay-put vcursor-overlay 'face 'vcursor))
+      (overlay-put vcursor-overlay 'face 'vcursor)
+      ;; 200 is purely an arbitrary "high" number.  See bug#9663.
+      (overlay-put vcursor-overlay 'priority 200))
     (or leave-w (vcursor-find-window nil t))
     ;; vcursor-window now contains the right buffer
     (or (pos-visible-in-window-p pt vcursor-window)
-        (set-window-point vcursor-window pt)))
-  )
+        (set-window-point vcursor-window pt))))
 
 (defun vcursor-insert (text)
   "Insert TEXT, respecting `vcursor-interpret-input'."
diff --git a/lisp/version.el b/lisp/version.el
index a4bc4fd54a6..d7fb05ea465 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -81,28 +81,45 @@ to the system configuration; look at `system-configuration' instead."
 
 ;; Set during dumping, this is a defvar so that it can be setq'd.
 (defvar emacs-bzr-version nil "\
-String giving the bzr revision number from which this Emacs was built.
-This is nil if Emacs was not built from a bzr checkout, or if we could
+String giving the bzr revision from which this Emacs was built.
+Value is the bzr revision number and a revision ID separated by a blank.
+Value is nil if Emacs was not built from a bzr checkout, or if we could
 not determine the revision.")
 
-(defun emacs-bzr-get-version () "\
+(defun emacs-bzr-get-version (&optional dir) "\
 Try to return as a string the bzr revision number of the Emacs sources.
-Returns nil if the sources do not seem to be under bzr, or if we could
+Value is the bzr revision number and a revision ID separated by a blank.
+Value is nil if the sources do not seem to be under bzr, or if we could
 not determine the revision.  Note that this reports on the current state
-of the sources, which may not correspond to the running Emacs."
-  (let ((file (expand-file-name ".bzr/branch/last-revision" source-directory)))
-    (if (file-readable-p file)
-        (with-temp-buffer
-          (insert-file-contents file)
-          (goto-char (point-max))
-          (if (looking-back "\n")
-              (delete-char -1))
-          (buffer-string)))))
+of the sources, which may not correspond to the running Emacs.
+
+Optional argument DIR is a directory to use instead of `source-directory'."
+  (or dir (setq dir source-directory))
+  (when (file-directory-p (setq dir (expand-file-name ".bzr/branch" dir)))
+    (let (file loc)
+      (cond ((file-readable-p
+              (setq file (expand-file-name "last-revision" dir)))
+             (with-temp-buffer
+               (insert-file-contents file)
+               (goto-char (point-max))
+               (if (looking-back "\n")
+                   (delete-char -1))
+               (buffer-string)))
+            ;; OK, no last-revision.  Is it a lightweight checkout?
+            ((file-readable-p
+              (setq file (expand-file-name "location" dir)))
+             ;; If the parent branch is local, try looking there for the revid.
+             (if (setq loc (with-temp-buffer
+                             (insert-file-contents file)
+                             (if (looking-at "file://\\(.*\\)")
+                                 (match-string 1))))
+                 (emacs-bzr-get-version loc)))
+            ;; Could fall back to eg `bzr testament' at this point.
+            ))))
 
 ;; We put version info into the executable in the form that `ident' uses.
-(or (eq system-type 'windows-nt)
-    (purecopy (concat "\n$Id: " (subst-char-in-string ?\n ?\s (emacs-version))
-                      " $\n")))
+(purecopy (concat "\n$Id: " (subst-char-in-string ?\n ?\s (emacs-version))
+                  " $\n"))
 
 ;; Local Variables:
 ;; version-control: never
diff --git a/lisp/window.el b/lisp/window.el
index c9e2469b0d2..c148f5ee01f 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -514,17 +514,19 @@ window).")
   (if (window-valid-p ignore) (eq window ignore) ignore))
 
 (defun window-min-size (&optional window horizontal ignore)
-  "Return the minimum number of lines of WINDOW.
+  "Return the minimum size of WINDOW.
 WINDOW can be an arbitrary window and defaults to the selected
 one.  Optional argument HORIZONTAL non-nil means return the
-minimum number of columns of WINDOW.
+minimum number of columns of WINDOW; otherwise return the minimum
+number of WINDOW's lines.
 
-Optional argument IGNORE non-nil means ignore any restrictions
+Optional argument IGNORE, if non-nil, means ignore restrictions
 imposed by fixed size windows, `window-min-height' or
-`window-min-width' settings.  IGNORE equal `safe' means live
+`window-min-width' settings.  If IGNORE equals `safe', live
 windows may get as small as `window-safe-min-height' lines and
-`window-safe-min-width' columns.  IGNORE a window means ignore
-restrictions for that window only."
+`window-safe-min-width' columns.  If IGNORE is a window, ignore
+restrictions for that window only.  Any other non-nil value
+means ignore all of the above restrictions for all windows."
   (window--min-size-1
    (window-normalize-window window) horizontal ignore))
 
@@ -614,12 +616,13 @@ columns.  If WINDOW cannot be shrunk by -DELTA lines or columns,
 return the minimum value in the range DELTA..0 by which WINDOW
 can be shrunk.
 
-Optional argument IGNORE non-nil means ignore any restrictions
+Optional argument IGNORE non-nil means ignore restrictions
 imposed by fixed size windows, `window-min-height' or
-`window-min-width' settings.  IGNORE equal `safe' means live
+`window-min-width' settings.  If IGNORE equals `safe', live
 windows may get as small as `window-safe-min-height' lines and
-`window-safe-min-width' columns.  IGNORE any window means ignore
-restrictions for that window only."
+`window-safe-min-width' columns.  If IGNORE is a window, ignore
+restrictions for that window only.  Any other non-nil value means
+ignore all of the above restrictions for all windows."
   (setq window (window-normalize-window window))
   (cond
    ((< delta 0)
@@ -734,20 +737,21 @@ window.  Return zero if WINDOW cannot be shrunk.
 Optional argument HORIZONTAL non-nil means return number of
 columns by which WINDOW can be shrunk.
 
-Optional argument IGNORE non-nil means ignore any restrictions
+Optional argument IGNORE non-nil means ignore restrictions
 imposed by fixed size windows, `window-min-height' or
-`window-min-width' settings.  IGNORE a window means ignore
-restrictions for that window only.  IGNORE equal `safe' means
+`window-min-width' settings.  If IGNORE is a window, ignore
+restrictions for that window only.  If IGNORE equals `safe',
 live windows may get as small as `window-safe-min-height' lines
-and `window-safe-min-width' columns.
+and `window-safe-min-width' columns.  Any other non-nil value
+means ignore all of the above restrictions for all windows.
 
-Optional argument TRAIL `before' means only windows to the left
-of or above WINDOW can be enlarged.  Optional argument TRAIL
-`after' means only windows to the right of or below WINDOW can be
-enlarged.
+Optional argument TRAIL restricts the windows that can be enlarged.
+If its value is `before', only windows to the left of or above WINDOW
+can be enlarged.  If it is `after', only windows to the right of or
+below WINDOW can be enlarged.
 
 Optional argument NOUP non-nil means don't go up in the window
-tree but try to enlarge windows within WINDOW's combination only.
+tree, but try to enlarge windows within WINDOW's combination only.
 
 Optional argument NODOWN non-nil means don't check whether WINDOW
 itself (and its child windows) can be shrunk; check only whether
@@ -808,24 +812,25 @@ at least one other window can be enlarged appropriately."
           (window--max-delta-1 parent delta horizontal ignore trail))))))
 
 (defun window-max-delta (&optional window horizontal ignore trail noup nodown)
-  "Return maximum number of lines WINDOW by which WINDOW can be enlarged.
+  "Return maximum number of lines by which WINDOW can be enlarged.
 WINDOW can be an arbitrary window and defaults to the selected
 window.  The return value is zero if WINDOW cannot be enlarged.
 
 Optional argument HORIZONTAL non-nil means return maximum number
 of columns by which WINDOW can be enlarged.
 
-Optional argument IGNORE non-nil means ignore any restrictions
+Optional argument IGNORE non-nil means ignore restrictions
 imposed by fixed size windows, `window-min-height' or
-`window-min-width' settings.  IGNORE a window means ignore
-restrictions for that window only.  IGNORE equal `safe' means
+`window-min-width' settings.  If IGNORE is a window, ignore
+restrictions for that window only.  If IGNORE equals `safe',
 live windows may get as small as `window-safe-min-height' lines
-and `window-safe-min-width' columns.
+and `window-safe-min-width' columns.  Any other non-nil value means
+ignore all of the above restrictions for all windows.
 
-Optional argument TRAIL `before' means only windows to the left
-of or below WINDOW can be shrunk.  Optional argument TRAIL
-`after' means only windows to the right of or above WINDOW can be
-shrunk.
+Optional argument TRAIL restricts the windows that can be enlarged.
+If its value is `before', only windows to the left of or above WINDOW
+can be enlarged.  If it is `after', only windows to the right of or
+below WINDOW can be enlarged.
 
 Optional argument NOUP non-nil means don't go up in the window
 tree but try to obtain the entire space from windows within
@@ -860,12 +865,13 @@ columns.  If WINDOW cannot be shrunk by -DELTA lines or columns,
 return the minimum value in the range DELTA..0 that can be used
 for shrinking WINDOW.
 
-Optional argument IGNORE non-nil means ignore any restrictions
+Optional argument IGNORE non-nil means ignore restrictions
 imposed by fixed size windows, `window-min-height' or
-`window-min-width' settings.  IGNORE a window means ignore
-restrictions for that window only.  IGNORE equal `safe' means
+`window-min-width' settings.  If IGNORE is a window, ignore
+restrictions for that window only.  If IGNORE equals `safe',
 live windows may get as small as `window-safe-min-height' lines
-and `window-safe-min-width' columns.
+and `window-safe-min-width' columns.  Any other non-nil value
+means ignore all of the above restrictions for all windows.
 
 Optional argument TRAIL `before' means only windows to the left
 of or below WINDOW can be shrunk.  Optional argument TRAIL
@@ -916,17 +922,18 @@ columns.  If WINDOW cannot be shrunk by -DELTA lines or columns,
 return the minimum value in the range DELTA..0 that can be used
 for shrinking WINDOW.
 
-Optional argument IGNORE non-nil means ignore any restrictions
+Optional argument IGNORE non-nil means ignore restrictions
 imposed by fixed size windows, `window-min-height' or
-`window-min-width' settings.  IGNORE a window means ignore
-restrictions for that window only.  IGNORE equal `safe' means
+`window-min-width' settings.  If IGNORE is a window, ignore
+restrictions for that window only.  If IGNORE equals `safe',
 live windows may get as small as `window-safe-min-height' lines
-and `window-safe-min-width' columns."
+and `window-safe-min-width' columns.  Any other non-nil value
+means ignore all of the above restrictions for all windows."
   (setq window (window-normalize-window window))
   (window--resizable window delta horizontal ignore))
 
 (defun window-total-size (&optional window horizontal)
-  "Return the total height or width of window WINDOW.
+  "Return the total height or width of WINDOW.
 If WINDOW is omitted or nil, it defaults to the selected window.
 
 If HORIZONTAL is omitted or nil, return the total height of
@@ -941,7 +948,7 @@ the total width, in columns, like `window-total-width'."
 
 ;; See discussion in bug#4543.
 (defun window-full-height-p (&optional window)
-  "Return t if WINDOW is as high as the containing frame.
+  "Return t if WINDOW is as high as its containing frame.
 More precisely, return t if and only if the total height of
 WINDOW equals the total height of the root window of WINDOW's
 frame.  WINDOW can be any window and defaults to the selected
@@ -951,7 +958,7 @@ one."
      (window-total-size (frame-root-window window))))
 
 (defun window-full-width-p (&optional window)
-  "Return t if WINDOW is as wide as the containing frame.
+  "Return t if WINDOW is as wide as its containing frame.
 More precisely, return t if and only if the total width of WINDOW
 equals the total width of the root window of WINDOW's frame.
 WINDOW can be any window and defaults to the selected one."
@@ -1115,7 +1122,7 @@ SIDE can be any of the symbols `left', `top', `right' or
   "Return window in DIRECTION as seen from WINDOW.
 DIRECTION must be one of `above', `below', `left' or `right'.
 WINDOW must be a live window and defaults to the selected one.
-IGNORE, when non-nil means a window can be returned even if its
+IGNORE non-nil means a window can be returned even if its
 `no-other-window' parameter is non-nil."
   (setq window (window-normalize-window window t))
   (unless (memq direction '(above below left right))
@@ -1420,7 +1427,7 @@ windows."
 (defun window--resize-mini-window (window delta)
   "Resize minibuffer window WINDOW by DELTA lines.
 If WINDOW cannot be resized by DELTA lines make it as large (or
-as small) as possible but don't signal an error."
+as small) as possible, but don't signal an error."
   (when (window-minibuffer-p window)
     (let* ((frame (window-frame window))
            (root (frame-root-window frame))
@@ -1461,12 +1468,13 @@ horizontally by DELTA columns.  In this case a positive DELTA
 means enlarge WINDOW by DELTA columns.  DELTA negative means
 WINDOW shall be shrunk by -DELTA columns.
 
-Optional argument IGNORE non-nil means ignore any restrictions
+Optional argument IGNORE non-nil means ignore restrictions
 imposed by fixed size windows, `window-min-height' or
-`window-min-width' settings.  IGNORE any window means ignore
-restrictions for that window only.  IGNORE equal `safe' means
+`window-min-width' settings.  If IGNORE is a window, ignore
+restrictions for that window only.  If IGNORE equals `safe',
 live windows may get as small as `window-safe-min-height' lines
-and `window-safe-min-width' columns.
+and `window-safe-min-width' columns.  Any other non-nil value
+means ignore all of the above restrictions for all windows.
 
 This function resizes other windows proportionally and never
 deletes any windows.  If you want to move only the low (right)
@@ -1516,9 +1524,9 @@ HORIZONTAL non-nil means set the new normal width of these
 windows.  WINDOW specifies a child window of PARENT that has been
 resized by THIS-DELTA lines (columns).
 
-Optional argument TRAIL either 'before or 'after means set values
-for windows before or after WINDOW only.  Optional argument
-OTHER-DELTA a number specifies that this many lines (columns)
+Optional argument TRAIL either `before' or `after' means set values
+only for windows before or after WINDOW.  Optional argument
+OTHER-DELTA, a number, specifies that this many lines (columns)
 have been obtained from (or returned to) an ancestor window of
 PARENT in order to resize WINDOW."
   (let* ((delta-normal
@@ -1618,12 +1626,13 @@ be a horizontally combined internal window.
 WINDOW, if specified, must denote a child window of PARENT that
 is resized by DELTA lines.
 
-Optional argument IGNORE non-nil means ignore any restrictions
+Optional argument IGNORE non-nil means ignore restrictions
 imposed by fixed size windows, `window-min-height' or
-`window-min-width' settings.  IGNORE equal `safe' means live
+`window-min-width' settings.  If IGNORE equals `safe', live
 windows may get as small as `window-safe-min-height' lines and
-`window-safe-min-width' columns.  IGNORE any window means ignore
-restrictions for that window only.
+`window-safe-min-width' columns.  If IGNORE is a window, ignore
+restrictions for that window only.  Any other non-nil value means
+ignore all of the above restrictions for all windows.
 
 Optional arguments TRAIL and EDGE, when non-nil, restrict the set
 of windows that shall be resized.  If TRAIL equals `before',
@@ -1790,12 +1799,13 @@ Optional argument HORIZONTAL non-nil means resize other windows
 when WINDOW is resized horizontally by DELTA columns.  WINDOW
 itself is not resized by this function.
 
-Optional argument IGNORE non-nil means ignore any restrictions
+Optional argument IGNORE non-nil means ignore restrictions
 imposed by fixed size windows, `window-min-height' or
-`window-min-width' settings.  IGNORE equal `safe' means live
+`window-min-width' settings.  If IGNORE equals `safe', live
 windows may get as small as `window-safe-min-height' lines and
-`window-safe-min-width' columns.  IGNORE any window means ignore
-restrictions for that window only.
+`window-safe-min-width' columns.  If IGNORE is a window, ignore
+restrictions for that window only.  Any other non-nil value means
+ignore all of the above restrictions for all windows.
 
 Optional arguments TRAIL and EDGE, when non-nil, refine the set
 of windows that shall be resized.  If TRAIL equals `before',
@@ -1891,12 +1901,13 @@ preferably only resize windows adjacent to EDGE."
 Optional argument HORIZONTAL non-nil means resize WINDOW
 horizontally by DELTA columns.
 
-Optional argument IGNORE non-nil means ignore any restrictions
+Optional argument IGNORE non-nil means ignore restrictions
 imposed by fixed size windows, `window-min-height' or
-`window-min-width' settings.  IGNORE equal `safe' means live
+`window-min-width' settings.  If IGNORE equals `safe', live
 windows may get as small as `window-safe-min-height' lines and
-`window-safe-min-width' columns.  IGNORE any window means ignore
-restrictions for that window only.
+`window-safe-min-width' columns.  If IGNORE is a window, ignore
+restrictions for that window only.  Any other non-nil value
+means ignore all of the above restrictions for all windows.
 
 Optional argument ADD non-nil means add DELTA to the new total
 size of WINDOW.
@@ -1986,7 +1997,7 @@ any windows."
 Optional argument HORIZONTAL non-nil means move WINDOW's right
 edge by DELTA columns.  WINDOW defaults to the selected window.
 
-If DELTA is greater zero, then move the edge downwards or to the
+If DELTA is greater than zero, move the edge downwards or to the
 right.  If DELTA is less than zero, move the edge upwards or to
 the left.  If the edge can't be moved by DELTA lines or columns,
 move it as far as possible in the desired direction."
@@ -2091,7 +2102,7 @@ move it as far as possible in the desired direction."
           (error "Failed adjusting window %s" window)))))))
 
 (defun enlarge-window (delta &optional horizontal)
-  "Make selected window DELTA lines taller.
+  "Make the selected window DELTA lines taller.
 Interactively, if no argument is given, make the selected window
 one line taller.  If optional argument HORIZONTAL is non-nil,
 make selected window wider by DELTA columns.  If DELTA is
@@ -2112,7 +2123,7 @@ Return nil."
      horizontal))))
 
 (defun shrink-window (delta &optional horizontal)
-  "Make selected window DELTA lines smaller.
+  "Make the selected window DELTA lines smaller.
 Interactively, if no argument is given, make the selected window
 one line smaller.  If optional argument HORIZONTAL is non-nil,
 make selected window narrower by DELTA columns.  If DELTA is
@@ -3643,7 +3654,11 @@ specific buffers."
                      (scroll-bars . ,(window-scroll-bars window))
                      (vscroll . ,(window-vscroll window))
                      (dedicated . ,(window-dedicated-p window))
-                     (point . ,(if writable point (copy-marker point)))
+                     (point . ,(if writable point
+                                 (copy-marker point
+                                              (buffer-local-value
+                                               'window-point-insertion-type
+                                               buffer))))
                      (start . ,(if writable start (copy-marker start)))))))))
          (tail
           (when (memq type '(vc hc))
@@ -5439,7 +5454,7 @@ A value of t means point moves to the beginning or the end of the buffer
 \(depending on scrolling direction) when no more scrolling possible.
 When point is already on that position, then signal an error."
   :type 'boolean
-  :group 'scrolling
+  :group 'windows
   :version "24.1")
 
 (defun scroll-up-command (&optional arg)
diff --git a/lisp/woman.el b/lisp/woman.el
index c76399a96e5..3ab06a5dd73 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -1,6 +1,6 @@
 ;;; woman.el --- browse UN*X manual pages `wo (without) man'
 
-;; Copyright (C) 2000-2012  Free Software Foundation, Inc.
+;; Copyright (C) 2000-2012 Free Software Foundation, Inc.
 
 ;; Author: Francis J. Wright <F.J.Wright@qmul.ac.uk>
 ;; Maintainer: FSF
@@ -1595,14 +1595,6 @@ Also make each path-info component into a list.
       (woman-process-buffer)
       (goto-char (point-min)))))
 
-;; There is currently no `tar-mode-hook' so use ...
-(eval-after-load "tar-mode"
-  '(progn
-    (define-key tar-mode-map "w" 'woman-tar-extract-file)
-    (define-key-after (lookup-key tar-mode-map [menu-bar immediate])
-      [woman] '("Read Man Page (WoMan)" . woman-tar-extract-file) 'view)))
-
-
 (defvar woman-last-file-name nil
   "The full pathname of the last file formatted by WoMan.")
 
@@ -2141,7 +2133,7 @@ European characters."
             (copy-sequence standard-display-table)
           (make-display-table)))
   ;; Display the following internal chars correctly:
-  (aset buffer-display-table woman-unpadded-space-char [?\ ])
+  (aset buffer-display-table woman-unpadded-space-char [?\s])
   (aset buffer-display-table woman-escaped-escape-char [?\\]))
 
 
@@ -2401,10 +2393,12 @@ Currently set only from '\" t in the first line of the source file.")
         (progn
           (goto-char from)
           (while (search-forward woman-escaped-escape-string nil t)
-            (delete-char -1) (insert ?\\))
+            (delete-char -1)
+            (insert ?\\))
           (goto-char from)
           (while (search-forward woman-unpadded-space-string nil t)
-            (delete-char -1) (insert ?\ ))))
+            (delete-char -1)
+            (insert ?\s))))
 
     ;; Must return the new end of file if used in format-alist.
     (point-max)))
@@ -2445,9 +2439,9 @@ Preserves location of `point'."
             ;; first backwards then forwards:
             (while (and
                     (<= (setq N (1+ N)) 0)
-                    (cond ((memq (preceding-char) '(?\  ?\t))
+                    (cond ((memq (preceding-char) '(?\s ?\t))
                            (delete-char -1) t)
-                          ((memq (following-char) '(?\  ?\t))
+                          ((memq (following-char) '(?\s ?\t))
                            (delete-char 1) t)
                           (t nil))))
             (if (<= N 0)
@@ -3384,7 +3378,7 @@ Ignore the default face and underline only word characters."
 ;; this used to be globally bound to nil, to avoid an error.  Instead
 ;; we can use bound-and-true-p in woman-translate.
 (defvar woman-translations)
-;; A list of the form (\"[ace]\" (a . b) (c . d) (e . ?\ )) or nil.
+;; A list of the form (\"[ace]\" (a . b) (c . d) (e . ?\s)) or nil.
 
 (defun woman-get-next-char ()
   "Return and delete next char in buffer, including special chars."
@@ -3719,7 +3713,9 @@ expression in parentheses.  Leaves point after the value."
                              (setq fn 'woman2-format-paragraphs))))
                ()
              ;; Find next control line:
-             (set-marker to (woman-find-next-control-line))
+             (if (equal woman-request "TS")
+                 (set-marker to (woman-find-next-control-line "TE"))
+               (set-marker to (woman-find-next-control-line)))
              ;; Call the appropriate function:
              (funcall fn to)))
       (if (not (eobp))                  ; This should not happen, but ...
@@ -3730,12 +3726,13 @@ expression in parentheses.  Leaves point after the value."
       (fset 'insert-and-inherit insert-and-inherit)
       (set-marker to nil))))
 
-(defun woman-find-next-control-line ()
-  "Find and return start of next control line."
-;  (let ((to (save-excursion
-;             (re-search-forward "^\\." nil t))))
-;    (if to (1- to) (point-max)))
-  (let (to)
+(defun woman-find-next-control-line (&optional pat)
+  "Find and return start of next control line.
+PAT, if non-nil, specifies an additional component of the control
+line regexp to search for, which is appended to the default
+regexp, \"\\(\\\\c\\)?\\n[.']\"."
+  (let ((pattern (concat "\\(\\\\c\\)?\n[.']" pat))
+        to)
     (save-excursion
       ;; Must handle
       ;; ...\c
@@ -3744,12 +3741,14 @@ expression in parentheses.  Leaves point after the value."
       ;; BEWARE THAT THIS CODE MAY BE UNRELIABLE!!!!!
       (while
           (and
-           (setq to (re-search-forward "\\(\\\\c\\)?\n[.']" nil t))
+           (setq to (re-search-forward pattern nil t))
            (match-beginning 1)
            (looking-at "br"))
         (goto-char (match-beginning 0))
         (woman-delete-line 2)))
-    (if to (1- to) (point-max))))
+    (if to
+        (- to (+ 1 (length pat)))
+      (point-max))))
 
 (defun woman2-PD (to)
   ".PD d -- Set the interparagraph distance to d.
@@ -3893,18 +3892,18 @@ Leave 1 blank line.  Format paragraphs upto TO."
                    (insert (substring overlap i eol))
                    (setq i (or eol imax)))
                  )
-                ((eq c ?\ )             ; skip
+                ((eq c ?\s)             ; skip
                  (forward-char))
                 ((eq c ?\t)             ; skip
                  (if (eq (following-char) ?\t)
                      (forward-char)     ; both tabs, just skip
                    (dotimes (i woman-tab-width)
                      (if (eolp)
-                         (insert ?\ )   ; extend line
+                         (insert ?\s)   ; extend line
                        (forward-char)) ; skip
                      )))
                 (t
-                 (if (or (eq (following-char) ?\ ) ; overwrite OK
+                 (if (or (eq (following-char) ?\s) ; overwrite OK
                          overwritten) ; warning only once per ".sp -"
                      ()
                    (setq overwritten t)
@@ -4408,7 +4407,7 @@ tab stop columns or pairs (COLUMN . TYPE) where TYPE is R or C."
                     tab (- tab (if (eq type ?C) (/ n 2) n))) )
           (setq n (- tab (current-column)))
           (insert-char ?\s n))
-      (insert ?\ ))))
+      (insert ?\s))))
 
 (defun woman2-DT (to)
   ".DT -- Restore default tabs.  Format paragraphs upto TO.
@@ -4426,7 +4425,7 @@ Needs doing properly!"
   (if (eolp)
       (woman-delete-whole-line)         ; ignore!
     (let ((delim (following-char))
-          (pad ?\ ) end)                ; pad defaults to space
+          (pad ?\s) end)                ; pad defaults to space
       (forward-char)
       (skip-chars-forward " \t")
       (or (eolp) (setq pad (following-char)))
@@ -4457,8 +4456,6 @@ Needs doing properly!"
 (defun woman2-TS (to)
   ".TS -- Start of table code for the tbl processor.
 Format paragraphs upto TO."
-  ;; This is a preliminary hack that seems to suffice for lilo.8.
-  (woman-delete-line 1)                 ; ignore any arguments
   (when woman-emulate-tbl
     ;; Assumes column separator is \t and intercolumn spacing is 3.
     ;; The first line may optionally be a list of options terminated by
@@ -4470,6 +4467,22 @@ Format paragraphs upto TO."
     (woman-delete-line 1)
     ;; For each column, find its width and align it:
     (let ((start (point)) (col 1))
+      (WoMan-log "%s" (buffer-substring start (+ start 40)))
+      ;; change T{ T} to tabs
+      (while (search-forward "T{\n" to t)
+        (replace-match "")
+        (catch 'end
+          (while (search-forward "\n" to t)
+            (replace-match " ")
+            (if (looking-at "T}")
+                (progn
+                  (delete-char 2)
+                  (throw 'end t))))))
+      (goto-char start)
+      ;; strip space and headers
+      (while (re-search-forward "^\\.TH\\|\\.sp" to t)
+        (woman-delete-whole-line))
+      (goto-char start)
       (while (prog1 (search-forward "\t" to t) (goto-char start))
         ;; Find current column width:
         (while (< (point) to)
@@ -4483,8 +4496,25 @@ Format paragraphs upto TO."
         (while (< (point) to)
           (when (search-forward "\t" to t)
             (delete-char -1)
-            (insert-char ?\  (- col (current-column))))
+            (insert-char ?\s (- col (current-column))))
           (forward-line))
+        (goto-char start))
+      ;; find maximum width
+      (let ((max-col 0))
+        (while (search-forward "\n" to t)
+          (backward-char)
+          (if (> (current-column) max-col)
+              (setq max-col (current-column)))
+          (forward-char))
+        (goto-char start)
+        ;; break lines if they are too long
+        (when (and (> max-col woman-fill-column)
+                   (> woman-fill-column col))
+          (setq max-col woman-fill-column)
+          (woman-break-table col to start)
+          (goto-char start))
+        (while (re-search-forward "^_$" to t)
+          (replace-match (make-string max-col ?_)))
         (goto-char start))))
   ;; Format table with no filling or adjusting (cf. woman2-nf):
   (setq woman-nofill t)
@@ -4494,6 +4524,17 @@ Format paragraphs upto TO."
   ;; ".TE -- End of table code for the tbl processor."
   ;; Turn filling and adjusting back on.
 
+(defun woman-break-table (start-column to start)
+  (while (< (point) to)
+    (move-to-column woman-fill-column)
+    (if (eolp)
+        (forward-line)
+      (if (and (search-backward " " start t)
+               (> (current-column) start-column))
+          (progn
+            (insert-char ?\n 1)
+            (insert-char ?\s (- start-column 5)))
+        (forward-line)))))
 
 ;;; WoMan message logging:
 
@@ -4531,7 +4572,7 @@ IGNORED is a string appended to the log message."
          (buffer-substring (point)
                            (line-end-position))))
     (if (and (> (length tail) 0)
-             (/= (string-to-char tail) ?\ ))
+             (/= (string-to-char tail) ?\s))
         (setq tail (concat " " tail)))
     (WoMan-log-1
      (concat "**  " request tail "  request " ignored))))