From: Miles Bader <miles@gnu.org>
Date: Fri, 25 May 2007 04:55:49 +0000 (+0000)
Subject: Merge from emacs--rel--22
X-Git-Tag: emacs-pretest-23.0.90~12557
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c1587aff5527edb84ff15694c318aaabe9cc6d8d;p=emacs.git

Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 26-27)

   - Update from CVS
   - lisp/vc-hooks.el (vc-find-root): Fix file attribute test

2007-05-25  Miles Bader  <miles@fencepost.gnu.org>

   * lisp/vc-hooks.el (vc-find-root): Fix file attribute test.

2007-05-24  Richard M. Stallman  <rms@gnu.org>

   * lisp/textmodes/flyspell.el (flyspell-correct-word-before-point):
   Don't let opoint be nil.
   (flyspell-emacs-popup): Explicit error if no dialogs.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-772
---

c1587aff5527edb84ff15694c318aaabe9cc6d8d
diff --cc lisp/ChangeLog
index 3ecb03ad1a4,93f2477b07f..be975f67e99
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,29 -1,13 +1,39 @@@
+ 2007-05-25  Miles Bader  <miles@fencepost.gnu.org>
+ 
+ 	* vc-hooks.el (vc-find-root): Fix file attribute test.
+ 
+ 2007-05-24  Richard Stallman  <rms@gnu.org>
+ 
+ 	* textmodes/flyspell.el (flyspell-correct-word-before-point):
+ 	Don't let opoint be nil.
+ 	(flyspell-emacs-popup): Explicit error if no dialogs.
+ 
 +2007-05-24  Chong Yidong  <cyd@stupidchicken.com>
 +
 +	* image-mode.el (image-forward-hscroll, image-backward-hscroll)
 +	(image-next-line, image-previous-line, image-scroll-up)
 +	(image-scroll-down, image-bol, image-eol, image-bob, image-eob):
 +	New functions.
 +	(image-mode-map): Remap motion commands.
 +	(image-mode-text-map): New keymap for viewing images as text.
 +	(image-mode): Use image-mode-map.
 +	(image-toggle-display): Toggle auto-hscroll-mode and mode keymaps.
 +
 +2007-05-24  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +	* textmodes/fill.el (canonically-space-region): Make the second arg
 +	a marker if it's not already the case.
 +
 +2007-05-23  Eli Zaretskii  <eliz@gnu.org>
 +
 +	* tar-mode.el (tar-header-block-summarize, tar-summarize-buffer)
 +	(tar-get-descriptor): Handle type 55, an extended pax header.
 +
 +2007-05-23  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +	* autoinsert.el (auto-insert-alist): Quote elisp sample code so as not
 +	to confuse outline-minor-mode.
 +
  2007-05-23  Eli Zaretskii  <eliz@gnu.org>
  
  	* tar-mode.el (tar-file-name-handler): New function.