]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from trunk.
authorMartin Rudalics <rudalics@gmx.at>
Fri, 7 Jan 2011 11:22:11 +0000 (12:22 +0100)
committerMartin Rudalics <rudalics@gmx.at>
Fri, 7 Jan 2011 11:22:11 +0000 (12:22 +0100)
39 files changed:
1  2 
doc/lispref/ChangeLog
doc/lispref/buffers.texi
doc/lispref/display.texi
lisp/ChangeLog
lisp/bindings.el
lisp/bookmark.el
lisp/cus-edit.el
lisp/cus-start.el
lisp/dired.el
lisp/electric.el
lisp/eshell/eshell.el
lisp/files.el
lisp/frame.el
lisp/gnus/ChangeLog
lisp/gnus/message.el
lisp/info.el
lisp/isearch.el
lisp/loadup.el
lisp/mail/sendmail.el
lisp/minibuffer.el
lisp/progmodes/compile.el
lisp/progmodes/ebrowse.el
lisp/progmodes/etags.el
lisp/progmodes/inf-lisp.el
lisp/progmodes/python.el
lisp/progmodes/vhdl-mode.el
lisp/replace.el
lisp/shell.el
lisp/simple.el
lisp/term/ns-win.el
src/ChangeLog
src/buffer.c
src/dispnew.c
src/frame.c
src/print.c
src/w32fns.c
src/window.c
src/window.h
src/xdisp.c

