QUERY If this is an automated merge, where's the actual patch? What's happening here? Why is this on XEmacs Patches? Can we lose the "with aidan's repo" part of the subject? If it's *really* automatic, there's no information there. Is this crap being generated by a cron job or something like that?

If so, is there some way to get it out of the reviewers' faces?

Aidan Kehoe writes: > changeset: 4402:e70cc8a90e9043075a0e40fe9587d2c931fb618e > tag: tip > parent: 4401:01970033faa65b61e6fdd252967bccf4bbac491c > parent: 4400:555e21a66d51b966860fc9a82a4e6a1cf40a78fe > user: Aidan Kehoe <kehoea(a)parhasard.net&gt; > date: Thu Jan 17 11:55:11 2008 +0100 > files: > description: > Automated merge with ssh://aidan-guest＠hg.debian.org//hg/xemacs/xemacs > > > diff -r 01970033faa65b61e6fdd252967bccf4bbac491c -r e70cc8a90e9043075a0e40fe9587d2c931fb618e lisp/ChangeLog > --- a/lisp/ChangeLog Thu Jan 17 11:52:45 2008 +0100 > +++ b/lisp/ChangeLog Thu Jan 17 11:55:11 2008 +0100 > ＠＠ -1,3 +1,10 ＠＠ 2008-01-16 Aidan Kehoe <kehoea＠parhasa > +2008-01-17 Mike Sperber <mike(a)xemacs.org&gt; > + > + * files.el (insert-directory): Bind `coding-system-for-read' to > + the `file-name' coding system. (Previously, the default ended up > + being undecided, which doesn't work well for UTF-8-based locales, > + for example.) > + > 2008-01-16 Aidan Kehoe <kehoea(a)parhasard.net&gt; > > * keydefs.el (global-map): > diff -r 01970033faa65b61e6fdd252967bccf4bbac491c -r e70cc8a90e9043075a0e40fe9587d2c931fb618e lisp/files.el > --- a/lisp/files.el Thu Jan 17 11:52:45 2008 +0100 > +++ b/lisp/files.el Thu Jan 17 11:55:11 2008 +0100 > ＠＠ -4177,6 +4177,9 ＠＠ If WILDCARD, it also runs the shell spec > file switches wildcard full-directory-p))) > (t > (let* ((beg (point)) > + ;; on Unix, assume that ls will output in what the > + ;; file-name coding system specifies > + (coding-system-for-read (get-coding-system 'file-name)) > (result > (if wildcard > ;; Run ls in the directory of the file pattern we asked for. > > > _______________________________________________ > XEmacs-Patches mailing list > XEmacs-Patches(a)xemacs.org > http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches