diff options
| -rw-r--r-- | lisp/ChangeLog | 21 | ||||
| -rw-r--r-- | lisp/progmodes/compile.el | 8 |
2 files changed, 17 insertions, 12 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2f2c7c012f..b39bc02837 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,7 +1,12 @@ +2002-10-28 Juanma Barranquero <[email protected]> + + * progmodes/compile.el (grep-find-use-xargs): Fix docstring. Patch from + Matt Swift <[email protected]>. + 2002-10-27 Michael Kifer <[email protected]> - + * ediff-wind.el (ediff-control-frame-parameters): added scrollbar-height. - + 2002-10-27 Andreas Schwab <[email protected]> * progmodes/sh-script.el (sh-mode-syntax-table): Don't make ^L @@ -18,6 +23,11 @@ * international/code-pages.el (iso-8859-11): New. +2002-10-27 Kim F. Storm <[email protected]> + + * pcvs.el (cvs-checkout): Use read-directory-name. + (cvs-query-directory): Likewise. + 2002-10-26 Richard M. Stallman <[email protected]> * progmodes/make-mode.el (makefile-cleanup-continuations): @@ -29,7 +39,7 @@ Delete debugging setq. * shell.el (shell): Look for .emacs_SHELL under ~/.emacs.d - after looking in ~. + after looking in ~. * startup.el (command-line): Look for .emacs under ~/.emacs.d after looking in ~. @@ -56,11 +66,6 @@ * Makefile.in (compile-always): Avoid error in old Bash versions. -2002-10-27 Kim F. Storm <[email protected]> - - * pcvs.el (cvs-checkout): Use read-directory-name. - (cvs-query-directory): Likewise. - 2002-10-26 John Paul Wallington <[email protected]> * textmodes/picture.el (picture-mouse-set-point): New command. diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index a722ae6248..76f430d678 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -632,7 +632,7 @@ This variable's value takes effect when `grep-compute-defaults' is called.") (defvar grep-find-use-xargs nil "Whether \\[grep-find] uses the `xargs' utility by default. -If nil, it uses `grep -exec'; if `gnu', it uses `find -print0' and `xargs -0'; +If nil, it uses `find -exec'; if `gnu', it uses `find -print0' and `xargs -0'; if not nil and not `gnu', it uses `find -print' and `xargs'. This variable's value takes effect when `grep-compute-defaults' is called.") @@ -922,7 +922,7 @@ those sub directories of DIR." (if (stringp subdirs) subdirs (mapconcat 'identity subdirs " ")) - nil) ;; we change default-directory to dir + nil) ;; we change default-directory to dir (and grep-tree-ignore-CVS-directories "-path '*/CVS' -prune -o ") grep-tree-ignore-case)) (default-directory dir) @@ -948,9 +948,9 @@ Likewise if `compilation-buffer-name-function' is non-nil. If current buffer is in Compilation mode for the same mode name return the name of the current buffer, so that it gets reused. Otherwise, construct a buffer name from MODE-NAME." - (cond (name-function + (cond (name-function (funcall name-function mode-name)) - (compilation-buffer-name-function + (compilation-buffer-name-function (funcall compilation-buffer-name-function mode-name)) ((and (eq major-mode 'compilation-mode) (equal mode-name (nth 2 compilation-arguments))) |