Mercurial > emacs
changeset 109221:d5e171b53de0
Merge from mainline.
| author | Katsumi Yamaoka <katsumi@flagship2> |
|---|---|
| date | Sat, 12 Jun 2010 11:47:36 +0000 |
| parents | 1d9fd74dc4ac (current diff) 580a6ea34172 (diff) |
| children | 81f2d1ac795c |
| files | |
| diffstat | 5 files changed, 29 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Jun 12 10:24:14 2010 +0000 +++ b/lisp/ChangeLog Sat Jun 12 11:47:36 2010 +0000 @@ -1,3 +1,7 @@ +2010-06-12 Eli Zaretskii <eliz@gnu.org> + + * files.el (make-directory): Doc fix (bug#6396). + 2010-06-12 Michael Albinus <michael.albinus@gmx.de> * net/tramp.el (tramp-remote-process-environment): Protect version
--- a/lisp/files.el Sat Jun 12 10:24:14 2010 +0000 +++ b/lisp/files.el Sat Jun 12 11:47:36 2010 +0000 @@ -4635,16 +4635,17 @@ (force-mode-line-update)))) (defun make-directory (dir &optional parents) - "Create the directory DIR and any nonexistent parent dirs. -If DIR already exists as a directory, signal an error, unless PARENTS is set. - -Interactively, the default choice of directory to create -is the current default directory for file names. -That is useful when you have visited a file in a nonexistent directory. - -Noninteractively, the second (optional) argument PARENTS says whether -to create parent directories if they don't exist. Interactively, -this happens by default." + "Create the directory DIR and optionally any nonexistent parent dirs. +If DIR already exists as a directory, signal an error, unless +PARENTS is non-nil. + +Interactively, the default choice of directory to create is the +current buffer's default directory. That is useful when you have +visited a file in a nonexistent directory. + +Noninteractively, the second (optional) argument PARENTS, if +non-nil, says whether to create parent directories that don't +exist. Interactively, this happens by default." (interactive (list (read-file-name "Make directory: " default-directory default-directory nil nil)
--- a/src/ChangeLog Sat Jun 12 10:24:14 2010 +0000 +++ b/src/ChangeLog Sat Jun 12 11:47:36 2010 +0000 @@ -1,3 +1,12 @@ +2010-06-12 Eli Zaretskii <eliz@gnu.org> + + * window.c (syms_of_window): Doc fix (bug#6409). + +2010-06-12 Romain Francoise <romain@orebokech.com> + + * Makefile.in (lisp, shortlisp): Use new location of vc-hooks and + ediff-hook. + 2010-06-10 Glenn Morris <rgm@gnu.org> * editfns.c (Fbyte_to_string): Pacify compiler.
--- a/src/Makefile.in Sat Jun 12 10:24:14 2010 +0000 +++ b/src/Makefile.in Sat Jun 12 11:47:36 2010 +0000 @@ -458,8 +458,8 @@ ${lispsource}textmodes/text-mode.elc \ ${lispsource}emacs-lisp/timer.elc \ ${lispsource}jka-cmpr-hook.elc \ - ${lispsource}vc-hooks.elc \ - ${lispsource}ediff-hook.elc \ + ${lispsource}vc/vc-hooks.elc \ + ${lispsource}vc/ediff-hook.elc \ ${lispsource}epa-hook.elc \ ${TOOLTIP_SUPPORT} \ ${MSDOS_SUPPORT} \ @@ -549,9 +549,9 @@ ../lisp/textmodes/paragraphs.elc \ ../lisp/textmodes/text-mode.elc \ ../lisp/emacs-lisp/timer.elc \ - ../lisp/vc-hooks.elc \ + ../lisp/vc/vc-hooks.elc \ + ../lisp/vc/ediff-hook.elc \ ../lisp/jka-cmpr-hook.elc \ - ../lisp/ediff-hook.elc \ ../lisp/epa-hook.elc \ ../lisp/widget.elc \ ../lisp/window.elc \
--- a/src/window.c Sat Jun 12 10:24:14 2010 +0000 +++ b/src/window.c Sat Jun 12 11:47:36 2010 +0000 @@ -7290,7 +7290,7 @@ DEFVAR_LISP ("recenter-redisplay", &Vrecenter_redisplay, doc: /* If non-nil, then the `recenter' command with a nil argument -the entire frame to be redrawn; the special value `tty' causes the +will redraw the entire frame; the special value `tty' causes the frame to be redrawn only if it is a tty frame. */); Vrecenter_redisplay = Qtty;