Merge from mainline.

3 files changed, 43 insertions, 26 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 92f4fe45f35..73000341f68 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-01  Chong Yidong  <cyd@stupidchicken.com>
+
+        * lread.c (syms_of_lread): Make it clearer that these are the
+        names of loaded files (Bug#5068).
+
+        * eval.c (run_hook_with_args): Handle the case where the global
+        value has the obsolete single-function form (Bug#5026).
+
 2009-12-27  Chong Yidong  <cyd@stupidchicken.com>
 
         * minibuf.c (Fall_completions): Minor optimization.
diff --git a/src/eval.c b/src/eval.c
index 1c975003318..0198fb7c131 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -2620,7 +2620,6 @@ run_hook_with_args (nargs, args, cond)
      enum run_hooks_condition cond;
 {
   Lisp_Object sym, val, ret;
-  Lisp_Object globals;
   struct gcpro gcpro1, gcpro2, gcpro3;
 
   /* If we are dying or still initializing,
@@ -2641,7 +2640,7 @@ run_hook_with_args (nargs, args, cond)
     }
   else
     {
-      globals = Qnil;
+      Lisp_Object globals = Qnil;
       GCPRO3 (sym, val, globals);
 
       for (;
@@ -2654,18 +2653,28 @@ run_hook_with_args (nargs, args, cond)
             {
               /* t indicates this hook has a local binding;
                  it means to run the global binding too.  */
+              globals = Fdefault_value (sym);
+              if (NILP (globals)) continue;
 
-              for (globals = Fdefault_value (sym);
-                   CONSP (globals) && ((cond == to_completion)
-                                       || (cond == until_success ? NILP (ret)
-                                           : !NILP (ret)));
-                   globals = XCDR (globals))
+              if (!CONSP (globals) || EQ (XCAR (globals), Qlambda))
+                {
+                  args[0] = globals;
+                  ret = Ffuncall (nargs, args);
+                }
+              else
                 {
-                  args[0] = XCAR (globals);
-                  /* In a global value, t should not occur.  If it does, we
-                     must ignore it to avoid an endless loop.  */
-                  if (!EQ (args[0], Qt))
-                    ret = Ffuncall (nargs, args);
+                  for (;
+                       CONSP (globals) && ((cond == to_completion)
+                                           || (cond == until_success ? NILP (ret)
+                                               : !NILP (ret)));
+                       globals = XCDR (globals))
+                    {
+                      args[0] = XCAR (globals);
+                      /* In a global value, t should not occur.  If it does, we
+                         must ignore it to avoid an endless loop.  */
+                      if (!EQ (args[0], Qt))
+                        ret = Ffuncall (nargs, args);
+                    }
                 }
             }
           else
diff --git a/src/lread.c b/src/lread.c
index 0649c638d98..50d2702639e 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -4377,20 +4377,20 @@ the rest of the FORMS.  */);
   Vafter_load_alist = Qnil;
 
   DEFVAR_LISP ("load-history", &Vload_history,
-               doc: /* Alist mapping file names to symbols and features.
-Each alist element is a list that starts with a file name,
-except for one element (optional) that starts with nil and describes
-definitions evaluated from buffers not visiting files.
-
-The file name is absolute and is the true file name (i.e. it doesn't
-contain symbolic links) of the loaded file.
-
-The remaining elements of each list are symbols defined as variables
-and cons cells of the form `(provide . FEATURE)', `(require . FEATURE)',
-`(defun . FUNCTION)', `(autoload . SYMBOL)', `(defface . SYMBOL)'
-and `(t . SYMBOL)'.  An element `(t . SYMBOL)' precedes an entry
-`(defun . FUNCTION)', and means that SYMBOL was an autoload before
-this file redefined it as a function.
+               doc: /* Alist mapping loaded file names to symbols and features.
+Each alist element should be a list (FILE-NAME ENTRIES...), where
+FILE-NAME is the name of a file that has been loaded into Emacs.
+The file name is absolute and true (i.e. it doesn't contain symlinks).
+As an exception, one of the alist elements may have FILE-NAME nil,
+for symbols and features not associated with any file.
+
+The remaining ENTRIES in the alist element describe the functions and
+variables defined in that file, the features provided, and the
+features required.  Each entry has the form `(provide . FEATURE)',
+`(require . FEATURE)', `(defun . FUNCTION)', `(autoload . SYMBOL)',
+`(defface . SYMBOL)', or `(t . SYMBOL)'.  In addition, an entry `(t
+. SYMBOL)' may precede an entry `(defun . FUNCTION)', and means that
+SYMBOL was an autoload before this file redefined it as a function.
 
 During preloading, the file name recorded is relative to the main Lisp
 directory.  These file names are converted to absolute at startup.  */);