[ELPA-diffs] elpa r428: * adaptive-wrap.el: Fix bug#14974 by using define-key-after

[Stephen Berman]

------------------------------------------------------------
revno: 428
revision-id: address@hidden
parent: address@hidden
committer: Stephen Berman <address@hidden>
branch nick: elpa
timestamp: Wed 2013-07-31 10:52:10 +0200
message:
  * adaptive-wrap.el: Fix bug#14974 by using define-key-after
  instead of easy-menu-add-item.
  (adaptive-wrap-unload-function): Remove.
modified:
  packages/adaptive-wrap/adaptive-wrap.el 
awpmode.el-20111125144856-uveole7rrkcku37u-2

=== modified file 'packages/adaptive-wrap/adaptive-wrap.el'
--- a/packages/adaptive-wrap/adaptive-wrap.el   2013-07-29 11:56:03 +0000
+++ b/packages/adaptive-wrap/adaptive-wrap.el   2013-07-31 08:52:10 +0000
@@ -4,7 +4,7 @@
 
 ;; Author: Stephen Berman <address@hidden>
 ;;         Stefan Monnier <address@hidden>
-;; Version: 0.4
+;; Version: 0.5
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -103,25 +103,13 @@
         (widen)
         (remove-text-properties (point-min) (point-max) '(wrap-prefix nil))))))
 
-;;;###autoload
-(easy-menu-add-item menu-bar-options-menu
-                    '("Line Wrapping in This Buffer")
-                    ["Adaptive Wrap"
-                     (lambda ()
-                       (interactive)
-                      (if adaptive-wrap-prefix-mode
-                          (adaptive-wrap-prefix-mode -1)
-                        (adaptive-wrap-prefix-mode 1)))
-                     :visible (menu-bar-menu-frame-live-and-visible-p)
-                     :help "Show wrapped long lines with an adjustable prefix"
-                     :style toggle
-                     :selected adaptive-wrap-prefix-mode])
-
-(defun adaptive-wrap-unload-function ()
-  "Cleanup adaptive-wrap package."
-  (easy-menu-remove-item menu-bar-options-menu
-                         '("Line Wrapping in This Buffer")
-                         "Adaptive Wrap"))
+(define-key-after (lookup-key menu-bar-options-menu [line-wrapping])
+  [adaptive-wrap]
+  '(menu-item "Adaptive Wrap" adaptive-wrap-prefix-mode
+             :visible (menu-bar-menu-frame-live-and-visible-p)
+             :help "Show wrapped long lines with an adjustable prefix"
+             :button (:toggle . (bound-and-true-p adaptive-wrap-prefix-mode)))
+  word-wrap)
 
 (provide 'adaptive-wrap)
 ;;; adaptive-wrap.el ends here