2 files changed, 23 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 21e5953779f..bd2c8b65a91 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-14  Juanma Barranquero  <lekktu@gmail.com>
+
+        * hl-line.el (hl-line-unload-function): New function.
+        (hl-line-unhighlight, global-hl-line-unhighlight): Use `when'.
+        (hl-line-sticky-flag): Remove spurious * in docstring.
+
 2008-10-14  Eric Hanchrow  <offby1@blarg.net>  (tiny change)
 
         * vc-git.el (vc-git-show-log-entry): Include the revision in the
@@ -152,8 +158,8 @@
 
 2008-10-09  Eli Zaretskii  <eliz@gnu.org>
 
-        * frame.el (make-frame-on-tty): Use "F" inside interactive.  Support
-        `pc' ``window-system''.
+        * frame.el (make-frame-on-tty): Use "F" inside interactive.
+        Support `pc' ``window-system''.
 
         * progmodes/compile.el (compilation-start): Resurrect the version
         for systems that don't support asynchronous subprocesses.
diff --git a/lisp/hl-line.el b/lisp/hl-line.el
index dae21af0b84..b04bda31aaf 100644
--- a/lisp/hl-line.el
+++ b/lisp/hl-line.el
@@ -94,7 +94,7 @@
            (overlay-put global-hl-line-overlay 'face hl-line-face))))
 
 (defcustom hl-line-sticky-flag t
-  "*Non-nil means highlight the current line in all windows.
+  "Non-nil means highlight the current line in all windows.
 Otherwise Hl-Line mode will highlight only in the selected
 window.  Setting this variable takes effect the next time you use
 the command `hl-line-mode' to turn Hl-Line mode on."
@@ -155,8 +155,8 @@ addition to `hl-line-highlight' on `post-command-hook'."
 
 (defun hl-line-unhighlight ()
   "Deactivate the Hl-Line overlay on the current line."
-  (if hl-line-overlay
-      (delete-overlay hl-line-overlay)))
+  (when hl-line-overlay
+    (delete-overlay hl-line-overlay)))
 
 ;;;###autoload
 (define-minor-mode global-hl-line-mode
@@ -187,8 +187,8 @@ Global-Hl-Line mode uses the functions `global-hl-line-unhighlight' and
 
 (defun global-hl-line-unhighlight ()
   "Deactivate the Global-Hl-Line overlay on the current line."
-  (if global-hl-line-overlay
-      (delete-overlay global-hl-line-overlay)))
+  (when global-hl-line-overlay
+    (delete-overlay global-hl-line-overlay)))
 
 (defun hl-line-move (overlay)
   "Move the Hl-Line overlay.
@@ -207,6 +207,16 @@ the line including the point by OVERLAY."
         (move-overlay overlay b e)
       (move-overlay overlay 1 1))))
 
+(defun hl-line-unload-function ()
+  "Unload the Hl-Line library."
+  (global-hl-line-mode -1)
+  (save-current-buffer
+    (dolist (buffer (buffer-list))
+      (set-buffer buffer)
+      (when hl-line-mode (hl-line-mode -1))))
+  ;; continue standard unloading
+  nil)
+
 (provide 'hl-line)
 
 ;; arch-tag: ac806940-0876-4959-8c89-947563ee2833