Weed out redundant uses of `function'

6 files changed, 61 insertions, 66 deletions

diff --git a/man/cl.texi b/man/cl.texi
index a2f7b78e758..8f5914d6a83 100644
--- a/man/cl.texi
+++ b/man/cl.texi
@@ -1765,7 +1765,7 @@ closures:
 
 @example
 (defun add-to-list (x list)
-  (mapcar (function (lambda (y) (+ x y))) list))
+  (mapcar (lambda (y) (+ x y))) list)
 (add-to-list 7 '(1 2 5))
      @result{} (8 9 12)
 @end example
@@ -5483,7 +5483,7 @@ Emacs Lisp:
         collect (if flag x (funcall func x))))
 
 (defun add-odd-elements (list x)
-  (map-odd-elements (function (lambda (a) (+ a x))) list))
+  (map-odd-elements (lambda (a) (+ a x))) list)
 @end example
 
 @noindent
diff --git a/man/custom.texi b/man/custom.texi
index 90aa679dae8..9fd6c363cf8 100644
--- a/man/custom.texi
+++ b/man/custom.texi
@@ -734,8 +734,8 @@ lambda expression.
 
 @group
 (add-hook 'c-mode-common-hook
-  (function (lambda ()
-    (c-add-style "my-style" my-c-style t))))
+  (lambda ()
+    (c-add-style "my-style" my-c-style t)))
 @end group
 @end example
 
diff --git a/man/dired-x.texi b/man/dired-x.texi
index 8860dff61e2..87d03afe266 100644
--- a/man/dired-x.texi
+++ b/man/dired-x.texi
@@ -290,17 +290,17 @@ initialization file @file{default.el} in the @file{site-lisp} directory, put
 
 @example
 (add-hook 'dired-load-hook
-          (function (lambda ()
-                      (load "dired-x")
-                      ;; Set dired-x global variables here.  For example:
-                      ;; (setq dired-guess-shell-gnutar "gtar")
-                      ;; (setq dired-x-hands-off-my-keys nil)
-                      )))
+          (lambda ()
+            (load "dired-x")
+            ;; Set dired-x global variables here.  For example:
+            ;; (setq dired-guess-shell-gnutar "gtar")
+            ;; (setq dired-x-hands-off-my-keys nil)
+            ))
 (add-hook 'dired-mode-hook
-          (function (lambda ()
-                      ;; Set dired-x buffer-local variables here.  For example:
-                      ;; (setq dired-omit-files-p t)
-                      )))
+          (lambda ()
+            ;; Set dired-x buffer-local variables here.  For example:
+            ;; (setq dired-omit-files-p t)
+            ))
 @end example
 
 @noindent
@@ -367,13 +367,13 @@ If you choose to have @file{dired-x.el} bind @code{dired-x-find-file} over
 
 @example
 (add-hook 'dired-load-hook 
-          (function (lambda ()
-                      (load "dired-x")
-                      ;; Bind dired-x-find-file.
-                      (setq dired-x-hands-off-my-keys nil)
-                      ;; Make sure our binding preference is invoked.
-                      (dired-x-bind-find-file)
-                      )))
+          (lambda ()
+            (load "dired-x")
+            ;; Bind dired-x-find-file.
+            (setq dired-x-hands-off-my-keys nil)
+            ;; Make sure our binding preference is invoked.
+            (dired-x-bind-find-file)
+            ))
 @end example
 
 Alternatively, you can set the variable @emph{before} @file{dired-x.el} is
@@ -381,11 +381,11 @@ loaded
 
 @example
 (add-hook 'dired-load-hook 
-          (function (lambda ()
-                      ;; Bind dired-x-find-file.
-                      (setq dired-x-hands-off-my-keys nil)
-                      (load "dired-x")
-                      )))
+          (lambda ()
+            ;; Bind dired-x-find-file.
+            (setq dired-x-hands-off-my-keys nil)
+            (load "dired-x")
+            ))
 @end example
 
 @node Special Notes, Omitting Files in Dired, Optional Installation File At Point, Installation
diff --git a/man/ediff.texi b/man/ediff.texi
index 1f46cea648a..8547b3fb72a 100644
--- a/man/ediff.texi
+++ b/man/ediff.texi
@@ -1569,13 +1569,13 @@ faces, you can modify them when Ediff is being loaded using
 
 @smallexample
 (add-hook 'ediff-load-hook
-          (function (lambda ()
-                      (set-face-foreground
-                        ediff-current-diff-face-B "blue")
-                      (set-face-background
-                        ediff-current-diff-face-B "red")
-                      (make-face-italic
-                        ediff-current-diff-face-B))))
+          (lambda ()
+            (set-face-foreground
+              ediff-current-diff-face-B "blue")
+            (set-face-background
+              ediff-current-diff-face-B "red")
+            (make-face-italic
+              ediff-current-diff-face-B)))
 @end smallexample
 
 @strong{Note:} To set Ediff's faces, use only @code{copy-face} or
diff --git a/man/faq.texi b/man/faq.texi
index feb463aef9f..fca16c0d51e 100644
--- a/man/faq.texi
+++ b/man/faq.texi
@@ -1237,9 +1237,8 @@ Put this in your @file{.emacs} file:
   (file-error nil))
 
 (add-hook 'XXX-mode-hook
-          (function
-            (lambda ()
-             (setq abbrev-mode t))))
+          (lambda ()
+           (setq abbrev-mode t)))
 @end lisp
 
 @node Turning on auto-fill by default, Associating modes with files, Turning on abbrevs by default, Common requests
@@ -1389,9 +1388,8 @@ mode's hook.  For example:
 
 @lisp
 (add-hook 'XXX-mode-hook
-      (function
-       (lambda ()
-         (setq case-fold-search nil))))
+          (lambda ()
+           (setq case-fold-search nil)))
 @end lisp
 
 @node Wrapping words automatically, Spell-checkers, Controlling case sensitivity, Common requests
@@ -2014,8 +2012,8 @@ load dired-x by adding the following to your @file{.emacs} file:
 
 @lisp
 (add-hook 'dired-load-hook
-          (function (lambda ()
-                      (load "dired-x"))))
+          (lambda ()
+           (load "dired-x")))
 @end lisp
 
 With dired-x loaded, @kbd{M-o} toggles omitting in each dired buffer.
@@ -3802,8 +3800,8 @@ For example, in tex-mode, a local binding might be
 
 @lisp
 (add-hook 'tex-mode-hook
-  (function (lambda ()
-    (local-set-key (quote [f1]) (quote help-for-help)))))
+  (lambda ()
+   (local-set-key (quote [f1]) (quote help-for-help))))
 @end lisp
 
 
@@ -3868,13 +3866,11 @@ of either the @code{term-setup-hook} or @code{window-setup-hook}
 variable to this "lambda function."  For example,
 
 @lisp
-(setq term-setup-hook
-      (function
-       (lambda ()
-         (cond ((string-match "\\`vt220" (or (getenv "TERM") ""))
-                ;; Make vt220's "Do" key behave like M-x:
-                (global-set-key [do] 'execute-extended-command))
-               ))))
+(add-hook 'term-setup-hook
+          (lambda ()
+           (when (string-match "\\`vt220" (or (getenv "TERM") ""))
+             ;; Make vt220's "Do" key behave like M-x:
+             (global-set-key [do] 'execute-extended-command))))
 @end lisp
 
 For information on what Emacs does every time it is started, see the
diff --git a/man/gnus-faq.texi b/man/gnus-faq.texi
index a899e7def45..466c1636fa4 100644
--- a/man/gnus-faq.texi
+++ b/man/gnus-faq.texi
@@ -529,22 +529,21 @@ This is what I use...customize as necessary...
 ;;; Don't auto-select first article if reading sources, or archives or
 ;;; jobs postings, etc. and just display the summary buffer
 (add-hook 'gnus-select-group-hook
-          (function
-           (lambda ()
-             (cond ((string-match "sources" gnus-newsgroup-name)
-                    (setq gnus-auto-select-first nil))
-                           ((string-match "jobs" gnus-newsgroup-name)
-                                (setq gnus-auto-select-first nil))
-                   ((string-match "comp\\.archives" gnus-newsgroup-name)
-                    (setq gnus-auto-select-first nil))
-                   ((string-match "reviews" gnus-newsgroup-name)
-                    (setq gnus-auto-select-first nil))
-                   ((string-match "announce" gnus-newsgroup-name)
-                    (setq gnus-auto-select-first nil))
-                   ((string-match "binaries" gnus-newsgroup-name)
-                    (setq gnus-auto-select-first nil))
-                   (t
-                    (setq gnus-auto-select-first t))))))
+          (lambda ()
+            (cond ((string-match "sources" gnus-newsgroup-name)
+                   (setq gnus-auto-select-first nil))
+                   ((string-match "jobs" gnus-newsgroup-name)
+                        (setq gnus-auto-select-first nil))
+                  ((string-match "comp\\.archives" gnus-newsgroup-name)
+                   (setq gnus-auto-select-first nil))
+                  ((string-match "reviews" gnus-newsgroup-name)
+                   (setq gnus-auto-select-first nil))
+                  ((string-match "announce" gnus-newsgroup-name)
+                   (setq gnus-auto-select-first nil))
+                  ((string-match "binaries" gnus-newsgroup-name)
+                   (setq gnus-auto-select-first nil))
+                  (t
+                   (setq gnus-auto-select-first t)))))
 @end lisp
 
 @item