Let C-h f do autoloading, and report if a function was previously autoloaded.

* lisp/help-fns.el (help-fns--autoloaded-p): New function.
(describe-function-1): Refer to a function as "autoloaded" if it
was autoloaded at any time in the past.  Perform autoloading if
help-enable-auto-load is non-nil.

* lisp/help.el (help-enable-auto-load): New variable.

* src/doc.c (Fsubstitute_command_keys): Fix punctuation.

2 files changed, 6 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index bef3bbd4c83..4614ba09b3d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-27  Chong Yidong  <cyd@gnu.org>
+
+        * doc.c (Fsubstitute_command_keys): Fix punctuation.
+
 2012-06-26  John Wiegley  <johnw@newartisans.com>
 
         * unexmacosx.c (copy_data_segment): Added two section names used
diff --git a/src/doc.c b/src/doc.c
index 223741c3bf5..cbfeb06756e 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -897,11 +897,11 @@ Otherwise, return a new string, without any text properties.  */)
           if (NILP (tem))
             {
               name = Fsymbol_name (name);
-              insert_string ("\nUses keymap \"");
+              insert_string ("\nUses keymap `");
               insert_from_string (name, 0, 0,
                                   SCHARS (name),
                                   SBYTES (name), 1);
-              insert_string ("\", which is not currently defined.\n");
+              insert_string ("', which is not currently defined.\n");
               if (start[-1] == '<') keymap = Qnil;
             }
           else if (start[-1] == '<')