[Emacs-diffs] /srv/bzr/emacs/trunk r107927: Replace a use of eval-after-load

[Glenn Morris]

------------------------------------------------------------
revno: 107927
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2012-04-16 14:46:46 -0400
message:
  Replace a use of eval-after-load
  
  * lisp/woman.el: Remove eval-after-load for tar-mode.
  
  * lisp/tar-mode.el (tar-mode-map): Add woman binding and menu entry.
  (woman-tar-extract-file): Autoload it.
modified:
  lisp/ChangeLog
  lisp/tar-mode.el
  lisp/woman.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-04-16 18:41:38 +0000
+++ b/lisp/ChangeLog    2012-04-16 18:46:46 +0000
@@ -1,5 +1,9 @@
 2012-04-16  Glenn Morris  <address@hidden>
 
+       * woman.el: Remove eval-after-load for tar-mode.
+       * tar-mode.el (tar-mode-map): Add woman binding and menu entry.
+       (woman-tar-extract-file): Autoload it.
+
        * frame.el (automatic-hscrolling): Make this alias obsolete.
 
 2012-04-12  Agustín Martín Domingo  <address@hidden>

=== modified file 'lisp/tar-mode.el'
--- a/lisp/tar-mode.el  2012-03-16 07:21:23 +0000
+++ b/lisp/tar-mode.el  2012-04-16 18:46:46 +0000
@@ -549,6 +549,7 @@
     (define-key map "R" 'tar-rename-entry)
     (define-key map "u" 'tar-unflag)
     (define-key map "v" 'tar-view)
+    (define-key map "w" 'woman-tar-extract-file)
     (define-key map "x" 'tar-expunge)
     (define-key map "\177" 'tar-unflag-backwards)
     (define-key map "E" 'tar-extract-other-window)
@@ -566,6 +567,8 @@
     (define-key map [menu-bar immediate]
       (cons "Immediate" (make-sparse-keymap "Immediate")))
 
+    (define-key map [menu-bar immediate woman]
+      '("Read Man Page (WoMan)" . woman-tar-extract-file))
     (define-key map [menu-bar immediate view]
       '("View This File" . tar-view))
     (define-key map [menu-bar immediate display]
@@ -677,6 +680,8 @@
      (fundamental-mode)
      (signal (car err) (cdr err)))))
 
+(autoload 'woman-tar-extract-file "woman"
+  "In tar mode, run the WoMan man-page browser on this file." t)
 
 (define-minor-mode tar-subfile-mode
   "Minor mode for editing an element of a tar-file.

=== modified file 'lisp/woman.el'
--- a/lisp/woman.el     2012-04-09 12:36:01 +0000
+++ b/lisp/woman.el     2012-04-16 18:46:46 +0000
@@ -1,6 +1,6 @@
 ;;; woman.el --- browse UN*X manual pages `wo (without) man'
 
-;; Copyright (C) 2000-2012  Free Software Foundation, Inc.
+;; Copyright (C) 2000-2012 Free Software Foundation, Inc.
 
 ;; Author: Francis J. Wright <address@hidden>
 ;; Maintainer: FSF
@@ -1595,14 +1595,6 @@
       (woman-process-buffer)
       (goto-char (point-min)))))
 
-;; There is currently no `tar-mode-hook' so use ...
-(eval-after-load "tar-mode"
-  '(progn
-    (define-key tar-mode-map "w" 'woman-tar-extract-file)
-    (define-key-after (lookup-key tar-mode-map [menu-bar immediate])
-      [woman] '("Read Man Page (WoMan)" . woman-tar-extract-file) 'view)))
-
-
 (defvar woman-last-file-name nil
   "The full pathname of the last file formatted by WoMan.")