Mercurial > emacs
changeset 83151:2c7da91ab69b
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-382
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-191
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Mon, 07 Jun 2004 19:20:00 +0000 |
| parents | cf8f0a3b5cb4 (current diff) bbba5d83d7d3 (diff) |
| children | 632f9d4fdffb |
| files | lisp/ChangeLog |
| diffstat | 3 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Jun 07 08:00:27 2004 +0000 +++ b/lisp/ChangeLog Mon Jun 07 19:20:00 2004 +0000 @@ -1,3 +1,8 @@ +2004-06-06 Emilio C. Lopes <eclig@gmx.net> + + * eshell/esh-cmd.el (eshell/which): Respect commands quoted with + eshell-explicit-command-char. + 2004-06-06 Juanma Barranquero <lektu@terra.es> * help-fns.el (help-argument-name): Inherit from italic face only
--- a/lisp/eshell/esh-cmd.el Mon Jun 07 08:00:27 2004 +0000 +++ b/lisp/eshell/esh-cmd.el Mon Jun 07 19:20:00 2004 +0000 @@ -1246,9 +1246,8 @@ (setq program (eshell-search-path name)) (let* ((esym (eshell-find-alias-function name)) (sym (or esym (intern-soft name)))) - (if (and sym (fboundp sym) - (or esym eshell-prefer-lisp-functions - (not program))) + (if (and (or esym (and sym (fboundp sym))) + (or eshell-prefer-lisp-functions (not direct))) (let ((desc (let ((inhibit-redisplay t)) (save-window-excursion (prog1
--- a/src/ChangeLog Mon Jun 07 08:00:27 2004 +0000 +++ b/src/ChangeLog Mon Jun 07 19:20:00 2004 +0000 @@ -1,6 +1,6 @@ 2004-06-07 Miles Bader <miles@gnu.org> - * (struct named_merge_point): New type. + * xfaces.c (struct named_merge_point): New type. (push_named_merge_point): New function. (merge_named_face): New function. (merge_face_ref, face_at_buffer_position, face_at_string_position):