]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from trunk
authorMartin Rudalics <rudalics@gmx.at>
Mon, 8 Nov 2010 07:45:57 +0000 (08:45 +0100)
committerMartin Rudalics <rudalics@gmx.at>
Mon, 8 Nov 2010 07:45:57 +0000 (08:45 +0100)
17 files changed:
1  2 
lisp/ChangeLog
lisp/dired.el
lisp/emacs-lisp/elint.el
lisp/gnus/ChangeLog
lisp/gnus/message.el
lisp/mail/sendmail.el
lisp/mh-e/ChangeLog
lisp/play/decipher.el
lisp/progmodes/ebrowse.el
lisp/progmodes/python.el
lisp/shell.el
lisp/simple.el
src/ChangeLog
src/dispnew.c
src/w32fns.c
src/xdisp.c
src/xfns.c

diff --cc lisp/ChangeLog
index e0ae662f3eca7835d16cde4aeae8ec1b4524fbdf,4c106b95c74770224b9a8f2572ba2aac6fb436a8..ae057f50552d66cf0cfc5e57d0529f7accab8225
 +2010-11-07  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * ielm.el (top-level): Remove autoloaded add-hook for
 +      same-window-buffer-names.
 +      (ielm): Use pop-to-buffer-same-window.
 +
 +      * progmodes/inf-lisp.el (inferior-lisp): Use
 +      pop-to-buffer-same-window.
 +      (top-level): Remove autoloaded add-hook for
 +      same-window-buffer-names.
 +      (switch-to-lisp): Use pop-to-buffer with tailored specifiers.
 +
 +      * replace.el (occur-mode-goto-occurrence): Use
 +      pop-to-buffer-other-window.
 +      (occur-mode-display-occurrence): Use
 +      display-buffer-other-window.
 +
 +      * shell.el (shell): Use pop-to-buffer-same-window.
 +      (top-level): Remove autoloaded add-hook for
 +      same-window-buffer-names.
 +
 +      * net/rlogin.el: (top-level): Remove autoloaded add-hook for
 +      same-window-regexps.
 +      (rlogin): Use pop-to-buffer-same-window.
 +
 +      * net/telnet.el (top-level): Remove two autoloaded add-hooks for
 +      same-window-regexps.
 +      (telnet, rsh): Use pop-to-buffer-same-window.
 +
