Merge from mainline.

7 files changed, 66 insertions, 35 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 8e88e5026e8..0f4abc7a984 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-01  Chong Yidong  <cyd@stupidchicken.com>
+
+        * loading.texi (Where Defined): Make it clearer that these are
+        loaded files (Bug#5068).
+
 2009-12-29  Chong Yidong  <cyd@stupidchicken.com>
 
         * minibuf.texi (Completion Styles): Document `initials' style.
diff --git a/doc/lispref/loading.texi b/doc/lispref/loading.texi
index 8ccc0071e2a..416d4513b67 100644
--- a/doc/lispref/loading.texi
+++ b/doc/lispref/loading.texi
@@ -823,13 +823,14 @@ without extension.
 @code{load-history}.
 
 @defvar load-history
-This variable's value is an alist connecting library file names with the
-names of functions and variables they define, the features they provide,
-and the features they require.
-
-Each element is a list and describes one library.  The @sc{car} of the
-list is the absolute file name of the library, as a string.  The rest
-of the list elements have these forms:
+This value of this variable is an alist that associates the names of
+loaded library files with the names of the functions and variables
+they defined, as well as the features they provided or required.
+
+Each element in this alist describes one loaded library (including
+libraries that are preloaded at startup).  It is a list whose @sc{car}
+is the absolute file name of the library (a string).  The rest of the
+list elements have these forms:
 
 @table @code
 @item @var{var}
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f12bc9c0856..1fa330e8e2a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-01  Juri Linkov  <juri@jurta.org>
+
+        * comint.el (comint-input-ring-size): Make it a defcustom and
+        increase the default to 500 (Bug#5148).
+
 2009-12-31  Nick Roberts  <nickrob@snap.net.nz>
 
         Further changes from EMACS_23_1_RC branch (2009-12-29 contd).
diff --git a/lisp/comint.el b/lisp/comint.el
index c4dc3654554..fefe2d00668 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -310,8 +310,11 @@ the function `comint-truncate-buffer' is on `comint-output-filter-functions'."
   :group 'comint)
 
 ;; FIXME: this should be defcustom
-(defvar comint-input-ring-size 150
-  "Size of input history ring.")
+(defcustom comint-input-ring-size 500
+  "Size of the input history ring in `comint-mode'."
+  :type 'integer
+  :group 'comint
+  :version "23.2")
 
 (defvar comint-input-ring-separator "\n"
   "Separator between commands in the history file.")
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.  */);