diff options
| -rw-r--r-- | doc/emacs/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/emacs/dired.texi | 4 | ||||
| -rw-r--r-- | lisp/ChangeLog | 12 | ||||
| -rw-r--r-- | lisp/ChangeLog.15 | 2 | ||||
| -rw-r--r-- | lisp/faces.el | 2 | ||||
| -rw-r--r-- | lisp/info.el | 2 | ||||
| -rw-r--r-- | lisp/longlines.el | 4 | ||||
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/editfns.c | 4 |
9 files changed, 29 insertions, 11 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 8e5efc4f87..6874ef75ef 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,8 @@ +2011-08-07 Juri Linkov <juri@jurta.org> + + * dired.texi (Operating on Files): Rewrite according to the fact + that `dired-do-chmod' doesn't use the `chmod' program anymore. + 2011-07-30 Michael Albinus <michael.albinus@gmx.de> * mini.texi (Minibuffer File): Insert a reference to Tramp for diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi index 501c4152e6..80ccd1d10f 100644 --- a/doc/emacs/dired.texi +++ b/doc/emacs/dired.texi @@ -645,8 +645,8 @@ link. @cindex changing file permissions (in Dired) @item M @var{modespec} @key{RET} Change the mode (also called ``permission bits'') of the specified files -(@code{dired-do-chmod}). This uses the @code{chmod} program, so -@var{modespec} can be any argument that @code{chmod} can handle. +(@code{dired-do-chmod}). @var{modespec} can be in octal or symbolic +notation like arguments handled by the @code{chmod} program. @findex dired-do-chgrp @kindex G @r{(Dired)} diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7c1fa3a656..52f51c918a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2011-08-07 Juri Linkov <juri@jurta.org> + + * faces.el (list-faces-display): Remove extra angle bracket + from `help-mode-map'. + + * info.el (Info-history-toc-nodes): Doc fix. + + * longlines.el (longlines-mode): Doc fix. + 2011-08-05 Stefan Monnier <monnier@iro.umontreal.ca> * progmodes/js.el (js--regexp-literal): Accept regexps at the beginning @@ -346,9 +355,6 @@ (string-rectangle): Go to the point after the last operation (bug#7522). - * simple.el (current-kill): Clarify what - `interprogram-paste-function' does (bug#7500). - * printing.el (pr-toggle-region): Clarify the documentation slightly (bug#7493). diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15 index 190be56dd0..2acf847cdd 100644 --- a/lisp/ChangeLog.15 +++ b/lisp/ChangeLog.15 @@ -3573,7 +3573,7 @@ * locate.el (locate-default-make-command-line): Don't consider drive letter and root directory part of `directory-listing-before-filename-regexp'. (Bug#7308) - (locate-post-command-hook, locate-post-command-hook): New defcustoms. + (locate-post-command-hook, locate-mode-hook): New defcustoms. 2010-11-27 Stefan Monnier <monnier@iro.umontreal.ca> diff --git a/lisp/faces.el b/lisp/faces.el index 302f8af35a..9a78ab69ca 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -1255,7 +1255,7 @@ arg, prompt for a regular expression." (insert (substitute-command-keys (concat - "\\<help-mode-map>>Use " + "\\<help-mode-map>Use " (if (display-mouse-p) "\\[help-follow-mouse] or ") "\\[help-follow] on a face name to customize it\n" "or on its sample text for a description of the face.\n\n"))) diff --git a/lisp/info.el b/lisp/info.el index 447c86b3e9..191e75f975 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -2128,7 +2128,7 @@ If SAME-FILE is non-nil, do not move to a different Info file." )) (defun Info-history-toc-nodes (filename) - "History-specific implementation of `Info-history-toc-nodes'." + "History-specific implementation of `Info-toc-nodes'." `(,filename ("Top" nil nil nil))) diff --git a/lisp/longlines.el b/lisp/longlines.el index e81a235a17..f625d8fcac 100644 --- a/lisp/longlines.el +++ b/lisp/longlines.el @@ -100,8 +100,8 @@ In Long Lines mode, long lines are wrapped if they extend beyond `fill-column'. The soft newlines used for line wrapping will not show up when the text is yanked or saved to disk. -With no argument, this command toggles Flyspell mode. -With a prefix argument ARG, turn Flyspell minor mode on if ARG is positive, +With no argument, this command toggles Long Lines mode. +With a prefix argument ARG, turn Long Lines minor mode on if ARG is positive, otherwise turn it off. If the variable `longlines-auto-wrap' is non-nil, lines are automatically diff --git a/src/ChangeLog b/src/ChangeLog index 039c225c1f..ef4efb0ad3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-08-07 Juri Linkov <juri@jurta.org> + + * editfns.c (Fformat_time_string): Doc fix, add tag `usage:' + to show the arg `TIME' instead of `TIMEVAL'. + 2011-08-06 Eli Zaretskii <eliz@gnu.org> * xdisp.c (set_cursor_from_row): Fix cursor positioning when a diff --git a/src/editfns.c b/src/editfns.c index 577263c5ae..5eed386afb 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -1695,7 +1695,9 @@ The modifiers are `E' and `O'. For certain characters X, %EX is a locale's alternative version of %X; %OX is like %X, but uses the locale's number symbols. -For example, to produce full ISO 8601 format, use "%Y-%m-%dT%T%z". */) +For example, to produce full ISO 8601 format, use "%Y-%m-%dT%T%z". + +usage: (format-time-string FORMAT-STRING &optional TIME UNIVERSAL) */) (Lisp_Object format_string, Lisp_Object timeval, Lisp_Object universal) { time_t value; |