From: Miles Bader Date: Thu, 24 May 2007 06:25:50 +0000 (+0000) Subject: Merge from emacs--rel--22 X-Git-Tag: emacs-pretest-23.0.90~12567 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=274cb4e46d556c8b19e89d622065517bfb94db91;p=emacs.git Merge from emacs--rel--22 Patches applied: * emacs--rel--22 (patch 24) - Update from CVS Revision: emacs@sv.gnu.org/emacs--devo--0--patch-767 --- 274cb4e46d556c8b19e89d622065517bfb94db91 diff --cc admin/FOR-RELEASE index b3075723e31,1093e145833..e64da81cc01 --- a/admin/FOR-RELEASE +++ b/admin/FOR-RELEASE @@@ -38,17 -34,8 +38,15 @@@ to the hack introduced on 2005-07-01 t ** henman@it.to-be.co.jp 09 Aug 2006: ispell.el problem on Cygwin. (Did we decide that is unreproducible?) - ** eliz@gnu.org, May 20: EOL conversion of files in .tar archives - * BUGS +NB the definitive copy of this file for Emacs 22 is on the +EMACS_22_BASE branch. Any entries below are automatically copied from +that branch. Do not make manual changes to this file on the trunk. + +** michael.ewe@arcor.de, Apr 24: 22.0.98 not starting on Solaris 10/I386 +http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg01113.html + * FIXES FOR EMACS 22.2 Here we list small fixes that arrived too late for Emacs 22.1, but diff --cc lisp/ChangeLog index d575e417465,b1763abd2ef..f7e254153c3 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -22,12 -12,10 +22,16 @@@ * progmodes/compile.el (compilation-handle-exit): `compilation-finish-function' may change the current buffer. + 2007-05-22 Richard Stallman + + * files.el (set-auto-mode): Doc fix. + +2007-05-22 Jan Dj,Ad(Brv + + * help-fns.el (find-source-lisp-file): New function. + (describe-function-1): Use find-source-lisp-file to find source + file in compile tree. + 2007-05-22 Eli Zaretskii * dos-w32.el (find-buffer-file-type-coding-system): Doc fix. diff --cc lisp/tar-mode.el index 5d5f13776a2,31854e60407..65e2b0f1c0b --- a/lisp/tar-mode.el +++ b/lisp/tar-mode.el @@@ -747,10 -745,12 +747,10 @@@ appear on disk when you save the tar-fi ;; find-buffer-file-type-coding-system ;; (defined on dos-w32.el) to act as if ;; the file being extracted existed, so - ;; that the file's contents' encoding is - ;; auto-detected. + ;; that the file's contents' encoding and + ;; EOL format are auto-detected. (let ((file-name-handler-alist - (if (featurep 'dos-w32) - '(("" . tar-file-name-handler)) - file-name-handler-alist))) + '(("" . tar-file-name-handler)))) (car (find-operation-coding-system 'insert-file-contents (cons name (current-buffer)) t))))) diff --cc src/ChangeLog index fd75cfe94a4,3c837ccf2b5..81b44ce2bb3 --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,30 -1,7 +1,34 @@@ +2007-05-23 Johannes Weiner (tiny change) + + * keyboard.c (make_lispy_movement): Condition on HAVE_GPM too. + + 2007-05-22 Richard Stallman + + * xterm.c (x_connection_closed): Remove NO_RETURN. + +2007-05-22 Martin Rudalics + + * syntax.c (scan_words): Fix arg to UPDATE_SYNTAX_TABLE_BACKWARD. + +2007-05-21 Chong Yidong + + * image.c (uncache_image): New function. + (Fimage_refresh): New function. + +2007-05-20 Jan Dj,Ad(Brv + + * Makefile.in: Move GPM check outside HAVE_X_WINDOWS. + +2007-05-20 Nick Roberts + + * config.in, keyboard.c, Makefile.in, sysdep.c, term.c, + * termhooks.h: Use HAVE_GPM instead of HAVE_GPM_H. + +2007-05-20 Nick Roberts + + * keyboard.c (make_lispy_event): Make case GPM_CLICK_EVENT + conditional on [HAVE_GPM_H]. + 2007-05-19 Stefan Monnier * syntax.c (skip_chars): Update syntax-table only after we checked that