[Emacs-diffs] /srv/bzr/emacs/trunk r110239: Merge from emacs-24; up to r108150

[Glenn Morris]

------------------------------------------------------------
revno: 110239 [merge]
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2012-09-28 09:02:31 -0700
message:
  Merge from emacs-24; up to r108150
modified:
  doc/lispref/ChangeLog
  doc/lispref/files.texi
  lisp/ChangeLog
  lisp/ido.el
  lisp/pcomplete.el
  src/ChangeLog
  src/eval.c

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2012-09-23 10:46:50 +0000
+++ b/doc/lispref/ChangeLog     2012-09-28 16:02:31 +0000
@@ -1,3 +1,7 @@
+2012-09-28  Leo Liu  <address@hidden>
+
+       * files.texi (Files): Fix typo.
+
 2012-09-23  Chong Yidong  <address@hidden>
 
        * buffers.texi (Read Only Buffers): Document read-only-mode.

=== modified file 'doc/lispref/files.texi'
--- a/doc/lispref/files.texi    2012-06-26 16:23:01 +0000
+++ b/doc/lispref/files.texi    2012-09-28 16:02:31 +0000
@@ -29,7 +29,7 @@
   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

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-09-28 15:17:08 +0000
+++ b/lisp/ChangeLog    2012-09-28 16:02:31 +0000
@@ -1,3 +1,10 @@
+2012-09-28  Leo Liu  <address@hidden>
+
+       * 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  <address@hidden>
 
        * type-break.el: Use lexical-binding.

=== modified file 'lisp/ido.el'
--- a/lisp/ido.el       2012-09-21 03:03:48 +0000
+++ b/lisp/ido.el       2012-09-28 16:02:31 +0000
@@ -3701,14 +3701,14 @@
         (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 "/\\'")))

=== modified file 'lisp/pcomplete.el'
--- a/lisp/pcomplete.el 2012-09-25 04:13:02 +0000
+++ b/lisp/pcomplete.el 2012-09-28 16:02:31 +0000
@@ -1089,7 +1089,7 @@
     (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

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-09-28 14:10:41 +0000
+++ b/src/ChangeLog     2012-09-28 16:02:31 +0000
@@ -1,3 +1,8 @@
+2012-09-28  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * xdisp.c (syms_of_xdisp) <Qredisplay_internal>: Rename from

=== modified file 'src/eval.c'
--- a/src/eval.c        2012-09-26 15:19:10 +0000
+++ b/src/eval.c        2012-09-28 16:02:31 +0000
@@ -2351,14 +2351,10 @@
 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 @@
   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 @@
 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.