+ 2010-11-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * emacs-lisp/smie.el: Simplify the smie-rules-function return values.
+       (smie-precs->prec2): Rename from smie-precs-precedence-table.
+       (smie-bnf->prec2): Rename from smie-bnf-precedence-table.
+       (smie-prec2->grammar): Rename from smie-prec2-levels.
+       (smie-grammar): Rename from smie-op-levels.
+       (smie-indent--hanging-p): Rename from smie-hanging-p.
+       (smie-rule-hanging-p): New alias.
+       (smie-indent--bolp): Rename from smie-bolp.
+       (smie-indent--hanging-p): New alias.
+       (smie--token): New dynamically bound variable.
+       (smie-indent--parent): New function.
+       (smie-rule-parent-p): Use it; rename from smie-parent-p.
+       (smie-rule-next-p): Rename from smie-next-p.
+       (smie-rule-prev-p): Rename from smie-prev-p.
+       (smie-rule-sibling-p, smie-rule-parent)
+       (smie-indent--separator-outdent, smie-rule-separator): New functions.
+       (smie-rule-separator-outdent): New var.
+       (smie-indent--rule): Merge with smie-indent--column.
+       (smie-indent-forward-token, smie-indent-backward-token):
+       Also recognize close parens.
+       (smie-indent-keyword): Don't use smie-indent--column any more.
+       (smie-indent-after-keyword): Ignore closers by default.
+       (smie-indent-line): Use with-demoted-errors.
+       * progmodes/octave-mod.el (octave-smie-grammar):
+       Rename from octave-smie-op-levels.
+       (octave-smie-rules): Adjust to new behavior.
+       * progmodes/prolog.el (prolog-smie-grammar):
+       Rename from prolog-smie-op-levels.
+ 2010-11-07  Glenn Morris  <rgm@gnu.org>
+       * eshell/esh-util.el (subst-char-in-string)
+       (directory-files-and-attributes): These compatibility definitions are
+       not needed on any version of Emacs since at least 21.4.
+       * progmodes/verilog-mode.el (verilog-get-beg-of-line)
+       (verilog-get-end-of-line): Remove.
+       (verilog-within-string, verilog-re-search-forward-substr)
+       (verilog-re-search-backward-substr, verilog-set-auto-endcomments)
+       (verilog-surelint-off, verilog-getopt-file, verilog-highlight-region):
+       Use point-at-bol, point-at-eol.
+       * progmodes/pascal.el (pascal-get-beg-of-line, pascal-get-end-of-line):
+       Remove.
+       (pascal-declaration-end, pascal-declaration-beg, pascal-within-string)
+       (electric-pascal-terminate-line, pascal-set-auto-comments)
+       (pascal-indent-paramlist, pascal-indent-declaration)
+       (pascal-get-lineup-indent, pascal-func-completion)
+       (pascal-get-completion-decl, pascal-var-completion, pascal-completion):
+       Use point-at-bol, point-at-eol.
+       * progmodes/flymake.el (flymake-line-beginning-position)
+       (flymake-line-end-position): Remove.
+       (flymake-highlight-line): Use point-at-bol, point-at-eol.
+       * eshell/esh-util.el (line-end-position, line-beginning-position):
+       Remove compat definitions.
+       * emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
+       Use end-of-line N.
+       (checkdoc-this-string-valid-engine, checkdoc-file-comments-engine):
+       Use line-end-position.
+       * emacs-lisp/chart.el (chart-zap-chars):
+       * play/decipher.el (decipher-set-map):
+       * progmodes/ada-mode.el (ada-get-current-indent)
+       (ada-search-ignore-string-comment, ada-tab-hard, ada-untab-hard):
+       * progmodes/ada-prj.el (ada-prj-load-from-file, ada-prj-display-help):
+       * progmodes/ada-xref.el (ada-initialize-runtime-library)
+       (ada-get-all-references):
+       * progmodes/cperl-mode.el (cperl-electric-paren)
+       (cperl-electric-rparen, cperl-electric-keyword, cperl-electric-else)
+       (cperl-linefeed, cperl-sniff-for-indent, cperl-to-comment-or-eol)
+       (cperl-find-pods-heres, cperl-indent-exp, cperl-fix-line-spacing)
+       (cperl-word-at-point-hard):
+       * progmodes/idlw-shell.el (idlwave-shell-move-or-history)
+       (idlwave-shell-filename-string, idlwave-shell-batch-command)
+       (idlwave-shell-display-line):
+       * progmodes/idlwave.el (idlwave-show-begin, idlwave-fill-paragraph)
+       (idlwave-calc-hanging-indent, idlwave-auto-fill, idlwave-template):
+       * progmodes/js.el (js--re-search-forward-inner)
+       (js--re-search-backward-inner):
+       * progmodes/vhdl-mode.el (vhdl-align-region-1, vhdl-align-region-2)
+       (vhdl-fix-clause, vhdl-compose-configuration-architecture):
+       * progmodes/ruby-mode.el (ruby-parse-partial, eval-when-compile):
+       * textmodes/flyspell.el (flyspell-process-localwords):
+       * textmodes/ispell.el (ispell-buffer-local-parsing)
+       (ispell-buffer-local-dict, ispell-buffer-local-words):
+       Use point-at-bol and point-at-eol.
+       * speedbar.el (speedbar-generic-item-info)
+       (speedbar-item-info-tag-helper, speedbar-change-expand-button-char)
+       (speedbar-add-indicator, speedbar-check-vc-this-line)
+       (speedbar-check-obj-this-line, speedbar-extract-one-symbol)
+       (speedbar-buffers-line-directory, speedbar-buffer-revert-buffer):
+       Replace more uses of end-of-line etc with line-end-position.
 +2010-11-06  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * mail/sendmail.el (mail-bury): Do something similar to
 +      quit-restore-window.
 +      (top-level): Don't change same-window-buffer-names via add-hook
 +      any more.
 +      (mail): Use pop-to-buffer-same-window.
 +      (mail-other-window): Use pop-to-buffer-other-window.
 +      (mail-other-frame): Use pop-to-buffer-other-frame.
 +
 +      * simple.el (display-message-or-buffer): Rename argument FRAME
 +      to IGNORE because it's ignored.  Change call to display-buffer
 +      accordingly.
 +      (sendmail-user-agent-compose): Remove let bindings around call
 +      to switch-function; the latter should have been bound to an
 +      appropriate function already.
 +      (clone-buffer): Call pop-to-buffer-other-window.
 +      (clone-indirect-buffer): New semantices of display-flag
 +      argument.
 +      (clone-indirect-buffer-other-window): Interactively set
 +      display-flag to 'other-window.
 +
 +      * calendar/solar.el (sunrise-sunset): Use with-help-window instead
 +      of with-output-to-temp-buffer.
 +
 +      * textmodes/bibtex.el (bibtex-search-entry): Use
 +      pop-to-buffer-same-window.
 +
 +      * cmuscheme.el (run-scheme): Use pop-to-buffer-same-window.
 +      (top-level): Remove autoloaded add-hook for
 +      same-window-buffer-names.
 +
 +      * eshell/eshell.el (eshell-add-to-window-buffer-names)
 +      (eshell-remove-from-window-buffer-names): Remove.
 +      (eshell-unload-hook): Don't call
 +      eshell-remove-from-window-buffer-names.
 +      (eshell-buffer-name): Don't call
 +      eshell-remove-from-window-buffer-names and
 +      eshell-add-to-window-buffer-names.
 +      (top-level): Remove eshell-deftest call to check for
 +      same-window-buffer-names.
 +      (eshell): Call pop-to-buffer-same-window.
 +
 +      * files.el (display-buffer-other-frame): Remove.
 +
