;; Author: Stephen Berman <stephen.berman@gmx.net>
;; Stefan Monnier <monnier@iro.umontreal.ca>
-;; Version: 0.3
+;; 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
;;; Code:
+(require 'easymenu)
+
(defcustom adaptive-wrap-extra-indent 0
"Number of extra spaces to indent in `adaptive-wrap-prefix-mode'.
:lighter ""
:group 'visual-line
(if adaptive-wrap-prefix-mode
- (jit-lock-register #'adaptive-wrap-prefix-function)
+ (progn
+ ;; HACK ATTACK! We need to run after font-lock, but jit-lock-register
+ ;; doesn't accept an `append' argument, so we add ourselves beforehand,
+ ;; to make sure we're at the end of the hook (bug#15155).
+ (add-hook 'jit-lock-functions
+ #'adaptive-wrap-prefix-function 'append t)
+ (jit-lock-register #'adaptive-wrap-prefix-function))
(jit-lock-unregister #'adaptive-wrap-prefix-function)
(with-silent-modifications
(save-restriction
(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