Revert "; Fix doc string of 'loaddefs-generate'"

This reverts commit 5fe9a1a85ae6d54196031157a735352f6ab655ff.
It included unrelated changes.

diff --git a/lisp/emacs-lisp/loaddefs-gen.el b/lisp/emacs-lisp/loaddefs-gen.el
index 5819a26eb54e8891a349c66aa8661aadb11cc6ec..005a46c2d75766a70b0408ece1a20d16ef0d6869 100644 (file)
--- a/lisp/emacs-lisp/loaddefs-gen.el
+++ b/lisp/emacs-lisp/loaddefs-gen.el
@@ -512,7 +512,7 @@ If COMPILE, don't include a \"don't compile\" cookie."
 (defun loaddefs-generate (dir output-file &optional excluded-files
                               extra-data include-package-version
                               generate-full)
-  "Generate loaddefs files for Lisp files in one or more directories given by DIR.
+  "Generate loaddefs files for Lisp files in the directories DIRS.
 DIR can be either a single directory or a list of directories.
 
 The autoloads will be written to OUTPUT-FILE.  If any Lisp file
@@ -520,7 +520,7 @@ binds `generated-autoload-file' as a file-local variable, write
 its autoloads into the specified file instead.
 
 The function does NOT recursively descend into subdirectories of the
-directories specified by DIR.
+directory or directories specified by DIRS.
 
 Optional argument EXCLUDED-FILES, if non-nil, should be a list of
 files, such as preloaded files, whose autoloads should not be written

diff --git a/src/w32fns.c b/src/w32fns.c
index 57296bd4e079c3512b4214b1501af4aa720d3686..745458d0a033c9306a8ce026147f0622b003a45e 100644 (file)
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -10447,51 +10447,6 @@ w32_get_resource (const char *key, const char *name, LPDWORD lpdwtype)
   return (NULL);
 }
 \f
-#ifdef WINDOWSNT
-
-/***********************************************************************
-                           Wallpaper
- ***********************************************************************/
-
-#if 0
-
-typedef BOOL (WINAPI * SystemParametersInfoW_Proc) (UINT,UINT,PVOID,UINT);
-static SystemParametersInfoW_Proc system_parameters_info_w_fn;
-
-DEFUN ("w32-set-wallpaper", Fw32_set_wallpaper, Sw32_set_wallpaper, 1, 1, 0,
-       doc: /* Set the desktop wallpaper image to IMAGE-FILE. */)
-  (Lisp_Object image_file)
-{
-  Lisp_Object encoded = ENCODE_FILE (Fexpand_file_name (image_file, Qnil));
-  char *fname = SSDATA (encoded);
-
-  if (w32_unicode_filenames)
-    {
-    }
-  else
-    {
-      char fname_a[MAX_PATH];
-
-      if (filename_to_ansi (fname, fname_a) != 0)
-       error ("Wallpaper file %s does not exist or cannot be accessed", fname);
-
-      BOOL result = SystemParametersInfoA (SPI_SETDESKWALLPAPER, 0, fname_a,
-                                          SPIF_SENDCHANGE);
-      if (!result)
-       {
-         DWORD err = GetLastError ();
-         if (err)
-           error ("Could not set wallpaper: %s", w32_strerror (err));
-         else
-           error ("Could not set wallpaper");
-       }
-    }
-  return Qnil;
-}
-#endif
-
-#endif
-
 /***********************************************************************
                            Initialization
  ***********************************************************************/