+ 2010-11-06  Glenn Morris  <rgm@gnu.org>
+       * textmodes/texnfo-upd.el (texinfo-start-menu-description)
+       (texinfo-update-menu-region-beginning, texinfo-menu-first-node)
+       (texinfo-delete-existing-pointers, texinfo-find-pointer)
+       (texinfo-clean-up-node-line, texinfo-insert-node-lines)
+       (texinfo-multiple-files-update):
+       * textmodes/table.el (table--probe-cell-left-up)
+       (table--probe-cell-right-bottom):
+       * textmodes/picture.el (picture-tab-search):
+       * textmodes/page-ext.el (pages-copy-header-and-position)
+       (pages-directory-for-addresses):
+       * progmodes/vera-mode.el (vera-get-offset):
+       * progmodes/simula.el (simula-calculate-indent):
+       * progmodes/python.el (python-pdbtrack-overlay-arrow):
+       * progmodes/prolog.el (end-of-prolog-clause):
+       * progmodes/perl-mode.el (perl-calculate-indent, perl-indent-exp):
+       * progmodes/icon.el (indent-icon-exp):
+       * progmodes/etags.el (tag-re-match-p):
+       * progmodes/ebrowse.el (ebrowse-show-file-name-at-point):
+       * progmodes/ebnf2ps.el (ebnf-begin-file):
+       * progmodes/dcl-mode.el (dcl-back-to-indentation-1)
+       (dcl-save-local-variable):
+       * play/life.el (life-setup):
+       * play/gametree.el (gametree-looking-at-ply):
+       * nxml/nxml-maint.el (nxml-insert-target-repertoire-glyph-set):
+       * mail/sendmail.el (mail-mode-auto-fill):
+       * emacs-lisp/lisp-mode.el (calculate-lisp-indent):
+       * emacs-lisp/edebug.el (edebug-overlay-arrow):
+       * emacs-lisp/checkdoc.el (checkdoc-this-string-valid):
+       * woman.el (woman-parse-numeric-value, woman2-TH, woman2-SH)
+       (woman-tab-to-tab-stop, WoMan-warn-ignored):
+       * type-break.el (type-break-file-keystroke-count):
+       * term.el (term-replace-by-expanded-history-before-point)
+       (term-skip-prompt, term-extract-string):
+       * speedbar.el (speedbar-edit-line, speedbar-expand-line)
+       (speedbar-contract-line, speedbar-toggle-line-expansion)
+       (speedbar-parse-c-or-c++tag, speedbar-parse-tex-string)
+       (speedbar-buffer-revert-buffer, speedbar-highlight-one-tag-line):
+       * sort.el (sort-skip-fields):
+       * skeleton.el (skeleton-internal-list):
+       * simple.el (line-move-finish, line-move-to-column):
+       * shell.el (shell-forward-command):
+       * misc.el (copy-from-above-command):
+       * makesum.el (double-column):
+       * ebuff-menu.el (electric-buffer-update-highlight):
+       * dired.el (dired-move-to-end-of-filename):
+       * dframe.el (dframe-popup-kludge):
+       * bookmark.el (bookmark-kill-line, bookmark-bmenu-show-filenames):
+       * arc-mode.el (archive-get-lineno):
+       Use line-end-position and line-beginning-position.
+       * progmodes/idlwave.el (idlwave-routine-entry-compare-twins):
+       (idlwave-study-twins): Prefix dynamic local `class'.
+       (idlwave-routine-twin-compare): Update for above name change.
+       * emacs-lisp/eieio-comp.el (byte-compile-file-form-defmethod):
+       Use boundp tests to silence compiler.  Update for changed name of
+       bytecomp-filename variable.
+       * emulation/viper-cmd.el (viper-read-string-with-history):
+       Prefix dynamic local `initial'.
+       (viper-minibuffer-standard-hook): Update for above name change.
+       * emacs-lisp/elint.el (elint-init-env): Prefix dynamic local `env'.
+       (elint-init-form): Update for above name change.
+       * mail/mail-extr.el (mail-extract-address-components): Give dynamic
+       local variables `cbeg' and `cend' a prefix.
+       (mail-extr-voodoo): Update for above name change.
+       * textmodes/reftex-toc.el (reftex-toc-do-promote)
+       (reftex-toc-promote-prepare): Pass `delta' as an explicit argument.
+       (reftex-toc-promote-action): Doc fix.
+       * textmodes/reftex-sel.el (reftex-select-item): Give local variables
+       `prompt', `data' a prefix.
+       (reftex-select-post-command-hook, reftex-select-callback)
+       (reftex-select-mouse-accept, reftex-select-read-cite):
+       Update for above name changes.
+       * textmodes/reftex-ref.el (reftex-reference): Rename local variable
+       `refstyle' to reftex-refstyle.
+       (reftex-offer-label-menu): Update for above name change.
+       * textmodes/reftex-sel.el (reftex-select-toggle-varioref): Update for
+       `refstyle' name change.
+       * vc/emerge.el (emerge-eval-in-buffer): Remove, and replace all uses
+       with with-current-buffer.
+       (diff, template): Give dynamic local variables a prefix.
+       (emerge-line-numbers): Rename local `diff' to emerge-line-diff.
+       (emerge-line-number-in-buf): Update for above name change.
+       (emerge-combine-versions-internal): Rename local `template' to
+       emerge-combine-template.
+       (emerge-combine-versions-edit): Update for above name change.
+ 2010-11-06  Ralf Angeli  <angeli@caeruleus.net>
+       * textmodes/reftex-cite.el
+       (reftex-extract-bib-entries-from-thebibliography): Match bibitem
+       entries with whitespace after \bibitem.
+       (reftex-create-bibtex-file): Match entries containing numbers and
+       symbol constituents.  Make sure that entries with whitespace at
+       various places are found.
 +2010-11-05  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * window.el (display-buffer-even-sizes)
 +      (display-buffer-adjust-height, display-buffer-adjust-width)
 +      (display-buffer-in-new-window, kill-buffer-and-window): Use
 +      ignore-errors instead of condition-case.
 +
 +      * electric.el (Electric-pop-up-window): Use buffer display
 +      specifiers.
 +
 +      * emacs-lisp/elint.el (elint-display-log): Use
 +      display-buffer-other-window.
 +
 +      * vc/pcvs-util.el (cvs-pop-to-buffer-same-frame): Use buffer
 +      display specifiers.
 +
 +      * printing.el (pr-file-list): Comment out bindings of
 +      pop-up-windows and pop-up-frames.
 +
 +      * mail/reporter.el (reporter-submit-bug-report): Use
 +      pop-to-buffer-other-window and display specifiers.
 +