index f62ffb0d0ef54f251f6f1f7c392f6dc861fec0a7,7307d7fab4fafc59ef4797075c715d9f7f6bb085..c81b91d872c87b39b83a62d116556ae87c98efff
@@@ -1,9 -1,93 +1,99 @@@
+ 2011-01-02  Eli Zaretskii  <eliz@gnu.org>
+       * modes.texi (Emulating Mode Line): Fix last change.
+ 2011-01-02  Eli Zaretskii  <eliz@gnu.org>
+       * modes.texi (Emulating Mode Line): Update documentation of
+       format-mode-line according to changes that fixed bug #7587.
+ 2010-12-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * modes.texi (Derived Modes): Mention prog-mode.
+       * keymaps.texi (Simple Menu Items, Extended Menu Items): Remove mention
+       of the key-binding-data cache since we don't use it any more.
+ 2010-12-13  Eli Zaretskii  <eliz@gnu.org>
+       * processes.texi (Shell Arguments):
+       * strings.texi (Creating Strings): Don't mention "shell commands";
+       make it explicit that `split-string-and-unquote' and
+       `combine-and-quote-strings' are mainly for working with arguments
+       to call-process and start-process.
+       * processes.texi (Shell Arguments): Fix documentation of
+       `split-string-and-unquote'.  Add indexing.  (Bug#7563)
+ 2010-12-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * modes.texi (Auto-Indentation): New section to document SMIE.
+       (Major Mode Conventions):
+       * text.texi (Mode-Specific Indent): Refer to it.
+ 2010-12-13  Eli Zaretskii  <eliz@gnu.org>
+       * display.texi (Other Display Specs): Document left-fringe and
+       right-fringe display specs.
+ 2010-12-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * backups.texi (Making Backups):
+       * modes.texi (Example Major Modes): Use recommended coding style.
+       (Major Mode Basics, Derived Modes): Encourge more strongly use of
+       define-derived-mode.  Mention completion-at-point-functions.
+ 2010-12-13  Chong Yidong  <cyd@stupidchicken.com>
+       * nonascii.texi (Converting Representations):
+       Document byte-to-string.
+ 2010-12-08  Glenn Morris  <rgm@gnu.org>
+       * buffers.texi (Modification Time):
+       verify-visited-file-modtime now defaults to the current buffer.
+ 2010-11-27  Chong Yidong  <cyd@stupidchicken.com>
+       * nonascii.texi (Converting Representations): Document byte-to-string.
+       * strings.texi (Creating Strings): Don't mention semi-obsolete
+       function char-to-string.
+       (String Conversion): Shorten discussion of semi-obsolete function
+       string-to-char.  Link to Converting Representations.
+       * objects.texi (Symbol Type):
+       * text.texi (Near Point):
+       * help.texi (Help Functions):
+       * functions.texi (Mapping Functions): Use string instead of
+       char-to-string in examples.
+ 2010-11-27  Chong Yidong  <cyd@stupidchicken.com>
+       * text.texi (Kill Functions, Kill Functions)
+       (Low-Level Kill Ring, Low-Level Kill Ring): Remove obsolete
+       YANK-HANDLER args.
+       * symbols.texi (Creating Symbols): Using unintern without an
+       obarray arg is now obsolete.
+       * numbers.texi (Float Basics): Document float-e and float-pi.
+       * variables.texi (Defining Variables): Change "pi" example to
+       "float-pi".
+ 2010-11-26  Eli Zaretskii  <eliz@gnu.org>
+       * commands.texi (Click Events): Document the values of X, Y and
+       COL, ROW in the event's position, when the click is on the header
+       or mode line, on the fringes, or in the margins.
 +2010-11-19  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * windows.texi (Displaying Buffers): Document
 +      display-buffer-function revival and the -same-frame,
 +      -other-window-same-frame postfixed functions.
 +
  2010-11-17  Eli Zaretskii  <eliz@gnu.org>
  
        * customize.texi (Composite Types): Lower-case index entry.
index 0f3fa693a3169560e342581c523d069a33b62731,8811178fe92952fd987c54e255a2bc46d8477b92..4427bce9b6f931e9a7cad82b1d91c193468150e1
@@@ -1,10 -1,11 +1,11 @@@
  @c -*-texinfo-*-
  @c This is part of the GNU Emacs Lisp Reference Manual.
  @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, 2002,
- @c   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+ @c   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+ @c   Free Software Foundation, Inc.
  @c See the file elisp.texi for copying conditions.
  @setfilename ../../info/buffers
 -@node Buffers, Windows, Backups and Auto-Saving, Top
 +@node Buffers, Frames, Backups and Auto-Saving, Top
  @chapter Buffers
  @cindex buffer
  
Simple merge
diff --cc lisp/ChangeLog
index 240bf04b10fe96f04522916f60b88d4bd6381222,faec22993faf5bbd5bbef5bc99740be8da39a4f7..d9d3ed72d75ba67006b1b978de859a84e3a11682
+ 2011-01-07  Glenn Morris  <rgm@gnu.org>
+       * Makefile.in (EMACSOPT): Add --no-site-lisp.
+ 2011-01-06  Ken Manheimer  <ken.manheimer@gmail.com>
+       * allout.el (allout-back-to-current-heading): Ensure return to
+       the visible containing topic, rather than a collapsed one.
+       (allout-view-change-hook): Remove hook that was deprecated long ago.
+       (allout-exposure-change-hook): Remove documentation remarks
+       concerning removed allout-view-change-hook.
+       (allout-flag-region): Remove invocation of and documentation
+       remarks concerning allout-view-change-hook.
+ 2011-01-06  Glenn Morris  <rgm@gnu.org>
+       * vc/vc-bzr.el (vc-bzr-annotate-command, vc-bzr-annotate-time)
+       (vc-bzr-annotate-extract-revision-at-line):
+       Handle authors with embedded spaces.  (Bug#7792)
+ 2011-01-05  Tassilo Horn  <tassilo@member.fsf.org>
+       * doc-view.el (doc-view-image-width): New variable.
+       (doc-view-enlarge, doc-view-insert-image): Prefer imagemagick
+       backend for PNG images, and do dynamic rescaling instead of
+       reconverting the whole doc.
+ 2011-01-05  Glenn Morris  <rgm@gnu.org>
+       * emacs-lisp/rx.el (rx-repeat): Replace CL function.
+ 2011-01-04  Ken Manheimer  <ken.manheimer@gmail.com>
+       * allout.el: Reconcile with changes in line movement behavior for
+       long text lines that cross more than a single physical window
+       line, ie when truncate-lines is nil.
+       (allout-next-visible-heading): Provide for change in line-move
+       behavior on long lines when truncate-lines is nil.  In that case,
+       line-move can wind up on the same textual line when it moves to
+       the next window line, and moving to the bullet position after the
+       move yields zero advancement.  Add logic to detect and compensate
+       for the lack of progress.
+       (allout-current-topic-collapsed-p): move-end-of-line respect for
+       field boundaries is different when operating with body lines
+       shorter than window width versus ones greater than window width,
+       which can yield false negatives in this function.  Avoid
+       difference by applying move-end-of-line while field-text-motion is
+       inhibited.
+ 2011-01-04  Glenn Morris  <rgm@gnu.org>
+       * textmodes/rst.el (rst-compile-toolsets):
+       Add pdf and s5 to option alist.
+ 2011-01-04  Jan Moringen  <jan.moringen@uni-bielefeld.de>
+       * net/dbus.el (dbus-register-property): Added optional parameter
+       dont-register-service.  Updated docstring accordingly.
+ 2011-01-04  Andreas Schwab  <schwab@linux-m68k.org>
+       * textmodes/rst.el (rst-compile-pdf-preview)
+       (rst-compile-slides-preview): Remove extra line.
+ 2011-01-04  Glenn Morris  <rgm@gnu.org>
+       * textmodes/rst.el (rst-compile-toolsets): Make it a defcustom.
+       Add `pdf' and `s5' entries.  Use `prog.py' if found, otherwise
+       default to `prog' without a .py extension.
+       (rst-compile-pdf-preview, rst-compile-slides-preview):
+       Use program names from rst-compile-toolsets, rather than hard-coding.
+       (rst-portable-mark-active-p): Fix presumed typo.
+ 2011-01-02  Eli Zaretskii  <eliz@gnu.org>
+       * term/w32-win.el (dynamic-library-alist): Set up correctly for
+       libpng versions both before and after 1.4.0.  (Bug#7716)
+ 2011-01-02  Eli Zaretskii  <eliz@gnu.org>
+       * time.el (display-time-mode): Mention display-time-interval in
+       the doc string.  (Bug#7713)
+ 2011-01-02  Kenichi Handa  <handa@m17n.org>
+       * mail/rmailmm.el (rmail-mime-parse): Perform parsing in
+       condition-case and return an error message string if something
+       goes wrong.
+       (rmail-show-mime): Adjust for the above change.  Insert the
+       header by rmail-mime-insert-header.
+ 2011-01-02  Kenichi Handa  <handa@m17n.org>
+       * mail/rmailmm.el: New key bindings for rmail-mime-next-item,
+       rmail-mime-previous-item, and rmail-mime-toggle-hidden.
+       (rmail-mime-mbox-buffer)
+       (rmail-mime-view-buffer, rmail-mime-coding-system): New variables.
+       (rmail-mime-entity): Argument changed.  All codes handling an
+       entity object are changed.
+       (rmail-mime-entity-header, rmail-mime-entity-body): Adjust for
+       the above change.
+       (rmail-mime-entity-children, rmail-mime-entity-handler)
+       (rmail-mime-entity-tagline): New functions.
+       (rmail-mime-message-p): New function.
+       (rmail-mime-save): Bind rmail-mime-mbox-buffer.
+       (rmail-mime-entity-segment, rmail-mime-next-item)
+       (rmail-mime-previous-item, rmail-mime-shown-mode)
+       (rmail-mime-hidden-mode, rmail-mime-raw-mode)
+       (rmail-mime-toggle-raw, rmail-mime-toggle-hidden)
+       (rmail-mime-insert-tagline, rmail-mime-insert-header):
+       New functions.
+       (rmail-mime-text-handler): Call rmail-mime-insert-text.
+       (rmail-mime-insert-decoded-text): New function.
+       (rmail-mime-insert-text): Call rmail-mime-insert-decoded-text.
+       (rmail-mime-insert-image): Argument changed.  Caller changed.
+       (rmail-mime-image): Call rmail-mime-toggle-hidden.
+       (rmail-mime-set-bulk-data): New funciton.
+       (rmail-mime-insert-bulk): Argument changed.
+       (rmail-mime-multipart-handler): Return t.
+       (rmail-mime-process-multipart): Argument changed.
+       Handle "multipart/alternative" here.
+       (rmail-mime-process): Argument changed.
+       (rmail-mime-parse): Bind rmail-mime-mbox-buffer.
+       (rmail-mime-insert): Argument changed.  Handle raw display mode.
+       (rmail-mime): Argument changed.  Handle toggling of raw display
+       mode.
+       (rmail-show-mime): Bind rmail-mime-mbox-buffer and
+       rmail-mime-view-buffer.
+       (rmail-insert-mime-forwarded-message): Likewise.
+       (rmail-search-mime-message): Likewise.  Don't bind rmail-buffer.
+       * mail/rmail.el (rmail-show-message-1): If rmail-enable-mime is
+       non-nil, handle the header in rmail-show-mime-function.
+ 2011-01-02  Leo  <sdl.web@gmail.com>
+       * help-fns.el (describe-variable): Fix previous change.
+ 2011-01-02  Juri Linkov  <juri@jurta.org>
+       * isearch.el (isearch-lazy-highlight-error): New variable.
+       (isearch-lazy-highlight-new-loop): Compare `isearch-error' and
+       `isearch-lazy-highlight-error'.  Set `isearch-lazy-highlight-error'
+       to the current value of `isearch-error' (Bug#7468).
+ 2011-01-02  Chong Yidong  <cyd@stupidchicken.com>
+       * help-fns.el (describe-variable): Don't emit trailing whitespace
+       (Bug#7511).
+ 2011-01-02  Chong Yidong  <cyd@stupidchicken.com>
+       * textmodes/rst.el (rst-compile-pdf-preview)
+       (rst-compile-slides-preview): Use make-temp-file (Bug#7646).
+ 2011-01-02  Kevin Gallagher  <Kevin.Gallagher@boeing.com>
+       * emulation/edt-mapper.el: Override mapping of function keys so
+       that the later call to read-key-sequence works.
+ 2011-01-02  Eli Zaretskii  <eliz@gnu.org>
+       * mail/smtpmail.el (smtpmail-send-it): Write queued mail body with
+       Unix EOLs.  (Bug#7589)
+ 2011-01-02  Leo  <sdl.web@gmail.com>
+       * eshell/em-hist.el (eshell-previous-matching-input): Signal error
+       if point is not behind eshell-last-output-end (Bug#7585).
+ 2011-01-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * files.el (file-local-variables-alist):
+       Make permanent-local (bug#7767).
+ 2011-01-02  Glenn Morris  <rgm@gnu.org>
+       * version.el (emacs-copyright): Set short copyright year to 2011.
+ 2011-01-02  Mark Lillibridge  <mark.lillibridge@hp.com>  (tiny change)
+       * mail/mail-utils.el (mail-strip-quoted-names): Avoid clobbering
+       an existing temp buffer.  (Bug#7746)
+ 2011-01-02  Glenn Morris  <rgm@gnu.org>
+       * mail/mail-utils.el (mail-mbox-from): Handle From: headers with
+       multiple addresses.  (Bug#7760)
+ 2011-01-01  Ken Manheimer  <ken.manheimer@gmail.com>
+       * allout.el (allout-auto-fill): Do not infinitely recurse - use
+       do-auto-fill if everything points back to allout-auto-fill.
+       (allout-mode-deactivate-hook): Declare obsolete, in favor of
+       standard-formed minor-mode deactivate hook, allout-mode-off-hook.
+ 2010-12-31  Michael Albinus  <michael.albinus@gmx.de>
+       * net/tramp-sh.el (tramp-methods): Add recursive options to "scpc"
+       and "scpx".
+ 2010-12-30  Tassilo Horn  <tassilo@member.fsf.org>
+       * doc-view.el (doc-view-set-doc-type): New function refactored
+       from doc-view-mode.
+       (doc-view-fallback-mode): New function.
+       (doc-view-mode): Use it.
+       (doc-view-mode-maybe): New function that checks if doc-view-mode
+       can be used and falls back to the next best mode otherwise.
+       * files.el (auto-mode-alist): Use doc-view-mode-maybe for PDF,
+       DVI, OpenDocument, and MS Office files.
+ 2010-12-30  Andreas Schwab  <schwab@linux-m68k.org>
+       * emacs-lisp/rx.el (rx-syntax): Fix typo.
+ 2010-12-30  Tassilo Horn  <tassilo@member.fsf.org>
+       * doc-view.el (doc-view-toggle-display): Perform rassq-delete-all
+       on a copy of auto-mode-alist, because that deletes with side
+       effects.
+ 2010-12-30  Tassilo Horn  <tassilo@member.fsf.org>
+       * doc-view.el (doc-view-mode, doc-view-toggle-display): Use
+       normal-mode without doc-view-mode bindings in auto-mode-alist as
+       fallback instead of hard coding fundamental mode.
+ 2010-12-30  Tassilo Horn  <tassilo@member.fsf.org>
+       * doc-view.el (doc-view-doc->txt): Handle OpenDocument (or MS
+       Office) files also for searching.
+ 2010-12-30  Tassilo Horn  <tassilo@member.fsf.org>
+       * doc-view.el: Implement viewing of OpenDocument (and Microsoft
+       Office) files.  Not yet enabled via auto-mode-list.
+       (doc-view-unoconv-program): New custom variable.
+       (doc-view-mode-p): Handle new odf document type.
+       (doc-view-odf->pdf): New conversion function.
+       (doc-view-convert-current-doc): Call it for odf files.
+       (doc-view-mode): Recognize newly supported file extensions.
+ 2010-12-30  Michael Albinus  <michael.albinus@gmx.de>
+       * net/tramp.el (tramp-default-method-alist)
+       (tramp-default-user-alist)
+       (tramp-local-host-regexp, tramp-prefix-domain-format)
+       (tramp-prefix-domain-regexp): Set tramp-autoload cookie.
+       * net/tramp-ftp.el:
+       * net/tramp-gvfs.el:
+       * net/tramp-gw.el:
+       * net/tramp-imap.el:
+       * net/tramp-sh.el:
+       * net/tramp-smb.el: Add tramp-autoload cookie for initialisation
+       code of `tramp-default-method-alist' and `tramp-default-user-alist'.
+ 2010-12-29  Karl Fogel  <kfogel@red-bean.com>
+       * saveplace.el (save-place-alist-to-file): Save list sorted and
+       pretty-printed, so that it is mergeable by line-based text merging,
+       as suggested by Iain Dalton <iain.dalton {_AT_} gmail.com>.
+ 2010-12-28  Ken Manheimer  <ken.manheimer@gmail.com>
+       * allout.el (allout-v18/19-file-var-hack): Obsolete, remove.
+       (allout-mode): Argument "toggle" => "force".
+       Refine the docstring.
+       Remove special provisions for reactivation, besides the 'force'
+       argument.
+       Consolidate layout provisions coce directly into the activation
+       condition branch, now that we've removed those provisions.
+       (allout-unload-function): Explicitly activate the mode before
+       deactivating, if it's initially deactivated.
+       (allout-set-buffer-multibyte): Properly prevent byte-compiler
+       warnings for version of function used only where
+       set-buffer-multibyte is unavailable.
+ 2010-12-28  Chong Yidong  <cyd@stupidchicken.com>
+       * tool-bar.el (tool-bar-setup): Remove :enable conditions, which
+       are handled by the menu-bar entries.  As before, don't use
+       :visibile to avoid changing the tool-bar.
+ 2010-12-27  Michael Albinus  <michael.albinus@gmx.de>
+       * net/secrets.el (secrets-delete-alias): New defun.
+ 2010-12-27  Michael Albinus  <michael.albinus@gmx.de>
+       * net/tramp.el (tramp-default-user-alist): Do not add "ssh" based
+       methods, otherwise ~/.ssh/config would be ignored.
+ 2010-12-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * emacs-lisp/rx.el: Make it a superset of sregex.
+       (rx-constituents): Add `any => "."', mark `repeat' as taking any number
+       of args, add `regex' alias.
+       (rx-info): Add arg to distinguish head and standalone forms.
+       (rx-check, rx-form): Pass the corresponding arg.
+       (rx-**): Simplify.
+       (rx-repeat): Make it work for any number of args.
+       (rx-syntax): Make it accept syntax chars as is.
+       * obsolete/sregex.el: Move from emacs-lisp/.
+       * emacs-lisp/re-builder.el: Remove sregex support.
+       * emacs-lisp/edebug.el (sregexq, rx): Remove redundant defs.
+ 2010-12-25  Eli Zaretskii  <eliz@gnu.org>
+       * mouse.el (mouse-yank-primary): On MS-Windows, try the (emulated)
+       PRIMARY first, then the clipboard.  (Bug#7699)
+ 2010-12-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * emacs-lisp/bytecomp.el (byte-compile-output-docform): Fix up use of
+       print-number-table.
+ 2010-12-21  Chong Yidong  <cyd@stupidchicken.com>
+       * help-fns.el (find-lisp-object-file-name): Locate .emacs from
+       .emacs.elc (Bug#7530).
+       * wid-edit.el (widget-image-find): Remove bogus :ascent spec from
+       image spec (Bug#7480).
+ 2010-12-21  Daiki Ueno  <ueno@unixuser.org>
+       * obsolete/pgg-parse.el, obsolete/pgg-pgp5.el, obsolete/pgg-pgp.el,
+       * obsolete/pgg-gpg.el, obsolete/pgg-def.el, obsolete/pgg.el:
+       Move from lisp/.
+ 2010-12-20  Leo  <sdl.web@gmail.com>
+       * dnd.el (dnd-get-local-file-name): Unhex of file name shall
+       always be performed (Bug#7680).
+ 2010-12-20  Chong Yidong  <cyd@stupidchicken.com>
+       * menu-bar.el (menu-bar-kill-ring-save): Make obsolete.
+       (menu-bar-edit-menu): Bind "Copy" to kill-ring-save.  Don't use
+       mouse-region-match.
+       * color.el: Move from gnus/.
+       * vc/diff.el (diff-better-file-name): Function deleted.
+       abbreviating file names causes problems with shell-quote-argument.
+       (diff-no-select): Just use expand-file-name.
+       * tool-bar.el (tool-bar--image-expression): New function.
+       (tool-bar-local-item, tool-bar--image-exp): Use it.
+       (tool-bar-setup): Initialize tool-bar-separator-image-expression.
+       Use :enable instead of :visible to avoid changing the tool-bar
+       configuration unnecessarily.
+       * info.el (info-tool-bar-map): Add separators.
+ 2010-12-17  Ken Brown  <kbrown@cornell.edu>
+       * loadup.el: Use version numbers in Cygwin build.
+ 2010-12-17  Ryan Twitchell  <metatheorem@gmail.com>  (tiny change)
+       * ido.el (ido-file-internal): Ask for confirmation before
+       overwriting an existing file (Bug#1238).
+ 2010-12-16  Chong Yidong  <cyd@stupidchicken.com>
+       * tool-bar.el (tool-bar-setup): Add separators.
+       * menu-bar.el (featurep): Use menu-bar-separator.
+ 2010-12-16  Ken Manheimer  <ken.manheimer@gmail.com>
+       Migrate allout encryption provisions from pgg to epg.
+       * allout.el (allout-toggle-current-subtree-encryption)
+       (allout-toggle-subtree-encryption): Adjust docstrings to reflect
+       defaulting policy and other changes.  Change fetch-pass to keymode-cue,
+       for simpler universal argument interpretation.
+       (allout-toggle-subtree-encryption):  Adjust docstring to describe
+       changed encryption provisions.  Change fetch-pass to keymode-cue, for
+       simpler universal argument interpretation.  Remove provisions for
+       handling key type and identity - they'll all be within
+       allout-encrypt-string or epg/epg or even contained all the way in gpg.
+       (allout-encrypt-string): Include keymode-cue, for optionally prompting
+       for keypair recipients (universal argument > 1) and, in addition,
+       associating the specified recipients with the outline (universal
+       argument > 4) using a file local variable setting for
+       'epa-file-encrypt-to'.
+       Require epa, for recipients handling.
+       Change how regexp filtering elements are named.
+       Describe the problem with caching of incorrect symmetric-decryption
+       keys.
+       Use the epa-passphrase-callback-function, in case the user is using
+       GnuPG v1.
+       Support saving of the selected keypair recipients when invoked with a
+       keymode-cue > 4.
+       Remove obsolete arguments 'fetch-pass', 'target-cache-id', 'retried'.
+       Require 'epa.
+       Establish epg-context with armoring and default epg-protocol.
+       Remove all passphrase cache, verification, and hinting code.
+       (allout-passphrase-verifier-handling, allout-passphrase-hint-handling):
+       No longer used, delete.
+       (allout-mode): Adjust docstring to describe changed encryption
+       provisions.  Describe the problem with caching of incorrect
+       symmetric-decryption keys.
+       (allout-obtain-passphrase, allout-epg-passphrase-callback-function)
+       (allout-make-passphrase-state, allout-passphrase-state-passphrase)
+       (allout-encrypted-key-info, allout-update-passphrase-mnemonic-aids)
+       (allout-get-encryption-passphrase-verifier, allout-verify-passphrase):
+       Obsolete, remove.
+ 2010-12-16  Daiki Ueno  <ueno@unixuser.org>
+       * epa-file.el (epa-file-select-keys): Accept 'silent to inhibit
+       key selection prompt; make 'silent as default (Bug#7487).
+ 2010-12-16  Leo  <sdl.web@gmail.com>
+       * eshell/eshell.el (eshell-directory-name): Use
+       locate-user-emacs-file (Bug#7578).
+ 2010-12-15  Glenn Morris  <rgm@gnu.org>
+       * loadup.el (symbol-file-load-history-loaded): Remove; unused.
+ 2010-12-15  Jari Aalto  <jari.aalto@cante.net>
+             Scott Evans <gse@antisleep.com>
+       * rect.el (rectange--default-line-number-format)
+       (rectangle-number-line-callback): New functions.
+       (rectangle-number-lines): New command, bound to C-x r N (Bug#4382).
+ 2010-12-15  Chong Yidong  <cyd@stupidchicken.com>
+       * rect.el (operate-on-rectangle-lines, string-rectangle-string):
+       Delete unused variables.
+       (move-to-column-force): Remove function obsolete since 21.2.
+ 2010-12-14  Michael Albinus  <michael.albinus@gmx.de>
+       * net/tramp.el (tramp-temp-buffer-file-name): Make it permanent-local.
+       (tramp-handle-insert-file-contents): Do not set permanent-local
+       property.
+       * net/tramp-cache.el (tramp-persistency-file-name): Use
+       `locate-user-emacs-file' if fboundp.
+       * net/tramp-sh.el (tramp-methods): Add "ksu".
+       (tramp-default-user-alist): Add "ksu".  Use `regexp-opt' for
+       method list.
+ 2010-12-14  Glenn Morris  <rgm@gnu.org>
+       * progmodes/js.el: Doc't require font-lock, etags, or easymenu.
+       (find-tag-marker-ring): Declare.
+       (js-find-symbol): Require etags.
+       * mail/sendmail.el: Don't require rmail or mailalias when compiling.
+       Require mail-utils.
+       (mail-alias-file): Don't autoload.  Doc fix.
+       (mail-bury-selects-summary, mail-send-nonascii): Don't autoload.
+       (mail-mailer-swallows-blank-line): Default to nil.  Doc fix.
+       Mark as obsolete, and risky.
+       (mail-setup): Simplify.
+       * mail/mailalias.el (build-mail-aliases): Make it interactive.
+       * mail/sendmail.el (build-mail-aliases): Update autoload.
+       * dired.el (dired-trivial-filenames, dired-chown-program)
+       (dired-auto-revert-buffer): Remove autoload cookies.
+       * mail/sendmail.el (mail-recover-1): Require 'dired.
+       * dired.el (dired-subdir-switches, dired-chown-program)
+       (dired-use-ls-dired, dired-chmod-program, dired-touch-program):
+       Make into defcustoms.
+       (dired-chown-program): Simplify initialization.
+       * mail/mail-utils.el: No need to require lisp-mode, it's in loadup.
+ 2010-12-13  Romain Francoise  <romain@orebokech.com>
+       * net/gnutls.el (gnutls-negotiate): Fix setting of default trustfiles.
+ 2010-12-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+       * net/netrc.el (netrc-point-at-eol): Remove the unused
+       netrc-point-at-old and netrc-bound-and-true-p bindings.
+       (netrc-parse): Cache the netrc contents.
+ 2010-12-13  Eli Zaretskii  <eliz@gnu.org>
+       * subr.el (posn-col-row): Evaluate header-line-format in the
+       context of the POSITION window's buffer.
+ 2010-12-13  Glenn Morris  <rgm@gnu.org>
+       * subr.el (member-ignore-case, run-mode-hooks, insert-for-yank-1)
+       (with-silent-modifications): Doc fixes.
+ 2010-12-13  Michael Albinus  <michael.albinus@gmx.de>
+       * net/tramp.el (tramp-action-password, tramp-process-actions):
+       Revert previous from.  Use `save-restriction'.
+ 2010-12-13  Stephen Berman  <stephen.berman@gmx.net>
+       * calendar/diary-lib.el (diary-list-sexp-entries):
+       Handle case of no newline at end of file.  (Bug#7536)
+ 2010-12-13  Glenn Morris  <rgm@gnu.org>
+       * mail/smtpmail.el (smtpmail-send-it): Revert previous change.
+ 2010-12-13  Michael Albinus  <michael.albinus@gmx.de>
+       * net/tramp.el (tramp-action-password): Delete region, do not narrow.
+       (tramp-process-actions): Do not widen.
+       * net/tramp-sh.el (tramp-sh-handle-start-file-process):
+       Protect buffer-modified value.  (Bug#7557)
+ 2010-12-13   Jan Moringen  <jmoringe@techfak.uni-bielefeld.de>
+       * log-edit.el (log-edit-changelog-entries):
+       Regexp quote filename.  (Bug#7505)
+ 2010-12-13  Tom Breton  <tehom@panix.com>
+       * cus-edit.el (custom-save-all):
+       Bind print-length and print-level to nil.  (Bug#7581)
+ 2010-12-13  Glenn Morris  <rgm@gnu.org>
+       * mouse.el (mouse-menu-major-mode-map, mouse-menu-bar-map):
+       Run hooks to update menu contents.  (Bug#7586)
+       * mail/smtpmail.el (smtpmail-send-it): Avoid colons in the queued
+       file names, for the sake of MS Windows.  (Bug#7588)
+ 2010-12-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * diff-mode.el (diff-refine-hunk): Make it work when the hunk contains
+       empty lines without a leading space.
+ 2010-12-13  Leo  <sdl.web@gmail.com>
+       * dired-aux.el (dired-do-redisplay): Postpone dired-after-readin-hook
+       while mapping over marks (Bug#6810).
+ 2010-12-13  Chong Yidong  <cyd@stupidchicken.com>
+       * image-dired.el (image-dired-db-file)
+       (image-dired-temp-image-file, image-dired-gallery-dir)
+       (image-dired-temp-rotate-image-file): Set default values relative
+       to image-dired-dir (Bug#7518).
+ 2010-12-13  Lawrence Mitchell  <wence@gmx.li>
+       * format.el (format-decode-run-method): Pass args FROM and TO, not
+       point-min and point-max, to shell-command-on-region (Bug#7488).
+ 2010-12-13  Jan Djärv  <jan.h.d@swipnet.se>
+       * frame.el (blink-cursor-mode): Make default t for ns.
+ 2010-12-13  Bob Rogers  <rogers-emacs@rgrjr.dyndns.org>
+       * vc-dir.el (vc-dir-query-replace-regexp): Doc fix (Bug#7501).
+ 2010-12-13  Chong Yidong  <cyd@stupidchicken.com>
+       * comint.el (comint-dynamic-list-input-ring)
+       (comint-dynamic-complete-filename)
+       (comint-replace-by-expanded-filename)
+       (comint-dynamic-simple-complete)
+       (comint-dynamic-list-filename-completions)
+       (comint-dynamic-list-completions): Doc fix (Bug#7499).
+       * subr.el (posn-x-y, posn-object-x-y, posn-object-width-height):
+       Doc fix (Bug#7471).
+ 2010-12-13  Martin Rudalics  <rudalics@gmx.at>
+       * dired.el (dired-pop-to-buffer): Bind pop-up-frames to nil
+       (Bug#7533).
+ 2010-12-13  W. Martin Borgert <debacle@debian.org>  (tiny change)
+       * files.el (auto-mode-alist): Handle .dbk (DocBook) with xml-mode.
+       (Bug#7491).
+ 2010-12-13  Eli Zaretskii  <eliz@gnu.org>
+       * files.el (file-relative-name): Handle UNC file names on
+       DOS/Windows.  (Bug#4674)
+ 2010-12-13  Daiki Ueno  <ueno@unixuser.org>
+       * epg.el (epg-digest-algorithm-alist): Replace "RMD160" with
+       "RIPEMD160" (Bug#7490).  Reported by Daniel Kahn Gillmor.
+       (epg-context-set-passphrase-callback): Mention that the callback
+       is not called when used with GnuPG 2.x.
+ 2010-12-13  Glenn Morris  <rgm@gnu.org>
+       * ps-print.el (ps-line-lengths-internal, ps-nb-pages):
+       Ensure ps-footer-font-size-internal is initialized.
+       Call ps-get-page-dimensions before trying to use ps-font-for-text.
+ 2010-12-13  Kenichi Handa  <handa@m17n.org>
+       * mail/rmailmm.el (rmail-mime-parse): Call rmail-mime-process
+       within condition-case.
+       (rmail-show-mime): Don't use condition-case.
+       (rmail-search-mime-message): New function.
+       (rmail-search-mime-message-function): Set to
+       rmail-search-mime-message.
+ 2010-12-13  Leo  <sdl.web@gmail.com>
+       * ido.el (ido-common-initialization): New function.  (bug#3274)
+       (ido-mode): Use it.
+       (ido-completing-read): Call it.
+ 2010-12-12  Karl Fogel  <kfogel@red-bean.com>
+       * bookmark.el (bookmark-name-from-full-record): Rename back to
+       this original name from `bookmark-name-from-record' reverting part
+       of 2010-12-08T08:09:27Z!kfogel@red-bean.com / kfogel@red-bean.com-20101208080927-5j9jqnb2xvcw4ogm.
+       As Drew Adams pointed out, there was no reason to cause churn for
+       third-party callers.
+ 2010-12-12  Alan Mackenzie  <acm@muc.de>
+       * progmodes/cc-engine.el (c-forward-type): Before scanning a
+       template arglist, check that the current language supports this.
+ 2010-12-11  Glenn Morris  <rgm@gnu.org>
+       * vc/vc-bzr.el (vc-bzr-state-heuristic): Also check that the executable
+       state of the file matches.  (Bug#7544)
+       (vc-bzr-register, vc-bzr-checkin)
+       (vc-bzr-annotate-extract-revision-at-line): Doc fixes.
+       (vc-directory-exclusion-list): Remove unnecessary eval-after-load.
+       * textmodes/sgml-mode.el (sgml-xml-guess): Add .xhtml extension.
+ 2010-12-11  Karel Klíč  <kklic@redhat.com>
+       * files.el (auto-mode-alist): Use html-mode for *.xhtml.  (Bug#7606)
+ 2010-12-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+       Derive from prog-mode, use derived-mode-p, and fix up various
+       minor style issues in lisp/progmodes.
+       * progmodes/vhdl-mode.el (vhdl-mode):
+       * progmodes/verilog-mode.el (verilog-mode):
+       * progmodes/vera-mode.el (vera-mode):
+       * progmodes/sql.el (sql-mode):
+       * progmodes/scheme.el (scheme-mode):
+       * progmodes/perl-mode.el (perl-mode):
+       * progmodes/octave-inf.el (inferior-octave-mode):
+       * progmodes/autoconf.el (autoconf-mode):
+       * progmodes/m4-mode.el (m4-mode):
+       * progmodes/inf-lisp.el (inferior-lisp-mode):
+       * progmodes/idlwave.el (idlwave-mode):
+       * progmodes/icon.el (icon-mode):
+       * progmodes/idlw-help.el (idlwave-help-mode):
+       * progmodes/dcl-mode.el (dcl-mode):
+       * progmodes/idlw-shell.el (idlwave-shell-mode):
+       * progmodes/ebrowse.el (ebrowse-tree-mode, ebrowse-electric-list-mode)
+       (ebrowse-member-mode, ebrowse-electric-position-mode):
+       Use define-derived-mode.
+       * progmodes/xscheme.el (exit-scheme-interaction-mode)
+       (xscheme-enter-interaction-mode, xscheme-enter-debugger-mode)
+       (xscheme-debugger-mode-p, xscheme-send-string-1):
+       * progmodes/tcl.el (inferior-tcl-proc, tcl-current-word)
+       (tcl-load-file, tcl-restart-with-file):
+       * progmodes/ps-mode.el (ps-run-running):
+       * progmodes/gdb-mi.el (gud-watch, gdb-mouse-set-clear-breakpoint):
+       * progmodes/js.el (js--get-all-known-symbols):
+       * progmodes/inf-lisp.el (inferior-lisp-proc):
+       * progmodes/idlwave.el (idlwave-beginning-of-statement)
+       (idlwave-template, idlwave-update-buffer-routine-info)
+       (idlwave-update-current-buffer-info)
+       (idlwave-get-routine-info-from-buffers, idlwave-choose)
+       (idlwave-scan-class-info, idlwave-fix-keywords)
+       (idlwave-list-buffer-load-path-shadows):
+       * progmodes/idlw-toolbar.el (idlwave-toolbar, idlwave-toolbar-add)
+       (idlwave-toolbar-remove):
+       * progmodes/idlw-shell.el (idlwave-shell-save-and-action)
+       (idlwave-shell-file-name, idlwave-shell-electric-debug-all-off)
+       (idlwave-shell-menu-def):
+       * progmodes/idlw-complete-structtag.el
+       (idlwave-prepare-structure-tag-completion):
+       * progmodes/gud.el (gud-set-buffer):
+       * progmodes/f90.el (f90-backslash-not-special):
+       * progmodes/delphi.el (delphi-find-unit): Use derived-mode-p.
+       * progmodes/xscheme.el (xscheme-start)
+       (local-set-scheme-interaction-buffer, scheme-interaction-mode):
+       * progmodes/which-func.el (which-function):
+       * progmodes/vhdl-mode.el (vhdl-set-style):
+       * progmodes/verilog-mode.el (verilog-set-compile-command)
+       (verilog-modify-compile-command, verilog-error-regexp-add-xemacs)
+       (verilog-set-define, verilog-auto-reeval-locals):
+       * progmodes/sql.el (sql-product-font-lock, sql-interactive-mode):
+       * progmodes/simula.el (simula-mode):
+       * progmodes/scheme.el (scheme-mode-variables, dsssl-mode):
+       * progmodes/python.el (python-check, python-mode):
+       * progmodes/prolog.el (prolog-mode-variables):
+       * progmodes/gud.el (gud-tooltip-activate-mouse-motions):
+       * progmodes/ebrowse.el (ebrowse-view-file-other-frame):
+       * progmodes/delphi.el (delphi-mode):
+       * progmodes/cc-styles.el (c-setup-paragraph-variables):
+       * progmodes/cc-mode.el (c-basic-common-init, c-common-init)
+       (c-font-lock-init): Move make-local-variable to their setq.
+       * progmodes/vhdl-mode.el (vhdl-write-file-hooks-init)
+       (vhdl-hs-minor-mode, vhdl-ps-print-init): Fix make-local-variable ->
+       make-local-hook.
+       * progmodes/sh-script.el (sh-require-final-newline): Remove.
+       (sh-set-shell): Don't set require-final-newline since it's already done
+       by prog-mode.
+       * progmodes/modula2.el (m2-mode): Don't make m2-end-comment-column
+       since we never set it.
+       * progmodes/ebrowse.el (ebrowse-set-tree-indentation):
+       Use read-string and standard prompt.
+       * progmodes/dcl-mode.el (dcl-mode-map): Move init into declaration.
+       * progmodes/meta-mode.el (meta-mode-abbrev-table): Merge init and decl.
+       (meta-common-mode-syntax-table): Rename from meta-mode-syntax-table.
+       (meta-common-mode-map): Rename from meta-mode-map.
+       Remove C-m binding, which is a user preference, not mode specific.
+       (meta-common-mode): New major mode; replace meta-common-initialization.
+       * progmodes/js.el (js-mode): Call syntax-propertize rather than messing
+       around with font-lock.
+       * progmodes/etags.el (select-tags-table-mode):
+       Derive from special-mode.
+       * progmodes/octave-mod.el (octave-mode):
+       * progmodes/gdb-mi.el (gdb-inferior-io-mode, gdb-threads-mode)
+       (gdb-memory-mode, gdb-disassembly-mode, gdb-breakpoints-mode)
+       (gdb-frames-mode, gdb-locals-mode, gdb-registers-mode):
+       Let define-derived-mode do its job.
+       * progmodes/cpp.el (cpp-edit-mode-map):
+       Move initialization into declaration.
+       (cpp-edit-mode): Use define-derived-mode.
+       (cpp-edit-load): Use derived-mode-p.
+       * progmodes/mixal-mode.el (mixal-mode):
+       * progmodes/f90.el (f90-mode):
+       * progmodes/cfengine.el (cfengine-mode): Don't bother setting
+       require-final-newline since prog-mode does it already.
+       * progmodes/cc-cmds.el (c-update-modeline): Use match-string.
+       * progmodes/asm-mode.el (asm-mode-map): Fix menu setup.
+       * progmodes/antlr-mode.el: Require cc-mode upfront.
+       (antlr-mode-syntax-table, antlr-action-syntax-table): Initialize in
+       the declaration.
+       (antlr-directory-dependencies, antlr-show-makefile-rules):
+       Use derived-mode-p.
+       (antlr-language-option): Don't assume point-min==1.
+       (antlr-mode): Use define-derived-mode.
+       * progmodes/ada-mode.el: Use derived-mode-p.
+       (ada-mode): Use define-derived-mode.
+       Use hack-local-variables-hook.
+ 2010-12-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * textmodes/texinfo.el (texinfo-mode-map): Bind texinfo-insert-@end.
+       (texinfo-mode): Don't disable adaptive-fill-mode.
+       (texinfo-insert-block): Adjust cursor placement for blocks with arg.
+       (texinfo-insert-@end, texinfo-insert-braces, texinfo-insert-@code)
+       (texinfo-insert-@dfn, texinfo-insert-@email, texinfo-insert-@emph)
+       (texinfo-insert-@example, texinfo-insert-@file, texinfo-insert-@item)
+       (texinfo-insert-@kbd, texinfo-insert-@node, texinfo-insert-@noindent)
+       (texinfo-insert-@quotation, texinfo-insert-@samp)
+       (texinfo-insert-@strong, texinfo-insert-@table, texinfo-insert-@var)
+       (texinfo-insert-@uref): Use define-skeleton.
+       (texinfo-insert-@-with-arg): Delete.
+ 2010-12-10  Eli Zaretskii  <eliz@gnu.org>
+       * arc-mode.el (archive-zip-extract): If w32-quote-process-args is
+       nil, do quote archive member names.  (Bug#6144)
+ 2010-12-10  Glenn Morris  <rgm@gnu.org>
+       * files.el (diff-no-select): Declare.
+       * mail/emacsbug.el (report-emacs-bug): Use mail-user-agent properties.
+       (report-emacs-bug-create-existing-bugs-buffer): Avoid free variables.
+       * comint.el (comint-input-ring-file-name): Doc fix.
+ 2010-12-09  Eli Zaretskii  <eliz@gnu.org>
+       * menu-bar.el (menu-bar-frame-for-menubar, menu-bar-positive-p):
+       New functions.
+       (menu-bar-showhide-menu) <menu-bar-mode, showhide-tool-bar>:
+       Use them instead of `nil' and `>', respectively.
+       (menu-bar-showhide-tool-bar-menu): Use menu-bar-frame-for-menubar
+       instead of `nil'.
+       (toggle-menu-bar-mode-from-frame): Use menu-bar-frame-for-menubar
+       and menu-bar-positive-p instead of `nil' and `>', respectively.
+       (Bug#1077)
+ 2010-12-09  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
+       * whitespace.el (whitespace-newline-mode): Code fix.
+ 2010-12-09  Glenn Morris  <rgm@gnu.org>
+       * play/landmark.el (lm-print-y,s,noise-int, lm-print-y,s,noise):
+       Rename functions without commas, update callers.
+ 2010-12-08  Jeff Dairiki  <dairiki@dairiki.org>  (tiny change)
+       * whitespace.el (whitespace-cleanup-region):
+       Clean up spaces before tabs.  (Bug#7582)
+ 2010-12-08  Karl Fogel  <kfogel@red-bean.com>
+       * bookmark.el: Adjust parameter names and doc strings to resolve
+       confusion over whether "bookmark" meant a bookmark name or a
+       bookmark record.  Along the way, shorten one function's name for
+       similar reasons.  (Issue #7548)
+       (bookmark-name-from-record): New name for
+       `bookmark-name-from-full-record'.  All callers changed.
+       (bookmark-get-bookmark, bookmark-get-bookmark-record)
+       (bookmark-default-annotation-text, bookmark-prop-get, bookmark-prop-set)
+       (bookmark-get-annotation, bookmark-set-annotation)
+       (bookmark-get-filename, bookmark-set-filename)
+       (bookmark-get-position, bookmark-set-position)
+       (bookmark-get-front-context-string, bookmark-set-front-context-string)
+       (bookmark-get-rear-context-string, bookmark-set-rear-context-string)
+       (bookmark-get-handler, bookmark-edit-annotation, bookmark--jump-via)
+       (bookmark-handle-bookmark, bookmark-location, bookmark-show-annotation):
+       Rename `bookmark' parameter to `bookmark-name-or-record', to
+       clearly show its role, and shorten or adjust doc strings accordingly.
+       (bookmark-set-name): Same, and pass the parameter directly to
+       `bookmark-get-bookmark' instead of redundantly doing the callee's work.
+       (bookmark-default-annotation-text, bookmark-send-edited-annotation)
+       (bookmark-relocate, bookmark-insert-location, bookmark-insert)
+       (bookmark-delete): Rename `bookmark' parameter to `bookmark-name',
+       and in some cases shorten doc string accordingly.
+       (bookmark-rename): Change `old' and `new' parameters to `old-name'
+       and `new-name', and adjust an internal variable to avoid confusion.
+       (bookmark-jump, bookmark-jump-noselect): Clarify `bookmark'
+       parameter in doc string.
+ 2010-12-08  Glenn Morris  <rgm@gnu.org>
+       * progmodes/gdb-mi.el (gdb): Try to initialize comint input history
+       from gdb's history file.  (Bug#7575)
+       * mail/emacsbug.el (report-emacs-bug):
+       Try to handle some other mail clients.
+ 2010-12-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * files.el (dir-locals-collect-variables): Don't let errors stop us.
+       Use string-prefix-p.
+       (file-name-version-regexp): New var.
+       (file-name-sans-versions):
+       * jka-cmpr-hook.el (jka-compr-build-file-regexp): Use it,
+       (jka-compr-get-compression-info): Use dolist.
+       (jka-compr-compression-info-list): Don't bother specifying
+       version/backup regexps.
+ 2010-12-07  Tassilo Horn  <tassilo@member.fsf.org>
+       * simple.el (just-one-space): Make argument n default to 1 if
+       omitted.
+ 2010-12-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * electric.el (electric-indent-post-self-insert-function):
+       Delete trailing newlines even if we don't reindent.
+ 2010-12-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * minibuffer.el (completion-at-point): Remove the `arg'.
+       * bindings.el (complete-symbol): Move back from minibuffer.el.
+ 2010-12-06  Deniz Dogan  <deniz.a.m.dogan@gmail.com>
+       * simple.el (just-one-space): Delete newlines for negative arg.
+ 2010-12-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * ansi-color.el (ansi-color-unfontify-region): Replace by trivial def.
+       (ansi-color-filter-apply): Simplify.
+       (ansi-color-apply): Use `font-lock-face' rather than `face'.
+ 2010-12-05  Bob Rogers  <rogers-emacs@rgrjr.dyndns.org>
+       * vc/vc-dir.el (vc-dir-query-replace-regexp): Doc fix (Bug#7501).
+ 2010-12-04  Chong Yidong  <cyd@stupidchicken.com>
+       * dired.el (dired-use-ls-dired): Set default to a special
+       "unspecified" value.
+       (dired-insert-directory): When called the first time, check
+       whether "ls --dired" succeeds and set dired-use-ls-dired (Bug#7546).
+ 2010-12-04  Tak Ota  <Takaaki.Ota@am.sony.com>
+       * replace.el: Add "collect" feature to occur.
+       (occur-collect-regexp-history): New var.
+       (occur-read-primary-args): Return a replace string for nlines,
+       if needed.
+       (occur): Extend the meaning of nlines.
+ 2010-12-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * progmodes/which-func.el (which-func-ff-hook): Log the error message.
+       (which-func-update-1): Distinguish symbols from strings.
+       (which-function): Stay within 80 columns.
+ 2010-12-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * subr.el (with-demoted-errors): Distinguish symbols from strings.
+       * newcomment.el (comment-styles): Add docs to each style (bug#7509).
+       Improve docstring.
+       (comment-style): Use comment-styles's docs to describe values.
+ 2010-12-03  Jan Djärv  <jan.h.d@swipnet.se>
+       * term/common-win.el (x-setup-function-keys): Restore ns-new-frame
+       and ns-show-prefs (Bug#7535).
+       * term/ns-win.el (global-map): Restore ns-new-frame and ns-show-prefs
+       bindings (Bug#7535).
+ 2010-12-03  Glenn Morris  <rgm@gnu.org>
+       * nxml/nxml-mode.el: Require rng-nxml.
+       (rng-nxml-mode-init, nxml-enable-unicode-char-name-sets):
+       Remove declarations.
+       * nxml/nxml-mode.el, nxml/nxml-outln.el, nxml/rng-loc.el:
+       * nxml/rng-nxml.el, nxml/rng-valid.el:
+       Remove leading `*' from defcustom docs.
+       * startup.el (normal-top-level-add-subdirs-to-load-path): Simplify.
+       (normal-top-level-add-to-load-path, tty-handle-args):
+       Convert comments to basic doc-strings.
+       * net/browse-url.el (browse-url-url-at-point)
+       (browse-url-default-browser): Remove autoload cookies.
+       * mail/emacsbug.el (report-emacs-bug-create-existing-bugs-buffer):
+       Remove more undefined cl functions.
+       * vc/diff.el (diff-sentinel): Make new arguments optional.
+       * ibuf-ext.el (diff-sentinel): Update declaration.
+ 2010-12-03  Daiki Ueno  <ueno@unixuser.org>
+       * epg.el (epg-digest-algorithm-alist): Replace "RMD160" with
+       "RIPEMD160" (Bug#7490).  Reported by Daniel Kahn Gillmor.
+       (epg-context-set-passphrase-callback): Mention that the callback
+       is not called when used with GnuPG 2.x.
+ 2010-12-02  Michael Albinus  <michael.albinus@gmx.de>
+       * net/tramp.el (tramp-local-host-regexp): Add "localhost6".
+       (tramp-file-name-port): Check also for `tramp-default-port'.
+       (tramp-get-connection-name): New defun.
+       (tramp-get-connection-process): Use it.
+       (tramp-debug-message): Extend function exclude list.
+       (tramp-drop-volume-letter): Fix doc string.
+       * net/tramp-cmds.el: Remove solved todo item.
+       * net/tramp-efs.el:
+       * net/tramp-ftp.el:
+       * net/tramp-gvfs.el:
+       * net/tramp-gw.el:
+       * net/tramp-imap.el:
+       * net/tramp-smb.el: Fix regexps added to `tramp-default-method-alist'
+       and `tramp-default-user-alist', respectively.
+       * net/tramp-gw.el (tramp-gw-open-connection):
+       Use `tramp-get-connection-name' and `tramp-get-connection-buffer'.
+       * net/tramp-imap.el (tramp-imap-make-iht): Use just
+       `tramp-file-name-port'.
+       * net/tramp-sh.el (tramp-methods): Add recursive options to "pscp"
+       and "psftp".  Exchange "%k" marker with options.
+       (tramp-do-copy-or-rename-file, tramp-sh-handle-file-local-copy):
+       Compute size of link target.
+       (tramp-do-copy-or-rename-file-out-of-band). Move setting of
+       `tramp-current-*' up due to gateway methods.  Optimze computing of
+       copy arguments.  Use `tramp-get-connection-name' and
+       `tramp-get-connection-buffer'.  Improve debug messages.
+       (tramp-compute-multi-hops): Remove port determination.
+       (tramp-maybe-open-connection): Use `tramp-get-connection-name'.
+       * net/trampver.el: Update release number.
+ 2010-12-02  Glenn Morris  <rgm@gnu.org>
+       * emacs-lisp/cl-macs.el (cl-parse-loop-clause):
+       Avoid infinite loop over windows.  (Bug#7492)
+       * progmodes/flymake.el (flymake-check-file-limit):
+       Allow nil to mean "no limit".
+       (flymake-check-patch-master-file-buffer): Update for above change.
+       Allow a .tex file-name extension to be optional.
+       (flymake-master-tex-init): Also match \include statements.
+ 2010-11-30  Sam Steingold  <sds@gnu.org>
+       * nxml/nxml-mode.el (nxml-parent-document): Add a variable.
+       (nxml-parent-document-set): A function to set `nxml-parent-document'.
+       (nxml-mode): Define using `define-derived-mode' instead of `defun'.
+       (nxml-mode-hook): Remove `defcustom' (auto-defined by
+       define-derived-mode').
+       * nxml/rng-valid.el (rng-dtd-trivial-p): Add a helper function for
+       users who want to call `nxml-parent-document-set'.
+ 2010-11-27  Chong Yidong  <cyd@stupidchicken.com>
+       * log-edit.el (log-edit-font-lock-keywords): Don't try matching
+       stand-alone lines, since that is handled by log-edit-match-to-eoh
+       (Bug#6465).
+ 2010-11-27  Eduard Wiebe  <usenet@pusto.de>
+       * dired.el (dired-get-filename): Replace backslashes with slashes
+       in file names on MS-Windows, needed by `locate'.  (Bug#7308)
+       * locate.el (locate-default-make-command-line): Don't consider
+       drive letter and root directory part of
+       `directory-listing-before-filename-regexp'.  (Bug#7308)
+       (locate-post-command-hook, locate-post-command-hook): New defcustoms.
+ 2010-11-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * emacs-lisp/smie.el (smie-prec2->grammar): Simplify handling
+       of :smie-open/close-alist.
+       (smie-next-sexp): Make it accept a "start token" as argument.
+       (smie-indent-keyword): Be careful not to misidentify tokens that span
+       more than one line, as empty lines.  Add argument `token'.
+ 2010-11-27  Kenichi Handa  <handa@m17n.org>
+       * mail/rmailmm.el (rmail-mime-insert-multipart): For unsupported
+       multipart subtypes, insert all as usual.
+       * mail/rmail.el: Require rfc2047.
+ 2010-11-27  Kenichi Handa  <handa@m17n.org>
+       * mail/rmailmm.el (rmail-mime-entity, rmail-mime-entity-type)
+       (rmail-mime-entity-disposition)
+       (rmail-mime-entity-transfer-encoding, rmail-mime-entity-header)
+       (rmail-mime-entity-body, rmail-mime-entity-children): New functions.
+       (rmail-mime-save): Handle the case that the button's `data' is a
+       MIME entity.
+       (rmail-mime-insert-text): New function.
+       (rmail-mime-insert-image): Handle the case that DATA is a MIME entity.
+       (rmail-mime-bulk-handler): Just call rmail-mime-insert-bulk.
+       (rmail-mime-insert-bulk): New function mostly copied from the old
+       rmail-mime-bulk-handler.
+       (rmail-mime-multipart-handler): Just call rmail-mime-process-multipart.
+       (rmail-mime-process-multipart): New function mostly copied from
+       the old rmail-mime-multipart-handler.
+       (rmail-mime-show): Just call rmail-mime-process.
+       (rmail-mime-process): New function mostly copied from the old
+       rmail-mime-show.
+       (rmail-mime-insert-multipart, rmail-mime-parse)
+       (rmail-mime-insert, rmail-show-mime)
+       (rmail-insert-mime-forwarded-message)
+       (rmail-insert-mime-resent-message): New functions.
+       (rmail-insert-mime-forwarded-message-function): Set to
+       rmail-insert-mime-forwarded-message.
+       (rmail-insert-mime-resent-message-function): Set to
+       rmail-insert-mime-resent-message.
+       * mail/rmailsum.el: Require rfc2047.
+       (rmail-header-summary): Handle multiline Subject: field.
+       (rmail-summary-line-decoder): Change the default to
+       rfc2047-decode-string.
+       * mail/rmail.el (rmail-enable-mime): Change the default to t.
+       (rmail-mime-feature): Change the default to `rmailmm'.
+       (rmail-quit): Delete the specifal code for rmail-enable-mime.
+       (rmail-display-labels): Likewise.
+       (rmail-show-message-1): Check rmail-enable-mime, and use
+       rmail-show-mime-function for a MIME message.  Decode the headers
+       according to RFC2047.
+ 2010-11-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * progmodes/which-func.el (which-func-imenu-joiner-function):
+       Return a string, as expected.
+       (which-function-mode): Make sure we stop any previous timer before
+       starting a new one.
+ 2010-11-27  Michael Albinus  <michael.albinus@gmx.de>
+       * net/tramp.el (tramp-default-method-alist)
+       (tramp-default-user-alist, tramp-default-proxies-alist):
+       Adapt custom options type.  (Bug#7445)
+ 2010-11-27  Chong Yidong  <cyd@stupidchicken.com>
+       * progmodes/python.el: Add Ipython support (Bug#5390).
+       (python-shell-prompt-alist)
+       (python-shell-continuation-prompt-alist): New options.
+       (python--set-prompt-regexp): New function.
+       (inferior-python-mode, run-python, python-shell):
+       Require ansi-color.  Use python--set-prompt-regexp to set the comint
+       prompt based on the Python interpreter.
+       (python--prompt-regexp): New var.
+       (python-check-comint-prompt)
+       (python-comint-output-filter-function): Use it.
+       (run-python): Use a pipe (Bug#5694).
+ 2010-11-27  Chong Yidong  <cyd@stupidchicken.com>
+       * progmodes/python.el (run-python): Doc fix.
+       (python-keep-current-directory-in-path): New var (Bug#7454).
+ 2010-11-27  Chong Yidong  <cyd@stupidchicken.com>
+       * lpr.el (lpr-buffer, print-buffer, lpr-region, print-region):
+       Prompt user before actually printing.
+ 2010-11-27  Glenn Morris  <rgm@gnu.org>
+       * startup.el (package-enable-at-startup, package-initialize):
+       Remove unnecessary declarations.
+ 2010-11-27  Eli Zaretskii  <eliz@gnu.org>
+       * international/characters.el (glyphless-char-display-control):
+       Exclude newline and TAB from the c0-control group.
+ 2010-11-27  Glenn Morris  <rgm@gnu.org>
+       * mail/sendmail.el (build-mail-aliases): Doc fix for autoload.
+       (expand-mail-aliases): Remove unnecessary autoload.
+       * allout.el (allout-command-prefix, allout-mode-map): Declare.
+       * shell.el (shell-dir-cookie-re): Move definition before use.
+       * mail/emacsbug.el (report-emacs-bug-create-existing-bugs-buffer):
+       Replace undefined CL functions.
+ 2010-11-26  Eli Zaretskii  <eliz@gnu.org>
+       * simple.el (prog-mode): Set bidi-paragraph-direction to
+       left-to-right.
+       * term/pc-win.el (x-get-selection-internal): Emulation for MS-DOS.
+ 2010-11-26  Glenn Morris  <rgm@gnu.org>
+       * calendar/diary-lib.el (diary-outlook-format-1): New function, so that
+       diary-outlook-formats can be sensitive to calendar-date-style.
+       (diary-outlook-formats): Simplify the default setting.
+       (diary-from-outlook-internal): Pass subject and body as arguments.
+       Use dolist rather than dotimes.  Don't save the diary buffer.
+       (diary-from-outlook-gnus, diary-from-outlook-rmail):
+       Pass subject and body as explicit arguments to the -internal function.
+ 2010-11-26  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+       * mail/rfc2368.el (rfc2368-parse-mailto-url): Unfold URLs before
+       parsing them.  This makes mailto:...?subject=foo\nbar work.
+ 2010-11-25  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * vc/diff.el (diff): Fix last change.
+ 2010-11-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * emacs-lisp/pcase.el: Improve pcase-let.  Use "pcase--" prefix.
+       (pcase--dontcare-upats): New var.
+       (pcase-let, pcase-let*): Generate better code.
+       Accept the same bodies as `let'.
+       (pcase-dolist): New macro.
+       (pcase--trivial-upat-p): New helper function.
+       (pcase--expand): Strip leading "(let nil" if any.
+ 2010-11-24  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+       * mail/mailclient.el (browse-url): Require.
+       (mailclient-send-it): Bind `browse-url-mailto-function' to nil to
+       use the external browser function to send the mail (bug#7469).
+       * net/browse-url.el (browse-url-browser-function): Revert the
+       default back to the previous value, since the new value broke
+       mailclient.el.
+       (browse-url-mailto-function): New variable for mailto: URLs.
+       (browse-url): Use the new variable for mailto: URLs.
+ 2010-11-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * eshell/esh-cmd.el (eshell-parse-command):
+       * eshell/esh-arg.el (eshell-parse-arguments):
+       * eshell/em-script.el (eshell-source-file):
+       Use with-silent-modifications.
+ 2010-11-23  Chong Yidong  <cyd@stupidchicken.com>
+       * vc/vc.el (vc-merge): Remove optional arg PROMPT.  Always prompt
+       for a merge location.
+       * vc/vc-bzr.el (vc-bzr-pull): Remove unused var.
+       (vc-bzr-merge-branch): Always prompt.
+       (vc-bzr-async-command): Use the full branch filename.
+ 2010-11-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * shell.el (shell): Use current-buffer by default if it's already
+       a shell mode buffer and its process is dead.
+       Suggested by Jose E. Marchesi <jemarch@gnu.org>.
+ 2010-11-23  Tassilo Horn  <tassilo@member.fsf.org>
+       * mail/emacsbug.el (report-emacs-bug-query-existing-bugs):
+       Mention that the keywords should be comma separated.
+ 2010-11-23  Chong Yidong  <cyd@stupidchicken.com>
+       * vc/vc.el (vc-merge): Use vc-BACKEND-merge-branch if available.
+       Accept optional prefix arg meaning to prompt for a command.
+       (vc-update): Use vc-BACKEND-pull if available.  Accept optional
+       prefix arg meaning to prompt for a command.
+       (vc-pull): Alias for vc-update.
+       * vc/vc-bzr.el (vc-bzr-admin-branchconf, vc-bzr-history): New vars.
+       (vc-bzr--branch-conf, vc-bzr-async-command, vc-bzr-pull)
+       (vc-bzr-merge-branch): New functions, implementing merge-branch
+       and pull operations.
+ 2010-11-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * Makefile.in: Fix up last merge.
+       * vc/diff.el (diff-old-temp-file, diff-new-temp-file): Remove.
+       (diff-sentinel): Get them as arguments instead.
+       (diff-old-file, diff-new-file, diff-extra-args): Remove.
+       (diff-file-local-copy, diff-better-file-name): New funs.
+       (diff-no-select): Rename from diff-into-buffer.
+       Support buffers additionally to files.  Move `buf' arg.  Don't display buf.
+       Prefer closures to buffer-local variables.
+       (diff): Adjust accordingly.
+       (diff-buffer-with-file): Move from files.el.
+       * files.el (diff-buffer-with-file): Move to vc/diff.el.
+       (diff-buffer-internal): Remove.
+       (diff-buffer-buffer): Remove.
+       (save-some-buffers-action-alist): Use diff-no-select so as not to guess
+       the buffer name used, and so as not to mess up windows and frames.
+ 2010-11-22  Bob Rogers  <rogers-emacs@rgrjr.dyndns.org>
+       * files.el: Make revert work with diff-buffer-with-file (bug#7277).
+       (diff-buffer-internal): New function extracted from diff-buffer-with-file
+       (diff-buffer-with-file): Use it.
+       * vc/diff.el (diff-into-buffer): New fun, extracted from diff.
+       (diff): Use it.
+ 2010-11-22  Tassilo Horn  <tassilo@member.fsf.org>
+       * textmodes/reftex-ref.el (reftex-goto-label): Use the current
+       \ref's or \pageref's value as default instead of initial input.
+ 2010-11-21  Michael Albinus  <michael.albinus@gmx.de>
+       * files.el (backup-by-copying-when-mismatch): The default value is
+       now t.
+       * startup.el (normal-top-level):
+       * net/tramp.el (tramp-handle-insert-file-contents): Do not set
+       `backup-by-copying-when-mismatch'.
+ 2010-11-21  Jan Djärv  <jan.h.d@swipnet.se>
+       * tool-bar.el (tool-bar-setup): Remove save as, print and customize.
+ 2010-11-21  Deniz Dogan  <deniz.a.m.dogan@gmail.com>
+       * progmodes/python.el (python-font-lock-keywords):
+       Highlight top-level augmented assignments (Bug#6445).
+ 2010-11-21  Jan Djärv  <jan.h.d@swipnet.se>
+       * term/ns-win.el (ns-right-control-modifier)
+       (ns-right-command-modifier): Defvar them.
+       * cus-start.el (all): Add ns-right-control-modifier and
+       ns-right-command-modifier (Bug#7458).
+ 2010-11-20  Glenn Morris  <rgm@gnu.org>
+       * emacs-lisp/authors.el (authors-ignored-files)
+       (authors-valid-file-names, authors-renamed-files-alist): Add entries.
+ 2010-11-20  Tassilo Horn  <tassilo@member.fsf.org>
+       * mail/emacsbug.el (report-emacs-bug-query-existing-bugs)
+       (report-emacs-bug-parse-query-results)
+       (report-emacs-bug-create-existing-bugs-buffer): Pass through
+       keywords used for querying the bug database to show them in the
+       existing bugs buffer.
+ 2010-11-20  Jan Djärv  <jan.h.d@swipnet.se>
+       * tool-bar.el (tool-bar-setup): Add some :vert-only keywords.
+       * info.el (info-tool-bar-map): Add some :vert-only keywords.
+ 2010-11-20  Eli Zaretskii  <eliz@gnu.org>
+       * international/characters.el (glyphless-char-display-control):
+       Make it a defcustom, with update-glyphless-char-display as its
+       :set attribute.
+       (top level): Don't call update-glyphless-char-display.
+ 2010-11-20  Michael Albinus  <michael.albinus@gmx.de>
+       Sync with Tramp 2.2.0.
+       * net/tramp.el (tramp-handle-insert-file-contents): Don't use
+       `file-remote-p' (due to compatibility).
+       * net/tramp-sh.el (tramp-do-copy-or-rename-file-directly)
+       (tramp-do-copy-or-rename-file-out-of-band): Use `ignore-errors'.
+       * net/trampver.el: Update release number.
+ 2010-11-20  Eli Zaretskii  <eliz@gnu.org>
+       * faces.el (glyphless-char): Define value for `pc'.
+ 2010-11-20  Tassilo Horn  <tassilo@member.fsf.org>
+       Implemented a bug querying mechanism.
+       * mail/emacsbug.el (report-emacs-bug-tracker-url): New variable.
+       (report-emacs-bug-create-existing-bugs-buffer)
+       (report-emacs-bug-parse-query-results)
+       (report-emacs-bug-query-existing-bugs): New functions.
 +2010-11-19  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * window.el (display-buffer-same-frame-specifiers)
 +      (display-buffer-other-window-same-frame-specifiers): New
 +      constants.
 +      (display-buffer): Call display-buffer-function if it's non-nil.
 +      (display-buffer-same-window, display-buffer-other-window)
 +      (pop-to-buffer-other-window, switch-to-buffer-other-window):
 +      Adjust doc-strings.
 +      (display-buffer-same-frame)
 +      (display-buffer-other-window-same-frame)
 +      (pop-to-buffer-same-frame)
 +      (pop-to-buffer-other-window-same-frame)
 +      (switch-to-buffer-same-frame)
 +      (switch-to-buffer-other-window-same-frame): New functions.
 +      (display-buffer-function): Un-obsolete.
 +
 +      * bookmark.el (bookmark-bmenu-2-window): Use
 +      pop-to-buffer-other-window.
 +      (bookmark-bmenu-switch-other-window): Use
 +      display-buffer-other-window.
 +
 +      * progmodes/etags.el (find-tag-other-window): New argument
 +      other-frame. Call either pop-to-buffer-other-window or
 +      pop-to-buffer-other-frame.
 +      (find-tag-other-frame): Call find-tag-other-window with
 +      other-frame argument t.
 +
 +      * speedbar.el (speedbar-find-file-in-frame)
 +      (speedbar-buffer-click): Use pop-to-buffer-other-frame.
 +
 +      * term/ns-win.el (ns-find-file): Use pop-to-buffer-other-frame.
 +
  2010-11-19  Tassilo Horn  <tassilo@member.fsf.org>
  
        * textmodes/reftex-ref.el (reftex-goto-label): If point is inside
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lisp/dired.el
index 4b03aaf3a1e42e094490600f7b8e6817de433161,cec4ffa2f1cd1234f254bc4e2b9811b4986ceb9e..923af9e2610ccf2d592a330ac2f2eec6623acfe6
@@@ -2011,6 -2025,14 +2025,14 @@@ Otherwise, an error occurs in these cas
            ;; with quotation marks in their names.
          (while (string-match "\\(?:[^\\]\\|\\`\\)\\(\"\\)" file)
            (setq file (replace-match "\\\"" nil t file 1)))
 -        
++
+         (when (eq system-type 'windows-nt)
+           (save-match-data
+             (let ((start 0))
+               (while (string-match "\\\\" file start)
+                 (aset file (match-beginning 0) ?/)
+                 (setq start (match-end 0))))))
            (setq file (read (concat "\"" file "\"")))
          ;; The above `read' will return a unibyte string if FILE
          ;; contains eight-bit-control/graphic characters.
Simple merge
index eaa0d1a3b0e17c93e80748a11c3d3ceae77123a8,3c534f049c5ce027fe55ea2af8c2d4c5d095d36f..7351d235561b89c4bd1e474b9b14d2dca2501821
@@@ -268,7 -281,12 +268,8 @@@ shells such as bash, zsh, rc, 4dos.
    :type 'string
    :group 'eshell)
  
- (defcustom eshell-directory-name (convert-standard-filename "~/.eshell/")
 -(eshell-deftest mode same-window-buffer-names
 -  "`eshell-buffer-name' is a member of `same-window-buffer-names'"
 -  (member eshell-buffer-name same-window-buffer-names))
 -
+ (defcustom eshell-directory-name
+   (locate-user-emacs-file "eshell/" ".eshell/")
    "The directory where Eshell control files should be kept."
    :type 'directory
    :group 'eshell)
diff --cc lisp/files.el
Simple merge
diff --cc lisp/frame.el
Simple merge
Simple merge
Simple merge
diff --cc lisp/info.el
Simple merge
diff --cc lisp/isearch.el
Simple merge
diff --cc lisp/loadup.el
Simple merge
Simple merge
Simple merge
Simple merge
index b030832a3092431c1e90e234704414ff940f215b,6b7c70208ea2b2203f778266b37ec53dd300e19b..b5c8e4d31c19f38d5c05d4a3ba1d7c73845f4dce
@@@ -1632,14 -1621,14 +1621,13 @@@ The new frame is deleted when you quit 
        (had-a-buf (get-file-buffer file))
        (buf-to-view (find-file-noselect file)))
      (switch-to-buffer-other-frame buf-to-view)
-     (make-local-variable 'ebrowse--frame-configuration)
-     (setq ebrowse--frame-configuration old-frame-configuration)
-     (make-local-variable 'ebrowse--view-exit-action)
-     (setq ebrowse--view-exit-action
-         (and (not had-a-buf)
-              (not (buffer-modified-p buf-to-view))
-              'kill-buffer))
+     (set (make-local-variable 'ebrowse--frame-configuration)
+          old-frame-configuration)
+     (set (make-local-variable 'ebrowse--view-exit-action)
+          (and (not had-a-buf)
+               (not (buffer-modified-p buf-to-view))
+               'kill-buffer))
 -    (view-mode-enter (cons (selected-window) (cons (selected-window) t))
 -                   'ebrowse-view-exit-fn)))
 +    (view-mode-enter nil 'ebrowse-view-exit-fn)))
  
  (defun ebrowse-view/find-file-and-search-pattern
    (struc info file tags-file-name &optional view where)
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lisp/replace.el
Simple merge
diff --cc lisp/shell.el
index 680642974f4870b8c663690b7072c0541232bcc6,815add76502cddc3b2f0433268a01bf4b6fea296..d53a460f8d16f6fe4f7aad0d3dbdb9d6467e6e56
@@@ -560,10 -573,14 +573,14 @@@ Otherwise, one argument `-i' is passed 
                       "Default directory: " default-directory default-directory
                       t nil 'file-directory-p))))))))
    (require 'ansi-color)
-   (setq buffer (get-buffer-create (or buffer "*shell*")))
+   (setq buffer (if (or buffer (not (derived-mode-p 'shell-mode))
+                        (comint-check-proc (current-buffer)))
+                    (get-buffer-create (or buffer "*shell*"))
+                  ;; If the current buffer is a dead shell buffer, use it.
+                  (current-buffer)))
    ;; Pop to buffer, so that the buffer's window will be correctly set
    ;; when we call comint (so that comint sets the COLUMNS env var properly).
 -  (pop-to-buffer buffer)
 +  (pop-to-buffer-same-window buffer)
    (unless (comint-check-proc buffer)
      (let* ((prog (or explicit-shell-file-name
                     (getenv "ESHELL") shell-file-name))
diff --cc lisp/simple.el
Simple merge
Simple merge
diff --cc src/ChangeLog
Simple merge
diff --cc src/buffer.c
Simple merge
diff --cc src/dispnew.c
Simple merge
diff --cc src/frame.c
Simple merge
diff --cc src/print.c
Simple merge
diff --cc src/w32fns.c
Simple merge
diff --cc src/window.c
index 76ec483dfe916abc6fbc7f65888c8941aae2356c,b01714360886ff9c99adba401bdfd16b0fc60e32..276832f84b794d64c42d990a3037f78367950c22
@@@ -5214,6 -5762,12 +5217,12 @@@ zero means top of window, negative mean
    int this_scroll_margin;
  #endif
  
 -  
+   if (!(BUFFERP (w->buffer)
+       && XBUFFER (w->buffer) == current_buffer))
+     /* This test is needed to make sure PT/PT_BYTE make sense in w->buffer
+        when passed below to set_marker_both.  */
+     error ("move-to-window-line called from unrelated buffer");
++
    window = selected_window;
    start = marker_position (w->start);
    if (start < BEGV || start > ZV)
diff --cc src/window.h
index 1803accab38287b7e6e39c1ec61c53a70e002171,e49a2e6570726a1f23be35aa2aa95379b82a4bb7..6c19d304a815ba9d8d548f97136bfa1117705a76
@@@ -839,14 -785,11 +835,11 @@@ extern Lisp_Object make_window (void)
  extern Lisp_Object window_from_coordinates (struct frame *, int, int,
                                              enum window_part *, int);
  EXFUN (Fwindow_dedicated_p, 1);
 -extern void set_window_height (Lisp_Object, int, int);
 -extern void set_window_width (Lisp_Object, int, int);
 -extern void change_window_heights (Lisp_Object, int);
 -extern void delete_all_subwindows (struct window *);
 +extern int window_height (Lisp_Object);
 +extern int window_width (Lisp_Object);
 +extern void resize_frame_windows (struct frame *, int, int);
 +extern void delete_all_subwindows (Lisp_Object);
  extern void freeze_window_starts (struct frame *, int);
- extern void foreach_window (struct frame *,
-                             int (* fn) (struct window *, void *),
-                           void *);
  extern void grow_mini_window (struct window *, int);
  extern void shrink_mini_window (struct window *);
  extern int window_relative_x_coord (struct window *, enum window_part, int);
@@@ -927,9 -870,9 +920,8 @@@ struct glyph *get_phys_cursor_glyph (st
  extern Lisp_Object Qwindowp, Qwindow_live_p;
  extern Lisp_Object Vwindow_list;
  
- EXFUN (Fwindow_end, 2);
  EXFUN (Fselected_window, 0);
  EXFUN (Fwindow_minibuffer_p, 1);
 -EXFUN (Fdelete_window, 1);
  EXFUN (Fwindow_buffer, 1);
  EXFUN (Fget_buffer_window, 2);
  EXFUN (Fsave_window_excursion, UNEVALLED);
@@@ -939,15 -882,9 +931,11 @@@ extern int compare_window_configuration
  EXFUN (Fpos_visible_in_window_p, 3);
  extern void mark_window_cursors_off (struct window *);
  extern int window_internal_height (struct window *);
 +extern int window_body_lines (struct window *w);
 +extern int window_body_cols (struct window *w);
  EXFUN (Frecenter, 1);
- EXFUN (Fscroll_other_window, 1);
- EXFUN (Fset_window_start, 3);
  extern void temp_output_buffer_show (Lisp_Object);
 -extern void replace_buffer_in_all_windows (Lisp_Object);
 +extern void replace_buffer_in_windows_safely (Lisp_Object);
  extern void init_window_once (void);
  extern void init_window (void);
  extern void syms_of_window (void);
diff --cc src/xdisp.c
Simple merge