Merge from emacs-24; up to 2012-05-07T21:26:08Z!rgm@gnu.org

7 files changed, 41 insertions, 32 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 82fb5eb4975..76f06edaacb 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2012-09-28  Leo Liu  <sdl.web@gmail.com>
+
+        * files.texi (Files): Fix typo.
+
 2012-09-23  Chong Yidong  <cyd@gnu.org>
 
         * buffers.texi (Read Only Buffers): Document read-only-mode.
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index 56971bf0ff0..9424a661236 100644
--- a/doc/lispref/files.texi
+++ b/doc/lispref/files.texi
@@ -29,7 +29,7 @@ arguments, except where noted.  @xref{Magic File Names}, for details.
   When file I/O functions signal Lisp errors, they usually use the
 condition @code{file-error} (@pxref{Handling Errors}).  The error
 message is in most cases obtained from the operating system, according
-to locale @code{system-message-locale}, and decoded using coding system
+to locale @code{system-messages-locale}, and decoded using coding system
 @code{locale-coding-system} (@pxref{Locales}).
 
 @menu
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b25a921219e..4946fe5dd86 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2012-09-28  Leo Liu  <sdl.web@gmail.com>
+
+        * pcomplete.el (pcomplete-show-completions): Use
+        minibuffer-message to make pcomplete usable in minibuffer.
+
+        * ido.el (ido-set-matches-1): Fix 2012-09-11 change.
+
 2012-09-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * type-break.el: Use lexical-binding.
diff --git a/lisp/ido.el b/lisp/ido.el
index d48e7ba858b..f511dbbf8ac 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -3701,14 +3701,14 @@ This is to make them appear as if they were \"virtual buffers\"."
          (rexq (concat rex0 (if slash ".*/" "")))
          (re (if ido-enable-prefix (concat "\\`" rexq) rexq))
          (full-re (and do-full
-                       (and (eq ido-cur-item 'buffer)
-                            (not ido-buffer-disable-smart-matches))
+                       (not (and (eq ido-cur-item 'buffer)
+                                 ido-buffer-disable-smart-matches))
                        (not ido-enable-regexp)
                        (not (string-match "\$\\'" rex0))
                        (concat "\\`" rex0 (if slash "/" "") "\\'")))
          (suffix-re (and do-full slash
-                         (and (eq ido-cur-item 'buffer)
-                              (not ido-buffer-disable-smart-matches))
+                         (not (and (eq ido-cur-item 'buffer)
+                                   ido-buffer-disable-smart-matches))
                          (not ido-enable-regexp)
                          (not (string-match "\$\\'" rex0))
                          (concat rex0 "/\\'")))
diff --git a/lisp/pcomplete.el b/lisp/pcomplete.el
index fc05af8c7f5..9e55976a8bd 100644
--- a/lisp/pcomplete.el
+++ b/lisp/pcomplete.el
@@ -1089,7 +1089,7 @@ Typing SPC flushes the help buffer."
     (setq pcomplete-last-window-config (current-window-configuration)))
   (with-output-to-temp-buffer "*Completions*"
     (display-completion-list completions))
-  (message "Hit space to flush")
+  (minibuffer-message "Hit space to flush")
   (let (event)
     (prog1
         (catch 'done
diff --git a/src/ChangeLog b/src/ChangeLog
index 92ab8080c9d..c30c4ed955b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-28  Glenn Morris  <rgm@gnu.org>
+
+        * eval.c (Frun_hook_with_args, Frun_hook_with_args_until_success)
+        (Frun_hook_with_args_until_failure): Doc fixes.
+
 2012-09-28  Eli Zaretskii  <eliz@gnu.org>
 
         * xdisp.c (syms_of_xdisp) <Qredisplay_internal>: Rename from
diff --git a/src/eval.c b/src/eval.c
index d984331ec41..851b2bb1129 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -2351,14 +2351,10 @@ usage: (run-hooks &rest HOOKS)  */)
 DEFUN ("run-hook-with-args", Frun_hook_with_args,
        Srun_hook_with_args, 1, MANY, 0,
        doc: /* Run HOOK with the specified arguments ARGS.
-HOOK should be a symbol, a hook variable.  If HOOK has a non-nil
-value, that value may be a function or a list of functions to be
-called to run the hook.  If the value is a function, it is called with
-the given arguments and its return value is returned.  If it is a list
-of functions, those functions are called, in order,
-with the given arguments ARGS.
-It is best not to depend on the value returned by `run-hook-with-args',
-as that may change.
+HOOK should be a symbol, a hook variable.  The value of HOOK
+may be nil, a function, or a list of functions.  Call each
+function in order with arguments ARGS.  The final return value
+is unspecified.
 
 Do not use `make-local-variable' to make a hook variable buffer-local.
 Instead, use `add-hook' and specify t for the LOCAL argument.
@@ -2368,18 +2364,18 @@ usage: (run-hook-with-args HOOK &rest ARGS)  */)
   return run_hook_with_args (nargs, args, funcall_nil);
 }
 
+/* NB this one still documents a specific non-nil return value.
+   (As did run-hook-with-args and run-hook-with-args-until-failure
+   until they were changed in 24.1.)  */
 DEFUN ("run-hook-with-args-until-success", Frun_hook_with_args_until_success,
        Srun_hook_with_args_until_success, 1, MANY, 0,
        doc: /* Run HOOK with the specified arguments ARGS.
-HOOK should be a symbol, a hook variable.  If HOOK has a non-nil
-value, that value may be a function or a list of functions to be
-called to run the hook.  If the value is a function, it is called with
-the given arguments and its return value is returned.
-If it is a list of functions, those functions are called, in order,
-with the given arguments ARGS, until one of them
-returns a non-nil value.  Then we return that value.
-However, if they all return nil, we return nil.
-If the value of HOOK is nil, this function returns nil.
+HOOK should be a symbol, a hook variable.  The value of HOOK
+may be nil, a function, or a list of functions.  Call each
+function in order with arguments ARGS, stopping at the first
+one that returns non-nil, and return that value.  Otherwise (if
+all functions return nil, or if there are no functions to call),
+return nil.
 
 Do not use `make-local-variable' to make a hook variable buffer-local.
 Instead, use `add-hook' and specify t for the LOCAL argument.
@@ -2398,15 +2394,12 @@ funcall_not (ptrdiff_t nargs, Lisp_Object *args)
 DEFUN ("run-hook-with-args-until-failure", Frun_hook_with_args_until_failure,
        Srun_hook_with_args_until_failure, 1, MANY, 0,
        doc: /* Run HOOK with the specified arguments ARGS.
-HOOK should be a symbol, a hook variable.  If HOOK has a non-nil
-value, that value may be a function or a list of functions to be
-called to run the hook.  If the value is a function, it is called with
-the given arguments.  Then we return nil if the function returns nil,
-and t if it returns non-nil.
-If it is a list of functions, those functions are called, in order,
-with the given arguments ARGS, until one of them returns nil.
-Then we return nil.  However, if they all return non-nil, we return t.
-If the value of HOOK is nil, this function returns t.
+HOOK should be a symbol, a hook variable.  The value of HOOK
+may be nil, a function, or a list of functions.  Call each
+function in order with arguments ARGS, stopping at the first
+one that returns nil, and return nil.  Otherwise (if all functions
+return non-nil, or if there are no functions to call), return non-nil
+\(do not rely on the precise return value in this case).
 
 Do not use `make-local-variable' to make a hook variable buffer-local.
 Instead, use `add-hook' and specify t for the LOCAL argument.