+ 2010-11-05  Christian Millour  <cm@abtela.com>  (tiny change)
+       * shell.el (shell-process-popd): Made aware of comint-file-name-prefix.
+ 2010-11-05  Jan Djärv  <jan.h.d@swipnet.se>
+       * mouse.el (mouse-yank-primary): Update comment (Bug#6802).
+ 2010-11-05  Glenn Morris  <rgm@gnu.org>
+       * woman.el (woman0-roff-buffer, woman1-roff-buffer)
+       (woman2-roff-buffer): Give local variable `request' a prefix.
+       (woman0-macro): Rename argument `request' in the same way.
+       (woman-request): New name for `request' dynamic variable.
+       (woman-unquote, woman-forward-arg): Update for above name change.
+       (woman1-roff-buffer): Give local variable `unquote' a prefix.
+       (woman1-unquote): New name for `unquote' dynamic variable.
+       (woman1-B-or-I, woman1-alt-fonts): Update for above name change.
+       (woman-translations): Rename from `translations'.  No longer global.
+       (woman2-tr, woman-translate): Update for above name change.
+       (woman-translate): Check for bound variable.
+       (woman2-roff-buffer): Give local variable `translations' a prefix.
+       * play/doctor.el: Give all local variables a prefix.  Update callers.
+       (doc$, doctor-put-meaning): Use backquote.
+       * emacs-lisp/cl-macs.el (loop): Give local variable args a prefix.
+       (cl-parse-loop-clause, cl-loop-handle-accum): Update for above change.
+       * emacs-lisp/byte-opt.el (byte-decompile-bytecode-1): Give local
+       variables bytes, ptr, op a prefix.
+       (disassemble-offset): Update for above change.
 +2010-11-04  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * window.el (display-buffer-names, display-buffer-regexps): Make
 +      even-window-sizes a seperate specifier.  Allow numbers and
 +      functions in the cdr of the adjust-height specifier and remove
 +      even-window-heights and the special handling of
 +      fit-window-to-buffer and shrink-window-if-larger-than-buffer.
 +      Add new specifier adjust-width similar to adjust-height.
 +      (display-buffer-normalize-specifiers-1): Fix typo.
 +      (display-buffer-even-sizes, display-buffer-adjust-height)
 +      (display-buffer-adjust-width): New functions to handle size
 +      adjustment of new window.
 +      (display-buffer-adjust-heights): Remove.
 +      (display-buffer-in-window): Don't call
 +      display-buffer-adjust-heights any more.
 +      (display-buffer-in-lru-buffer-window)
 +      (display-buffer-in-lru-window): Call display-buffer-even-sizes.
 +      (display-buffer-in-new-window): Use functionp instead of
 +      fboundp.  Call display-buffer-adjust-height and
 +      display-buffer-adjust-width.
 +      (display-buffer): Use functionp instead of fboundp.
 +      (fit-window-to-buffer): Rename argument IGNORE to OVERRIDE.
 +
 +      * progmodes/compile.el (compilation-start)
 +      (compilation-goto-locus): Use adjust-height specifier in
 +      display-buffer calls.
 +
 +      * buff-menu.el (Buffer-menu-switch-other-window)
 +      (Buffer-menu-2-window): Use buffer display specifiers.
 +
 +      * cus-edit.el (top-level): Remove autoloaded add-hook for
 +      same-window-regexps.
 +      (customize-group, customize-face): New optional argument
 +      OTHER-WINDOW.  Use buffer display specifiers.  Call
 +      custom-buffer-create with OTHER-WINDOW argument t.
 +      (customize-group-other-window): Call customize-group with
 +      OTHER-WINDOW argument t.
 +      (customize-face-other-window): Call customize-face with
 +      OTHER-WINDOW argument t.
 +      (custom-buffer-create): New optional argument OTHER-WINDOW.
 +      (custom-buffer-create-other-window): Call
 +      pop-to-buffer-other-window.
 +      (customize-browse): Call pop-to-buffer-same-window.
 +
 +      * play/decipher.el (decipher-display-range): Use
 +      pop-to-buffer-other-window.
 +      (decipher-display-stats-buffer): Use
 +      display-buffer-other-window.
 +
 +      * vc/ediff-util.el (ediff-clone-buffer-for-region-comparison):
 +      Use pop-to-buffer-other-window.
 +
 +      * ehelp.el (with-electric-help): Use pop-to-buffer-other-window.
 +
  2010-11-03  Chong Yidong  <cyd@stupidchicken.com>
  
        * emacs-lisp/package.el (package-unpack): Remove no-op.
diff --cc lisp/dired.el
Simple merge
Simple merge
index 7cac6d107e20930465bb968a63df45127ea8d0e6,4855dc195ea2959a092a76e8a283bfb07a363162..c514cddebf4f5fe2fc6daac1271f63e0856b3f23
@@@ -1,22 -1,62 +1,71 @@@
+ 2010-11-07  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+       * gnus-start.el (gnus-get-unread-articles): Ignore totally non-existent
+       methods.
+       (gnus-read-active-file): Ditto.
+       * gnus-group.el (gnus-group-read-ephemeral-group): Remove superfluous
+       ": " from the prompt.
+       (gnus-group-make-group): Ditto.
+ 2010-11-07  Glenn Morris  <rgm@gnu.org>
+       * gnus-bookmark.el (gnus-bookmark-bmenu-show-infos)
+       (gnus-bookmark-kill-line): Use point-at-eol.
+ 2010-11-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+       * gnus-gravatar.el (gnus-gravatar-transform-address): No need to skip
+       asterisks in From header.
+ 2010-11-06  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+       * gnus-ems.el (gnus-put-image): Use a blank text as the insertion
+       string to avoid making the From headers syntactically invalid.
+       * message.el (message-send-mail): Don't insert courtesy messages if the
+       message already has List-Post and List-ID messages.
+ 2010-11-06  Glenn Morris  <rgm@gnu.org>
+       * gnus-art.el (gnus-treat-article): Give dynamic local variables
+       `condition', `type', `length' a prefix.
+       (gnus-treat-predicate): Update for above name changes.
+ 2010-11-06  Andrew Cohen  <cohen@andy.bu.edu>
+       * nnir.el (gnus-summary-nnir-goto-thread): Remove function and
+       binding.  Handled by `gnus-summary-refer-thread' instead.
+       (nnir-warp-to-article): New backend function.
+       * nnimap.el (nnimap-request-thread): Force dependency updating.
+       * gnus-sum.el (gnus-fetch-headers): Allow more arguments.
+       (gnus-summary-refer-thread): Rework to improve thread-referral.
+       * gnus-int.el (gnus-warp-to-article): New function.
+       * gnus-sum.el (gnus-summary-article-map): Bind it.
 +2010-11-05  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * message.el (message-mail-other-window)
 +      (message-news-other-window): Pass pop-to-buffer-other-window as
 +      switch-function to message-pop-to-buffer.
 +      (message-mail-other-frame, message-news-other-frame): Pass
 +      pop-to-buffer-other-frame as switch-function to
 +      message-pop-to-buffer.
 +
  2010-11-04  Andrew Cohen  <cohen@andy.bu.edu>
  
-       * nnir.el (gnus-summary-nnir-goto-thread): limiting work done by
+       * nnir.el (gnus-summary-nnir-goto-thread): Limit work done by
        gnus-summary-refer-thread.
  
-       * gnus-sum.el (gnus-build-all-threads): force updating of dependency
+       * gnus-sum.el (gnus-build-all-threads): Force updating of dependency
        headers.
-       (gnus-summary-limit-include-thread): prevent articles in thread from
+       (gnus-summary-limit-include-thread): Prevent articles in thread from
        being cut in gnus-cut-threads.
-       (gnus-summary-refer-thread): limit retrieved headers to those in
+       (gnus-summary-refer-thread): Limit retrieved headers to those in
        thread.
  
  2010-11-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
Simple merge
Simple merge
index c3814795ba9fcd5c36d67ad3a2e2d5a655e59575,336fd0100c19d0cc98acacd6b9abc67ab5a35cbf..7589da494618b7927e82025c891920afe167c0fa
@@@ -1,12 -1,7 +1,16 @@@
+ 2010-11-07  Glenn Morris  <rgm@gnu.org>
+       * mh-seq.el (mh-read-msg-list): Use point-at-eol.
 +2010-11-05  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * mh-comp.el (mh-send-other-window): Pass t as extra argument to
 +      mh-send-sub.
 +      (mh-send-sub): New optional argument OTHER-WINDOW. Pass extra
 +      argument to mh-read-draft.
 +      (mh-read-draft): New optional argument OTHER-WINDOW. Pass it in
 +      suitable fashion to pop-to-buffer.
 +
  2010-11-03  Glenn Morris  <rgm@gnu.org>
  
        * mh-mime.el (dots, type, ov): Avoid unnecessary declaration.
Simple merge
Simple merge
Simple merge
diff --cc lisp/shell.el
Simple merge
diff --cc lisp/simple.el
Simple merge
diff --cc src/ChangeLog
Simple merge
diff --cc src/dispnew.c
Simple merge
diff --cc src/w32fns.c
Simple merge
diff --cc src/xdisp.c
Simple merge
diff --cc src/xfns.c
Simple merge