merge trunk

[bpt/emacs.git] / lisp / hl-line.el

diff --git a/lisp/hl-line.el b/lisp/hl-line.el
index dae21af..55704dc 100644 (file)
--- a/lisp/hl-line.el
+++ b/lisp/hl-line.el
@@ -1,12 +1,11 @@
 ;;; hl-line.el --- highlight the current line
 
-;; Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2000-2011  Free Software Foundation, Inc.
 
 ;; Author:  Dave Love <fx@gnu.org>
 ;; Maintainer: FSF
 ;; Created: 1998-09-13
-;; Keywords: faces, frames, emulation
+;; Keywords: faces, frames, emulations
 
 ;; This file is part of GNU Emacs.
 
@@ -72,7 +71,7 @@
 (defgroup hl-line nil
   "Highlight the current line."
   :version "21.1"
-  :group 'editing)
+  :group 'convenience)
 
 (defface hl-line
   '((t :inherit highlight))
@@ -94,7 +93,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 +154,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
@@ -176,7 +175,7 @@ Global-Hl-Line mode uses the functions `global-hl-line-unhighlight' and
     (remove-hook 'post-command-hook #'global-hl-line-highlight)))
 
 (defun global-hl-line-highlight ()
-  "Active the Global-Hl-Line overlay on the current line in the current window."
+  "Highlight the current line in the current window."
   (when global-hl-line-mode    ; Might be changed outside the mode function.
     (unless (window-minibuffer-p (selected-window))
       (unless global-hl-line-overlay
@@ -187,8 +186,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,7 +206,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
 ;;; hl-line.el ends here