# HG changeset patch # User Miles Bader # Date 1180068949 0 # Node ID b3bd944f9137946d6ae31592644b7f6dcaee4861 # Parent 2f7d72970d55b92b2681d1ac17b7aa398137fd71# Parent 97f97985d98989fbefd7cde82c8a9070bac0a00a 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 * lisp/vc-hooks.el (vc-find-root): Fix file attribute test. 2007-05-24 Richard Stallman * 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 diff -r 2f7d72970d55 -r b3bd944f9137 admin/nt/dump.bat --- a/admin/nt/dump.bat Fri May 25 02:38:05 2007 +0000 +++ b/admin/nt/dump.bat Fri May 25 04:55:49 2007 +0000 @@ -10,8 +10,6 @@ :dump rem Overwrites emacs.exe if still present -mkdir ..\lib-src -copy fns* ..\lib-src mkdir obj mkdir obj\i386 mkdir obj\etc diff -r 2f7d72970d55 -r b3bd944f9137 admin/nt/makedist.bat --- a/admin/nt/makedist.bat Fri May 25 02:38:05 2007 +0000 +++ b/admin/nt/makedist.bat Fri May 25 04:55:49 2007 +0000 @@ -25,8 +25,6 @@ rem Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, rem Boston, MA 02110-1301, USA. -set ZIP=zip - if (%3) == () goto usage if not (%4) == () goto %4 @@ -34,18 +32,25 @@ echo Create full bin distribution copy %3\README.W32 emacs-%1\README.W32 - -%ZIP% -x emacs.mdp -x *.pdb -x *.opt -x *~ -x CVS -9 emacs-%1/BUGS emacs-%1/README emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc emacs-%1/info emacs-%1/lisp %2-bin-i386.zip +rem Info-ZIP zip seems to be broken on Windows. +rem It always writes to zip.zip and treats the zipfile argument as one +rem of the files to go in it. +rem zip -9 -r %2-bin-i386 emacs-%1/BUGS emacs-%1/README emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc emacs-%1/info emacs-%1/lisp emacs-%1/leim -x emacs.mdp *.pdb *.opt *~ CVS +7z a -tZIP -mx=9 -xr!emacs.mdp -xr!*.pdb -xr!*.opt -xr!*~ -xr!CVS -xr!.arch-inventory %2-bin-i386.zip emacs-%1/BUGS emacs-%1/README emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc emacs-%1/info emacs-%1/lisp emacs-%1/leim del emacs-%1\README.W32 if not (%4) == () goto end :barebin - echo Create archive with just the basic binaries and generated files echo (the user needs to unpack the full source distribution for echo everything else) copy %3\README.W32 emacs-%1\README.W32 -%ZIP% -9 emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc/DOC emacs-%1/etc/DOC-X %2-barebin-i386.zip +copy %3\dump.bat emacs-%1\bin\dump.bat +rem Info-ZIP zip seems to be broken on Windows. +rem It always writes to zip.zip and treats the zipfile argument as one +rem of the files to go in it. +rem zip -9 -r %2-barebin-i386.zip emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc/DOC-X +7z a -tZIP -mx=9 %2-barebin-i386.zip emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc/DOC-X del emacs-%1\README.W32 if not (%4) == () goto end diff -r 2f7d72970d55 -r b3bd944f9137 lisp/ChangeLog --- a/lisp/ChangeLog Fri May 25 02:38:05 2007 +0000 +++ b/lisp/ChangeLog Fri May 25 04:55:49 2007 +0000 @@ -1,3 +1,13 @@ +2007-05-25 Miles Bader + + * vc-hooks.el (vc-find-root): Fix file attribute test. + +2007-05-24 Richard Stallman + + * 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 * image-mode.el (image-forward-hscroll, image-backward-hscroll) diff -r 2f7d72970d55 -r b3bd944f9137 lisp/textmodes/flyspell.el --- a/lisp/textmodes/flyspell.el Fri May 25 02:38:05 2007 +0000 +++ b/lisp/textmodes/flyspell.el Fri May 25 04:55:49 2007 +0000 @@ -2025,6 +2025,7 @@ (error "Pop-up menus do not work on this terminal")) ;; use the correct dictionary (flyspell-accept-buffer-local-defs) + (or opoint (setq opoint (point-marker))) (let ((cursor-location (point)) (word (flyspell-get-word nil))) (if (consp word) @@ -2133,6 +2134,8 @@ ;;*---------------------------------------------------------------------*/ (defun flyspell-emacs-popup (event poss word) "The Emacs popup menu." + (unless window-system + (error "This command requires pop-up dialogs")) (if (not event) (let* ((mouse-pos (mouse-position)) (mouse-pos (if (nth 1 mouse-pos) diff -r 2f7d72970d55 -r b3bd944f9137 lisp/vc-hooks.el --- a/lisp/vc-hooks.el Fri May 25 02:38:05 2007 +0000 +++ b/lisp/vc-hooks.el Fri May 25 04:55:49 2007 +0000 @@ -325,7 +325,7 @@ ;; to another user. This should save us from looking in ;; things like /net and /afs. This assumes that all the ;; files inside a project belong to the same user. - (not (equal user (file-attributes file))) + (not (equal user (nth 2 (file-attributes file)))) (string-match vc-ignore-dir-regexp file))) (if (file-exists-p (expand-file-name witness file)) (setq root file)